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

…master-v32-lushangqing

@@ -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":[
                 {

@@ -192,8 +192,17 @@ global.openCmdbAssets = (resTypeId, resId, proxy) => {
 }
 
 global.openDetail = (resId, resType, title) => {
-    let url = window.top.location.href.split('/#')[0] + `/#/res/resDetail/resId=${resId}/resType=${resType}/title=${title}`;
-    global.openBlankWindow(url);
+    // let url = `/#/res/resDetail/view/resId=${resId}`;
+    let url = window.top.location.href.split('/#')[0] + `/#/res/resDetail/view/resId=${resId}`;
+    if(resType){
+        url += '/resType=' + resType
+    }
+
+    if(title){
+        url += '/title=' + title
+    }
+
+    // global.openBlankWindow(url);
 }
 
 /**

@@ -10,7 +10,7 @@
 </head>
 <body>
 <div class="outlinediv" style="height: 666px">
-    <span>湖州灾备一机房平面图</span>
+<!--    <span>湖州灾备一机房平面图</span>-->
     <div class="huzhouone-topcabinet">
         <table>
             <tr>
@@ -239,4 +239,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

@@ -15,7 +15,7 @@
 </head>
 <body>
 <div class="outlinediv" >
-    <span>湖州灾备三机房平面图</span>
+<!--    <span>湖州灾备三机房平面图</span>-->
     <div class="huzhouone-topcabinet" style="margin-left: 25%;padding-top: 30px">
         <table>
             <tr>
@@ -68,4 +68,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

@@ -15,7 +15,7 @@
 </head>
 <body>
 <div class="outlinediv" >
-    <span>湖州灾备二机房平面图</span>
+<!--    <span>湖州灾备二机房平面图</span>-->
     <div class="huzhouone-topcabinet" style="margin-left: 20%">
         <table>
             <tr>
@@ -78,4 +78,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

@@ -10,7 +10,7 @@
 </head>
 <body>
       <div class="outlinediv">
-          <span>2号机房平面图</span>
+<!--          <span>2号机房平面图</span>-->
           <div class="xiaoshansecond-topcabinet">
             <table>
                 <tr>
@@ -90,4 +90,4 @@
           </div>
       </div>
 </body>
-</html>
\ No newline at end of file
+</html>

@@ -8,7 +8,7 @@
 </head>
 <body>
 <div class="outlinediv" style="width: 950px">
-    <span>7号机房平面图</span>
+<!--    <span>7号机房平面图</span>-->
     <div style="width: 100%;height: 100%;display: inline-flex">
         <div class="xiaoshanseven-leftcabinet">
             <table>
@@ -221,4 +221,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

@@ -10,7 +10,7 @@
 </head>
 <body>
 <div class="outlinediv">
-    <span>3号机房平面图</span>
+<!--    <span>3号机房平面图</span>-->
     <div class="xiaoshanthird-topcabinet">
         <table>
             <tr>
@@ -112,4 +112,4 @@
     </div>
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>

@@ -32,7 +32,8 @@
 							   :showBorder="true" :currentPage="currentPage" :total="total" :loading="false"
 							   :showPage="true" :height="(height - 95)" :maxWidth="max">
 					<template #default="{row,prop,column}">
-						<a href="javascript:void(0)"  v-if="prop == 'resPositon' || prop == 'cabinetNo'"  style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>
+<!--						<a href="javascript:void(0)"  v-if="prop == 'resPositon' || prop == 'cabinetNo'"  style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>-->
+						<a href="javascript:void(0)"  v-if="prop == 'aaa' || prop == 'bbbbb'"  style="border-bottom: solid 1px blue;margin-bottom: 3px;height: 30px;font-size: 15px;" @click="cellClick(row,prop,column)">{{row[prop].value == undefined ? '' : row[prop].value }}</a>
 
 						<component v-else-if="row[prop] && row[prop].props && row[prop].props.colComponents " v-bind:is="row[prop].props.colComponents"
 								   :resId="row.resId"
@@ -59,7 +60,7 @@
 			</div>
 			<div  v-if="cellDetail.prop == 'resPositon'"  @click="openCabinet(false)"  style="background-image: url('/vue3/src/assets/images/res/img02.jpg');height: 600px;background-repeat: no-repeat;background-position: center;background-size: 80%;">
 				<div style="font-weight: bold;font-size: 20px;">
-					{{cellDetail.row[cellDetail.prop]}}布局图
+					<!--{{cellDetail.row[cellDetail.prop]}}布局图-->
 				</div>
 			</div>
 		</template>

@@ -35,7 +35,7 @@
     </el-dialog>
 
     <!--机房布局-->
-    <el-dialog v-model="outerVisible" :title="dialogMachineName" width="70%" @close="closeDialog" top="4vh">
+    <el-dialog  v-model="outerVisible" :title="dialogMachineName" width="70%" @close="closeDialog" top="7vh">
         <GetMachineRoom v-if="commandNameData" :commandNameData="commandNameData"></GetMachineRoom>
 
     </el-dialog>