monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 92952dcc1d8dc0880e337a7567984079067ff562 2 parents 67d54974 ab6b7b93

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

Inline Side-by-side
Showing 2 changed files with 6 additions and 4 deletions
@@ -24,6 +24,7 @@ layui.define(['xmSelect', 'md5'], function (exports) { @@ -24,6 +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 lineTimer: null,//性能曲线图全局定时器 28 lineTimer: null,//性能曲线图全局定时器
28 detailTimer: [],//详细页的全局定时器 29 detailTimer: [],//详细页的全局定时器
29 alarmTimer: null,//首页告警刷新定时器 30 alarmTimer: null,//首页告警刷新定时器
@@ -61,10 +61,11 @@ @@ -61,10 +61,11 @@
61 <button type="button" id="searchBtn" class="layui-btn layui-btn-sm layuiadmin-btn-comm">筛选 61 <button type="button" id="searchBtn" class="layui-btn layui-btn-sm layuiadmin-btn-comm">筛选
62 </button> 62 </button>
63 </div> 63 </div>
64 - <div class="work-tab-right">  
65 - <button type="button" id="workIndexFlowBtn" class="layui-btn layui-btn-sm layui-btn-primary">发起流程  
66 - </button>  
67 - </div> 64 + <!--去除发起流程 joke add 20211130-->
  65 +<!-- <div class="work-tab-right">-->
  66 +<!-- <button type="button" id="workIndexFlowBtn" class="layui-btn layui-btn-sm layui-btn-primary">发起流程-->
  67 +<!-- </button>-->
  68 +<!-- </div>-->
68 <div class="layui-tab-content"> 69 <div class="layui-tab-content">
69 <div class="layui-tab-item layui-show"> 70 <div class="layui-tab-item layui-show">
70 <div class="mt15" id="workIndexFlowByMe"></div> 71 <div class="mt15" id="workIndexFlowByMe"></div>