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

王涛
Commit 0dbe3f1bf6e8b05c75a2b8f0cc6d9d1bb3e6a828 2 parents e57b0b53 05122d25
Showing 1 changed file with 70 additions and 47 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @0dbe3f1
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/commonCols.js
View file @0dbe3f1
@@ -342,8 +342,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+
+                {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
             ],
             "HUAWEI_CLOUD_CLUSTER": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -358,8 +359,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
+
+                {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
                 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
             ],
             "HUAWEI_CLOUD_PHYSICSHOST": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -375,9 +377,10 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
+
                 // 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态
-                {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true}
+                {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
             ],
             "HUAWEI_CLOUD_VIRTUALHOST": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -393,8 +396,9 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+
+                {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
             ],
             "HUAWEI_CLOUD_STORAGE": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -410,8 +414,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
             ],
             "HUAWEI_CLOUD_SWITCHBOARD": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -423,12 +427,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
                 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
+
             ],
             "HUAWEI_CLOUD_FIREWALL": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -440,12 +446,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 // {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
                 // {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
+
             ],
             "ALI_CLOUD_ECS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -459,12 +467,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
                 {field: 'ptName', title: '所属平台', minWidth: x_130, align: 'center', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
+
             ],
             "ALI_CLOUD_RDS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -476,12 +486,13 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'cpuRate', title: 'CPU使用率', align: 'center', minWidth: x_130, templet: '#cpuRateTpl', sort: true},
                 {field: 'memoryRate', title: '内存使用率', align: 'center', minWidth: x_130, templet: '#memoryRateTpl', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
+
             ],
             "ALI_CLOUD_SLB": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -491,12 +502,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 },
                 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
+
+                {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
             ],
             "ALI_CLOUD_OSS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -506,12 +519,13 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 },
                 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                {field: 'hostState', title: '主机状态', align: 'center', width: 85, templet: '#hostStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
+
             ],
             "ALI_ARMS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -536,29 +550,34 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 },
                 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
                 {field: 'resTypeName', title: '资源类型', width: 101, align: 'center'},
-                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
-                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
-                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+
+                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true},
+                {field: 'adminName', title: '负责人', width: 123, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', width: 118, align: 'center', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true}
             ],
             "A_CLOUD_PHYSICSHOST": [
                 // {type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
-                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+
                 {
                     field: 'resName', title: '资源名称', minWidth: 250, sort: true,
                     templet: '#resindex_resName'
                 },
+                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', width: 100, align: 'center'},
                 {field: 'health', title: '健康状态', width: 120, align: 'center', sort: true, templet: '#healthTpl'},
                 {field: 'cpuRate', title: 'CPU使用率', align: 'center', width: 120, templet: '#cpuRateTpl', sort: true},
                 {field: 'memoryRate', title: '内存使用率', align: 'center', width: 120, templet: '#memoryRateTpl', sort: true},
-                {field: 'lastColTime', title: '最近采集时间', width: 160, align: 'center', sort: true},
+
                 {field: 'linkState', title: '连接状态', align: 'center', width: 110, templet: '#linkStateTpl', sort: true},
                 {field: 'adminName', title: '负责人', width: 125, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', width: 120, align: 'center', sort: true},
-                {field: 'resTypeName', title: '资源类型', width: 100, align: 'center'},
-                {field: 'state', title: '资源状态', width: 120, align: 'center', sort: true, templet: '#resStateTpl'}
+
+                {field: 'state', title: '资源状态', width: 120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'lastColTime', title: '最近采集时间', width: 160, align: 'center', sort: true}
             ],
             "VIRTUALIZATION_COLONY": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -2556,19 +2575,21 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true},
                 {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'},
                 {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'},
-                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
                 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', minWidth: x_130, 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: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}
             ],
             "ALI_CLOUD_PLAT":[
-                {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
+
                 {
                     field: 'resName', title: '资源名称', minWidth: x_300, sort: true,
                     templet: '#resindex_resName'
                 },
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
                 {field: 'health', title: '健康状态', minWidth: x_110, align: 'center', sort: true, templet: '#healthTpl'},
                 // {field: 'diskSize', title: '磁盘总大小', minWidth: 120, align: 'center'},
                 {field: 'fileSysUseRate', title: '文件系统使用率(最大)', align: 'center', minWidth: x_185, templet: '#fileUseRateTpl', sort: true},
@@ -2582,12 +2603,14 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin', 
                 {field: 'vmmemoryUseRate', title: '虚拟内存使用率', align: 'center', minWidth: x_165, templet: '#vmmemoryRateTpl', sort: true},
                 {field: 'maxNetCardUpRate', title: '上行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardUpRate}} kb/s</div>'},
                 {field: 'maxNetCardDownRate', title: '下行速率', align: 'center', minWidth: x_110, sort: true, templet: '<div>{{d.maxNetCardDownRate}} kb/s</div>'},
-                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+
                 {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_110, templet: '#linkStateTpl', sort: true},
+
+
+                {field: 'state', title: '资源状态', minWidth: x_110, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
                 {field: 'adminPhone', title: '负责人电话', minWidth: x_130, 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: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}
             ],
             "ARMS":[
                 {