杭州-资源视图-阿里云、华为云及子资源类型列表连接状态改变及列宽调整

@@ -337,30 +337,31 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},
                 {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},
                 {field: 'storageSetRate', title: '存储分配率', align: 'center', minWidth: 120, templet: '#storageSetRateTpl'},
-                {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: 'resTypeName', title: '资源类型', minWidth: 101, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: 120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: 120, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: 120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: 120, 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: 'clusterState', title: '资源池状态', align: 'center', minWidth: x_120,templet:'#clusterStateTpl'},
+                //{field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: 160, align: 'center', sort: true}
             ],
             "HUAWEI_CLOUD_CLUSTER": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
-                {field: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: 120, templet: '#cpuSetRateTpl'},
-                {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: 120, templet: '#memorySetRateTpl'},
-                {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: 'cpuSetRate', title: 'CPU分配率', align: 'center', minWidth: x_120, templet: '#cpuSetRateTpl'},
+                {field: 'memorySetRate', title: '内存分配率', align: 'center', minWidth: x_120, templet: '#memorySetRateTpl'},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: 160, align: 'center', sort: true}
+               // {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true}
             ],
             "HUAWEI_CLOUD_PHYSICSHOST": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
@@ -400,58 +401,58 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
             "HUAWEI_CLOUD_STORAGE": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
                 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
                 {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: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+                {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true,templet: '#runStateTpl'}
             ],
             "HUAWEI_CLOUD_SWITCHBOARD": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
-                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+                {field: 'ip', title: 'IP地址', minWidth: x_110, align: 'center', sort: true},
                 // {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: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_120, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWdth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+                // {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
             ],
             "HUAWEI_CLOUD_FIREWALL": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
-                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+                {field: 'ip', title: 'IP地址', minWidth: x_120, align: 'center', sort: true},
                 // {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: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true}
+                //{field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
             ],
             "ALI_CLOUD_ECS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
                 {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
@@ -459,60 +460,61 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'memorySize', title: '内存大小', align: 'center', minWidth: x_120, sort: true, templet: '<div>{{d.memorySize}} GB</div>'},
                 {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: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+                {field: 'linkState', title: '连接状态', align: 'center', minWidth: x_120, templet: '#linkStateTpl', sort: true}
             ],
             "ALI_CLOUD_RDS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
-                {field: 'ip', title: 'IP地址', width: 130, align: 'center', sort: true},
+                {field: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
                 {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: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+                // {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
             ],
             "ALI_CLOUD_SLB": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
-                {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: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_120, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_160, align: 'center', sort: true},
+                {field: 'runState', title: '运行状态', minWidth: x_120, align: 'center', sort: true,templet: '#runStateTpl'}
+                //{field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
             ],
             "ALI_CLOUD_OSS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 {
-                    field: 'resName', title: '资源名称', minWidth: 250, sort: true,
+                    field: 'resName', title: '资源名称', minWidth: x_250, sort: true,
                     templet: '#resindex_resName'
                 },
-                {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: 'ip', title: 'IP地址', minWidth: x_130, align: 'center', sort: true},
+                {field: 'resTypeName', title: '资源类型', minWidth: x_110, align: 'center'},
+                {field: 'adminName', title: '负责人', minWidth: x_120, align: 'center', sort: true},
+                {field: 'adminPhone', title: '负责人电话', minWidth: x_130, align: 'center', sort: true},
+                {field: 'state', title: '资源状态', minWidth: x_120, align: 'center', sort: true, templet: '#resStateTpl'},
+                {field: 'health', title: '健康状态', minWidth: x_120, align: 'center', sort: true, templet: '#healthTpl'},
+                {field: 'lastColTime', title: '最近采集时间', minWidth: x_120, align: 'center', sort: true},
+                // {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
             ],
             "ALI_ARMS": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},

@@ -941,6 +941,27 @@
         <a class="layui-icon reslist-view-topo hide" data-resid="{{d.resId}}" style="color: #FEB61E; font-size: 14px; margin-left: 10px;" lay-tips="查看资源拓扑"><i class="iconfont">&#XE515;</i></a>
     </div>
 </script>
+<!--资源池状态-->
+<script type="text/html" id="clusterStateTpl">
+    {{#  if(d.clusterState === '正常'){ }}
+    <button type="button" class="layui-btn layui-btn-danger layui-bg-green  layui-btn-radius layui-btn-xs p-0-15">正常
+    </button>
+    {{#  }else{ }}
+    <button type="button" class="layui-btn layui-btn-radius layui-bg-red layui-btn-xs p-0-15">异常</button>
+    {{#  } }}
+</script>
+<!--运行状态-->
+<script type="text/html" id="runStateTpl">
+    {{#  if(d.runState === '正常'){ }}
+    <button type="button" class="layui-btn layui-btn-danger layui-bg-green  layui-btn-radius layui-btn-xs p-0-15">正常
+    </button>
+    {{#  }else{ if(d.runState === '运行中'){ }}
+    <button type="button" class="layui-btn layui-btn-danger layui-bg-green  layui-btn-radius layui-btn-xs p-0-15">运行中</button>
+    {{#  }else{ }}
+    <button type="button" class="layui-btn layui-btn-radius layui-bg-red layui-btn-xs p-0-15">异常</button>
+    {{#  } }}
+    {{#  } }}
+</script>
 <script type="text/html" id="weblogicIpTpl">
     <div>{{d.ip?d.ip:""}}</div>
 </script>