monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit e84716b926b38dd6fb5400a16c994cc6743c7997 2 parents 059c8668 08443368

Merge branch 'master-500-dev-xwx' into 'master-500-dev' 

用户管理-【用户管理】-新建用户布局名称和编辑下布局名称不同



See merge request !971
Inline Side-by-side
Showing 4 changed files with 7 additions and 15 deletions
@@ -27,7 +27,7 @@ layui.define(['commonDetail', 'common'], function (exports) { @@ -27,7 +27,7 @@ layui.define(['commonDetail', 'common'], function (exports) {
27 // Start Wang 2022/3/25 20:32 KPIFA92AF2D指标修改为KPI143DBD5B 27 // Start Wang 2022/3/25 20:32 KPIFA92AF2D指标修改为KPI143DBD5B
28 var interfacekpi = "KPIFABFD741,KPI73C0F7E7,KPI143DBD5B"; 28 var interfacekpi = "KPIFABFD741,KPI73C0F7E7,KPI143DBD5B";
29 //存储信息 29 //存储信息
30 - var storagekpi = "KPIFB844B8B,KPI5E148DBE,KPIE55684DF,KPIDBFA1EE2"; 30 + var storagekpi = "KPIFABFD741,KPIFB844B8B,KPI5E148DBE,KPIE55684DF,KPIDBFA1EE2";
31 31
32 reload(); 32 reload();
33 33
@@ -182,7 +182,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -182,7 +182,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
182 } 182 }
183 183
184 // 表单提交事件 184 // 表单提交事件
185 - form.on('submit(form-restypepage-edit)', function (data) { 185 + form.on('submit(btn-restypepage-submit)', function (data) {
186 loading = layer.load(2); 186 loading = layer.load(2);
187 var restypePage = { 187 var restypePage = {
188 id: id, 188 id: id,
@@ -280,4 +280,4 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem @@ -280,4 +280,4 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'elem
280 form.render(); 280 form.render();
281 }); 281 });
282 }); 282 });
283 -});  
  283 +});
@@ -81,11 +81,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -81,11 +81,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
81 contentType: "application/json; charset=utf-8", 81 contentType: "application/json; charset=utf-8",
82 success: function (res) { 82 success: function (res) {
83 if (res.resp_code == 0) { 83 if (res.resp_code == 0) {
84 - var msg = res.resp_msg;  
85 - if (reloadFlg) {  
86 - msg += "，扩展信息更新，即将刷新页面！";  
87 - }  
88 - layer.msg(msg, { 84 + layer.msg(res.resp_msg, {
89 offset: '15px', 85 offset: '15px',
90 icon: 1, 86 icon: 1,
91 time: 2000, 87 time: 2000,
@@ -93,10 +89,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -93,10 +89,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
93 layer.closeAll() 89 layer.closeAll()
94 table.reload('user_table', {}); 90 table.reload('user_table', {});
95 form.render(); 91 form.render();
96 -  
97 - if (reloadFlg) {  
98 - window.location.reload();  
99 - }  
100 }) 92 })
101 } else { 93 } else {
102 layer.msg(res.resp_msg, { 94 layer.msg(res.resp_msg, {
@@ -317,8 +309,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -317,8 +309,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
317 ' <option value="" style="display:none;"></option>' + selectOption + 309 ' <option value="" style="display:none;"></option>' + selectOption +
318 '</select>'; 310 '</select>';
319 } else if (v.ddicCode == "userLayout") { 311 } else if (v.ddicCode == "userLayout") {
320 - var selectOption = ' <option value="layout">默认布局</option>' +  
321 - ' <option value="layout-nx">layout-nx</option>'; 312 + var selectOption = ' <option value="layout">简约布局</option>' +
  313 + ' <option value="layout-nx">经典布局</option>';
322 314
323 str = '<select data-property="' + v.ddicCode + '" placeholder="' + v.ddicDesc + '" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">' + 315 str = '<select data-property="' + v.ddicCode + '" placeholder="' + v.ddicDesc + '" data-id="" data-username="" data-sort="" data-remark="" class="select layui-select select-input-my" name="' + v.ddicCode + '" autocomplete="off">' +
324 ' <option value="" style="display:none;"></option>' + selectOption + 316 ' <option value="" style="display:none;"></option>' + selectOption +
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea> 81 <textarea name="remark" placeholder="请输入备注" class="layui-textarea"></textarea>
82 </div> 82 </div>
83 </div> 83 </div>
84 - <button id="btn-restypepage-submit" class="hide" lay-submit lay-filter="kpi-flag-submit">提交</button> 84 + <button id="btn-restypepage-submit" class="hide" lay-submit lay-filter="btn-restypepage-submit">提交</button>
85 </form> 85 </form>
86 <form class="layui-form layui-form-pane" onsubmit="return false"> 86 <form class="layui-form layui-form-pane" onsubmit="return false">
87 <fieldset class="layui-elem-field layui-field-title"> 87 <fieldset class="layui-elem-field layui-field-title">