Merge branch 'master-V32-XuHaoJie' into 'master'

杭州-资源视图-通知统计的柱子从60%宽度调整成40%



See merge request !104

@@ -376,7 +376,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'state', title: '资源状态', width: 98, align: 'center', sort: true, templet: '#resStateTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
                 {field: 'health', title: '健康状态', width: 83, align: 'center', sort: true, templet: '#healthTpl'},
                 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
                 {field: 'lastColTime', title: '最近采集时间', width: 161, align: 'center', sort: true},
-                {field: 'linkState', title: '连接状态', align: 'center', width: 85, templet: '#linkStateTpl', sort: true}
+                // 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态
+                {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true}
             ],
             ],
             "HUAWEI_CLOUD_VIRTUALHOST": [
             "HUAWEI_CLOUD_VIRTUALHOST": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},

@@ -197,7 +197,7 @@ layui.define(['common', 'admin', 'echarts', 'common', 'table', 'sessions'], func
                 series: [
                 series: [
                     {
                     {
                         type: 'bar',
                         type: 'bar',
-                        barWidth: '60%',
+                        barWidth: '40%',
                         data: line,
                         data: line,
                         itemStyle: {
                         itemStyle: {
                             normal: {
                             normal: {

@@ -810,6 +810,10 @@
     <button type="button" class="layui-btn layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
     <button type="button" class="layui-btn layui-bg-red layui-btn-radius layui-btn-xs p-0-15 cant-click">
         断开连接
         断开连接
     </button>
     </button>
+    {{# }else if(d.hostState != null && d.hostState == '正常'){ }}
+    <button type="button" class="layui-btn layui-bg-green layui-btn-radius layui-btn-xs p-0-15 cant-click">
+        正常
+    </button>
     {{# }else{ }}
     {{# }else{ }}
     <button type="button"
     <button type="button"
             class="layui-btn  layui-btn-radius layui-bg-gray layui-btn-xs p-0-15 cant-click">{{
             class="layui-btn  layui-btn-radius layui-bg-gray layui-btn-xs p-0-15 cant-click">{{