Authored by XuHaoJie

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-V32-XuHaoJie

@@ -24,7 +24,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -24,7 +24,7 @@ layui.define(['xmSelect', 'md5'], function (exports) {
24 domainAssetsManage: sessionStorage.getItem('domainAssetsManage'), // 资产系统地址 24 domainAssetsManage: sessionStorage.getItem('domainAssetsManage'), // 资产系统地址
25 graphEditorOrigin: sessionStorage.getItem('graphEditorOrigin'), // 拓扑系统地址 25 graphEditorOrigin: sessionStorage.getItem('graphEditorOrigin'), // 拓扑系统地址
26 workflowName: sessionStorage.getItem('workflow'),//流程系统地址 26 workflowName: sessionStorage.getItem('workflow'),//流程系统地址
27 - domainCMDBName: "http://120.236.178.177:7180/HGKJCMDB", //杭州咨源老cmdb系统地址 27 + domainCMDBName: "http://80.12.147.24:8888/hgkjcmdb", //杭州咨源老cmdb系统地址
28 lineTimer: null,//性能曲线图全局定时器 28 lineTimer: null,//性能曲线图全局定时器
29 detailTimer: [],//详细页的全局定时器 29 detailTimer: [],//详细页的全局定时器
30 alarmTimer: null,//首页告警刷新定时器 30 alarmTimer: null,//首页告警刷新定时器
@@ -324,6 +324,10 @@ export default { @@ -324,6 +324,10 @@ export default {
324 324
325 325
326 }, 1000) 326 }, 1000)
  327 + if(!isAllSelect){
  328 + proxy.selectText='全选'
  329 + isAllSelect=true;
  330 + }
327 } 331 }
328 332
329 333