Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

王涛
Commit a1e72134334c4dc0d8ba79b3603aada2847e1da3 2 parents 6dfcbe60 0f478752
Showing 2 changed files with 4 additions and 2 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
hg-monitor-web-zj/src/main/resources/static/src/controller/resindex.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @a1e7213
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @a1e7213
@@ -1604,7 +1604,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 // {field: 'adminName', title: '负责人', minWidth: 123, align: 'center', sort: true},
                 // {field: 'adminPhone', title: '负责人电话', minWidth: 118, align: 'center', sort: true},
                 {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
-                {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'}
+                {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true}
             ],
             "MIDDLEWARE_TOMCAT": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
--- a/hg-monitor-web-zj/src/main/resources/static/src/controller/resindex.js
View file @a1e7213
+++ b/hg-monitor-web-zj/src/main/resources/static/src/controller/resindex.js
View file @a1e7213
@@ -1443,8 +1443,9 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             if(resType == 'HOST_MINICOMPUTER' || resType=='HUAWEI_CLOUD_CLUSTER' || resType=='HUAWEI_CLOUD_COLONY' || resType=='HUAWEI_CLOUD_PHYSICSHOST' ||
                 resType == 'HUAWEI_CLOUD_STORAGE' || resType == 'HUAWEI_CLOUD_SWITCHBOARD' || resType == 'HUAWEI_CLOUD_FIREWALL' || resType == 'ALI_CLOUD_RDS'
                 || resType == 'ALI_CLOUD_SLB' || resType == 'ALI_CLOUD_OSS'||resType=='VIRTUALIZATION_VMWARE_VHOST'||resType=='MIDDLEWARE_WEBLOGIC'
-            ){//小型机整机 屏蔽连接状态
+            ){//屏蔽连接状态
                 $('.info-box-count').eq(3).hide();
+                $('#link_state_div').hide();
             }
             form.render("select");
             form.render();