monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit d47e8717dfa93eca1d3fcc020c6bcc9bf49016ea 1 parent e5804fc4

fix: 拓扑优化

Inline Side-by-side
Showing 5 changed files with 27 additions and 12 deletions
@@ -108,7 +108,7 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli @@ -108,7 +108,7 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
108 //绑定角色 108 //绑定角色
109 $.ajax({ 109 $.ajax({
110 type: 'get', 110 type: 'get',
111 - url: common.domainName + '/mj/sys/role/roles?name=&perPage=10&page=1&&accessToken=' + access_token, 111 + url: common.domainName + '/mj/sys/role/roles?name=&perPage=99999&page=1&&accessToken=' + access_token,
112 async: false, 112 async: false,
113 success: function (res) { 113 success: function (res) {
114 if (res && res.data) { 114 if (res && res.data) {
@@ -277,7 +277,9 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli @@ -277,7 +277,9 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
277 } 277 }
278 //回填拓扑类型 278 //回填拓扑类型
279 if (topoInfo.topoType) { 279 if (topoInfo.topoType) {
  280 + setTimeout(()=>{
280 $("#jgraph-topo_type").val(topoInfo.topoType); 281 $("#jgraph-topo_type").val(topoInfo.topoType);
  282 + },2000)
281 var type = topoInfo.topoType; 283 var type = topoInfo.topoType;
282 var topoInfoTargetId = topoInfo.targetId; 284 var topoInfoTargetId = topoInfo.targetId;
283 busTypeDom.hide(); 285 busTypeDom.hide();
@@ -585,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'transfer @@ -585,7 +585,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'transfer
585 table.render({ 585 table.render({
586 elem: '#mxgraphRoleListTable' 586 elem: '#mxgraphRoleListTable'
587 , height: 'auto' 587 , height: 'auto'
588 - , url: domainName + '/api-user/roles' 588 + , url: domainName + '/mj/sys/role/roles?name=&perPage=10&page=1'
589 , page: true 589 , page: true
590 , parseData: function (res) { 590 , parseData: function (res) {
591 // 如果原来有权限，回显 591 // 如果原来有权限，回显
@@ -19,17 +19,21 @@ layui.define(['transfer', 'layer', 'laytpl', 'common', 'sessions', 'admin'], fun @@ -19,17 +19,21 @@ layui.define(['transfer', 'layer', 'laytpl', 'common', 'sessions', 'admin'], fun
19 19
20 function init() { 20 function init() {
21 $.ajax({ 21 $.ajax({
22 - url: domainName + '/api-user/users/getAll', 22 + url: domainName + '/mj/user/page?username=&nickname=&enabled=&perPage=9999999&page=1',
23 data: { 23 data: {
24 - access_token: accessToken 24 + accessToken: accessToken
25 }, 25 },
26 - success(response) {  
27 - response.filter(item => !selectedUsers.includes(item.username)) 26 + success(res) {
  27 +
  28 + if(res && res.data && res.data.rows){
  29 + let userArr = res.data.rows;
  30 +
  31 + userArr.filter(item => !selectedUsers.includes(item.username))
28 32
29 transfer.render({ 33 transfer.render({
30 id: 'transfer-user', 34 id: 'transfer-user',
31 elem: '#transfer-user', 35 elem: '#transfer-user',
32 - data: response, 36 + data: userArr,
33 title: ['未授权用户', '已授权用户'], 37 title: ['未授权用户', '已授权用户'],
34 value: selectedUsers, 38 value: selectedUsers,
35 showSearch: true, 39 showSearch: true,
@@ -45,6 +49,8 @@ layui.define(['transfer', 'layer', 'laytpl', 'common', 'sessions', 'admin'], fun @@ -45,6 +49,8 @@ layui.define(['transfer', 'layer', 'laytpl', 'common', 'sessions', 'admin'], fun
45 } 49 }
46 }); 50 });
47 } 51 }
  52 +
  53 + }
48 }) 54 })
49 } 55 }
50 }); 56 });
@@ -13,11 +13,11 @@ @@ -13,11 +13,11 @@
13 <div class="inline-half layui-inline"> 13 <div class="inline-half layui-inline">
14 <label class="layui-form-label">指令模板</label> 14 <label class="layui-form-label">指令模板</label>
15 <div class="layui-input-inline"> 15 <div class="layui-input-inline">
16 - <button class="layui-btn layui-btn-primary" id="btn-task-bindchecktemp-selecttemp"><i 16 + <button class="layui-btn layui-btn-primary layui-btn-normal" id="btn-task-bindchecktemp-selecttemp"><i
17 class="layui-icon">&#xe654;</i>选择指令模板 17 class="layui-icon">&#xe654;</i>选择指令模板
18 </button> 18 </button>
19 <div class="hide"></div> 19 <div class="hide"></div>
20 - <button class="layui-btn layui-btn-primary hide" id="btn-task-bindchecktemp-unselecttemp"><i 20 + <button class="layui-btn layui-btn-primary hide layui-btn-normal" id="btn-task-bindchecktemp-unselecttemp"><i
21 class="layui-icon">&#xe640;</i>取消选择 21 class="layui-icon">&#xe640;</i>取消选择
22 </button> 22 </button>
23 <label id="txt-task-bindchecktemp-checktemp"></label> 23 <label id="txt-task-bindchecktemp-checktemp"></label>
@@ -26,11 +26,11 @@ @@ -26,11 +26,11 @@
26 <div class="inline-half layui-inline"> 26 <div class="inline-half layui-inline">
27 <label class="layui-form-label">资源</label> 27 <label class="layui-form-label">资源</label>
28 <div class="layui-input-inline"> 28 <div class="layui-input-inline">
29 - <button class="layui-btn layui-btn-primary" id="btn-task-bindchecktemp-selectres"><i 29 + <button class="layui-btn layui-btn-primary layui-btn-normal" id="btn-task-bindchecktemp-selectres"><i
30 class="layui-icon">&#xe654;</i>选择资源 30 class="layui-icon">&#xe654;</i>选择资源
31 </button> 31 </button>
32 <div class="hide"></div> 32 <div class="hide"></div>
33 - <button class="layui-btn layui-btn-primary hide" id="btn-task-bindchecktemp-unselectres"><i 33 + <button class="layui-btn layui-btn-primary hide layui-btn-normal" id="btn-task-bindchecktemp-unselectres"><i
34 class="layui-icon">&#xe640;</i>取消选择 34 class="layui-icon">&#xe640;</i>取消选择
35 </button> 35 </button>
36 <div id="txt-task-bindchecktemp-res" 36 <div id="txt-task-bindchecktemp-res"
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <div class="main"> 4 <div class="main">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-body collector-table"> 6 <div class="layui-card-body collector-table">
7 - <div id="transfer-user" style="padding-left: 25px"></div> 7 + <div id="transfer-user" style="padding-left: 25px;display: flex;flex-wrap: nowrap;"></div>
8 </div> 8 </div>
9 </div> 9 </div>
10 </div> 10 </div>
@@ -22,3 +22,10 @@ @@ -22,3 +22,10 @@
22 } 22 }
23 }); 23 });
24 </script> 24 </script>
  25 +<style type="text/css">
  26 + .layui-transfer-active{
  27 + display: flex;
  28 + align-content: center;
  29 + flex-wrap: wrap;
  30 + }
  31 +</style>