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

…master-v32-lushangqing

@@ -376,7 +376,8 @@ layui.define(['soulTable', 'commonDetail', 'common', 'laytpl', 'view', 'admin',
                 {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}
+                // 2021-11-22 徐毫杰 连接状态无数据改成展示主机状态
+                {field: 'hostState', title: '主机状态', align: 'center', minWidth: x_110, templet: '#hostStateTpl', sort: true}
             ],
             "HUAWEI_CLOUD_VIRTUALHOST": [
                 //{type: 'numbers', title: '序号', align: 'center', fixed: 'left'},

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

@@ -9,7 +9,11 @@
             var arr = [];
             window.location.hash.split('/').forEach(function (v, i) {
                 if (v.indexOf('=') != -1 && v.indexOf('reportCode') != -1) {
-                    viewURL = viewURL.replaceAll('reportCode',v.split('=')[1])
+                    try {
+                        viewURL = viewURL.replaceAll('reportCode',v.split('=')[1])
+                    } catch (e) {
+                        viewURL = viewURL.replace('reportCode',v.split('=')[1])
+                    }
                 }
             });
 

@@ -74,7 +74,7 @@
                         <dd layadmin-event="toDZSWJScreen"  style="text-align: left;"><a><img src="/src/style/img/icon-dianzishuiwuju.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;电子税务大屏</a></dd>
                         <dd layadmin-event="toYTHViewScreen"  style="text-align: left;"><a><img src="/src/style/img/icon-yitihuadaping.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;一体化视图</a></dd>
                         <dd layadmin-event="toBiZhEalZhSYS"  style="text-align: left;"><a><img src="/src/style/img/icon-YWJKD.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;业务健康度</a></dd>
-                        <dd layadmin-event="toCMDB"  style="text-align: left;"><a><img src="/src/style/img/loading-mj.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;CMDB</a></dd>
+                        <dd layadmin-event="toCMDB"  style="text-align: left;"><a><img src="/src/style/img/icon-CMDB.png"  style="width: 16px;height: 16px">&nbsp;&nbsp;CMDB</a></dd>
                     </dl>
                 </script>
             </li>
@@ -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>
+    {{# }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{ }}
     <button type="button"
             class="layui-btn  layui-btn-radius layui-bg-gray layui-btn-xs p-0-15 cant-click">{{

@@ -273,7 +273,12 @@ export default {
 
         let getChartData = () => {
 
-            let timeScope = form.value.scene.timeScope.replaceAll("time_scope_", "")
+            let timeScope = '';
+            try {
+                timeScope = form.value.scene.timeScope.replaceAll("time_scope_", "")
+            }catch (e) {
+                timeScope = form.value.scene.timeScope.replace("time_scope_", "")
+            }
             if (timeScope == '') {
                 proxy.$global.showMsg("请选择时间范围！", "warning");
                 return;

@@ -7,9 +7,8 @@
             <div  class="analysis-index-container" style="display: grid;">
                     <img src="/vue3/src/assets/images/analysis/icon-add.png" style="margin-left: 20px;"></img>
                     <span style="text-align: center;line-height: 50px;color: #0C4493">点击添加对比分析</span>
-
             </div>
         </router-link>
 
     </div>
-</div>
\ No newline at end of file
+</div>