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 7 additions and 6 deletions
... ... @@ -92,11 +92,12 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'treeTable'
}
}).done(function (res) {
let list = [];
if (res && res.data && resType.indexOf('VIRTUALIZATION') !== -1) {
list = res.data.filter(e => e.resType !== 'VIRTUALIZATION_VMWARE_CLUSTER' && e.resType !== 'VIRTUALIZATION_VMWARE_PHYSICSHOST')
} else {
// if (res && res.data && resType.indexOf('VIRTUALIZATION') !== -1) {
// list = res.data.filter(e => e.resType !== 'VIRTUALIZATION_VMWARE_CLUSTER' && e.resType !== 'VIRTUALIZATION_VMWARE_PHYSICSHOST')
// } else {
//
// }
list = res.data;
}
laytpl($('#domainIndexTpl').html()).render({list: list}, function (html) {
domainIndexTable.html(html);
});
... ...
... ... @@ -765,10 +765,10 @@
linkStateTips += `<ul class='ul-link-state-tips'>`;
layui.each(d.linkStateList, function(index, value) {
if(value.state.indexOf('成功') !== -1) {
linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol}: ${value.state}</li>`;
linkStateTips += `<li class='li-link-state-tips-green'>${value.protocol=='SSH'?value.protocol:'自动发现'}: ${value.state}</li>`;
linkStateHtml += '<span class="layui-badge-dot layui-bg-green"></span>';
} else {
linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol}: ${value.state}</li>`;
linkStateTips += `<li class='li-link-state-tips-red'>${value.protocol=='SSH'?value.protocol:'自动发现'}: ${value.state}</li>`;
linkStateHtml += '<span class="layui-badge-dot layui-bg-red"></span>';
}
});
... ...