monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by XuHaoJie
Commit 12d67268b149de021896e00c8df91e4d6082d385 2 parents 552acbde a05cdb6b

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-XuHaoJie
Inline Side-by-side
Showing 6 changed files with 38 additions and 5 deletions
@@ -63,6 +63,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -63,6 +63,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
63 // data.orgId = orgSelect.getValue('valueStr') 63 // data.orgId = orgSelect.getValue('valueStr')
64 data.roleId = roleSelect.getValue('valueStr') 64 data.roleId = roleSelect.getValue('valueStr')
65 delete data['select'] 65 delete data['select']
  66 + var reloadFlg = false;
  67 + if(data.userProperty){
  68 + data.userProperty.forEach(function (v){
  69 + if(v.username != '' && v.value != ''){
  70 + sessionStorage.setItem(v.property, v.value);
  71 + reloadFlg = true;
  72 + }
  73 + })
  74 + }
66 $.ajax({ 75 $.ajax({
67 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken, 76 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
68 data: JSON.stringify(data), 77 data: JSON.stringify(data),
@@ -70,7 +79,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -70,7 +79,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
70 contentType: "application/json; charset=utf-8", 79 contentType: "application/json; charset=utf-8",
71 success: function (res) { 80 success: function (res) {
72 if (res.resp_code == 0) { 81 if (res.resp_code == 0) {
73 - layer.msg(res.resp_msg, { 82 + var msg = res.resp_msg;
  83 + if(reloadFlg){
  84 + msg += "，扩展信息更新，即将刷新页面！";
  85 + }
  86 + layer.msg(msg, {
74 offset: '15px', 87 offset: '15px',
75 icon: 1, 88 icon: 1,
76 time: 2000, 89 time: 2000,
@@ -78,6 +91,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -78,6 +91,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
78 layer.closeAll() 91 layer.closeAll()
79 table.reload('user_table', {}); 92 table.reload('user_table', {});
80 form.render(); 93 form.render();
  94 +
  95 + if(reloadFlg){
  96 + window.location.reload();
  97 + }
81 }) 98 })
82 } else { 99 } else {
83 layer.msg(res.resp_msg, { 100 layer.msg(res.resp_msg, {
@@ -9,7 +9,7 @@ @@ -9,7 +9,7 @@
9 9
10 </div> 10 </div>
11 <div class="layadmin-user-login-main"> 11 <div class="layadmin-user-login-main">
12 - <img src="/src/style/img/login/skin/2/22.png" style="border: none;position: absolute;margin-left: calc(100% - 663px);margin-top: 145px;"> 12 + <img src="/src/style/img/login/skin/2/22.png" style="border: none;position: absolute;margin-left: calc(100% - 650px);margin-top: 175px;width: 500px;">
13 <div class="layadmin-user-login-box layadmin-user-login-body layui-form"> 13 <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
14 <div class="layui-form-item" style="color: #2887FD;font-weight: bold;text-align: center;font-size: 18px;"> 14 <div class="layui-form-item" style="color: #2887FD;font-weight: bold;text-align: center;font-size: 18px;">
15 <h2>用户登录</h2> 15 <h2>用户登录</h2>
@@ -44,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -44,7 +44,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
44 //回显用户属性 44 //回显用户属性
45 evaluation(res.userProperty); 45 evaluation(res.userProperty);
46 //用户扩展属性展开 46 //用户扩展属性展开
47 - $("#user_property_html_id").removeClass('hide'); 47 + // $("#user_property_html_id").removeClass('hide');
48 $("#userPropertyBelow").addClass('hide'); 48 $("#userPropertyBelow").addClass('hide');
49 $("#userPropertyUP").removeClass('hide'); 49 $("#userPropertyUP").removeClass('hide');
50 form.render(); 50 form.render();
@@ -69,6 +69,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -69,6 +69,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
69 return false; 69 return false;
70 } 70 }
71 delete data['select'] 71 delete data['select']
  72 + var reloadFlg = false;
  73 + if(data.userProperty){
  74 + data.userProperty.forEach(function (v){
  75 + if(v.username != '' && v.value != ''){
  76 + sessionStorage.setItem(v.property, v.value);
  77 + reloadFlg = true;
  78 + }
  79 + })
  80 + }
72 $.ajax({ 81 $.ajax({
73 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken, 82 url: domainName + '/api-user/users/saveOrUpdate?access_token=' + accessToken,
74 data: JSON.stringify(data), 83 data: JSON.stringify(data),
@@ -76,7 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -76,7 +85,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
76 contentType: "application/json; charset=utf-8", 85 contentType: "application/json; charset=utf-8",
77 success: function (res) { 86 success: function (res) {
78 if (res.resp_code == 0) { 87 if (res.resp_code == 0) {
79 - layer.msg(res.resp_msg, { 88 + var msg = res.resp_msg;
  89 + if(reloadFlg){
  90 + msg += "，扩展信息更新，即将刷新页面！";
  91 + }
  92 + layer.msg(msg, {
80 offset: '15px', 93 offset: '15px',
81 icon: 1, 94 icon: 1,
82 time: 2000, 95 time: 2000,
@@ -84,6 +97,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -84,6 +97,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
84 layer.closeAll() 97 layer.closeAll()
85 table.reload('user_table', {}); 98 table.reload('user_table', {});
86 form.render(); 99 form.render();
  100 + if(reloadFlg){
  101 + window.location.reload();
  102 + }
87 }) 103 })
88 } else { 104 } else {
89 layer.msg(res.resp_msg, { 105 layer.msg(res.resp_msg, {
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存 73 <button type="submit" lay-submit class="layui-btn hide" lay-filter="user_form_save_id" id="user_form_save_id">保存
74 </button> 74 </button>
75 </form> 75 </form>
76 -<fieldset class="layui-elem-field layui-field-title hide" style="margin-top: 10px;min-width: 200px"> 76 +<fieldset class="layui-elem-field layui-field-title" style="margin-top: 10px;min-width: 200px">
77 <legend> 77 <legend>
78 扩展信息 &nbsp; 78 扩展信息 &nbsp;
79 <a href="javascript:void(0);" class="layui-btn layui-btn-normal layui-btn-xs" id="addUserProperty" 79 <a href="javascript:void(0);" class="layui-btn layui-btn-normal layui-btn-xs" id="addUserProperty"