monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 4d4daa4e0bf6f34755c3659c8212f81a4fd6f7a4 2 parents e22751c5 938e844c

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

青海-首页-多个连接状态时列表的悬浮提示信息不准确



See merge request !454
Inline Side-by-side
Showing 2 changed files with 8 additions and 7 deletions
@@ -92,11 +92,12 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable' @@ -92,11 +92,12 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
92 } 92 }
93 }).done(function (res) { 93 }).done(function (res) {
94 let list = []; 94 let list = [];
95 - if (res && res.data && resType.indexOf('VIRTUALIZATION') !== -1) {  
96 - list = res.data.filter(e => e.resType !== 'VIRTUALIZATION_VMWARE_CLUSTER' && e.resType !== 'VIRTUALIZATION_VMWARE_PHYSICSHOST')  
97 - } else {  
98 - list = res.data;  
99 - } 95 + // if (res && res.data && resType.indexOf('VIRTUALIZATION') !== -1) {
  96 + // list = res.data.filter(e => e.resType !== 'VIRTUALIZATION_VMWARE_CLUSTER' && e.resType !== 'VIRTUALIZATION_VMWARE_PHYSICSHOST')
  97 + // } else {
  98 + //
  99 + // }
  100 + list = res.data;
100 laytpl($('#domainIndexTpl').html()).render({list: list}, function (html) { 101 laytpl($('#domainIndexTpl').html()).render({list: list}, function (html) {
101 domainIndexTable.html(html); 102 domainIndexTable.html(html);
102 }); 103 });
@@ -765,10 +765,10 @@ @@ -765,10 +765,10 @@
765 linkStateTips += `<ul class='ul-link-state-tips'>`; 765 linkStateTips += `<ul class='ul-link-state-tips'>`;
766 layui.each(d.linkStateList, function(index, value) { 766 layui.each(d.linkStateList, function(index, value) {
767 if(value.state.indexOf('成功') !== -1) { 767 if(value.state.indexOf('成功') !== -1) {
768 - linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol}: ${value.state}</li>`; 768 + linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol=='SSH'?value.protocol:'自动发现'}: ${value.state}</li>`;
769 linkStateHtml += '<span class="layui-badge-dot layui-bg-green"></span>'; 769 linkStateHtml += '<span class="layui-badge-dot layui-bg-green"></span>';
770 } else { 770 } else {
771 - linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol}: ${value.state}</li>`; 771 + linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol=='SSH'?value.protocol:'自动发现'}: ${value.state}</li>`;
772 linkStateHtml += '<span class="layui-badge-dot layui-bg-red"></span>'; 772 linkStateHtml += '<span class="layui-badge-dot layui-bg-red"></span>';
773 } 773 }
774 }); 774 });