diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/domainindex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/domainindex.js index e9e78c3..7eb1376 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/domainindex.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/domainindex.js @@ -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 { - list = res.data; - } + // 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); }); diff --git a/hg-monitor-web-qh/src/main/resources/static/src/views/layout.html b/hg-monitor-web-qh/src/main/resources/static/src/views/layout.html index ec82665..0ab2919 100644 --- a/hg-monitor-web-qh/src/main/resources/static/src/views/layout.html +++ b/hg-monitor-web-qh/src/main/resources/static/src/views/layout.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>'; } });