monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 张凯
Commit f64f1ccebdcf66edba073824d8770d8b3a5a5d34 2 parents 2a5f8099 2d7a04a8

Merge branch 'master-mj-joke' into 'master-mj' 

fix:bug#2531,#2532

fix:bug#2531,#2532

See merge request !1131
Inline Side-by-side
Showing 3 changed files with 14 additions and 11 deletions
@@ -151,6 +151,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -151,6 +151,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
151 //业务下拉框 151 //业务下拉框
152 common.busTreeSelect({ 152 common.busTreeSelect({
153 el: '#resource-edit-bus', 153 el: '#resource-edit-bus',
  154 + disabled:true,
154 name: 'busId', 155 name: 'busId',
155 on(data) { 156 on(data) {
156 bizId = ""; 157 bizId = "";
@@ -142,17 +142,18 @@ @@ -142,17 +142,18 @@
142 </div> 142 </div>
143 </div> 143 </div>
144 </div> 144 </div>
  145 + <!--监控不再编辑业务及厂商，均有cmdb调整-->
145 <div class="layui-form-item"> 146 <div class="layui-form-item">
146 <div class="inline-half layui-inline"> 147 <div class="inline-half layui-inline">
147 <label class="layui-form-label">所属业务</label> 148 <label class="layui-form-label">所属业务</label>
148 <div class="layui-input-inline"> 149 <div class="layui-input-inline">
149 - <div class="xm-select" id="resource-edit-bus"></div> 150 + <div class="xm-select" disabled="disabled" id="resource-edit-bus"></div>
150 </div> 151 </div>
151 </div> 152 </div>
152 <div class="inline-half layui-inline"> 153 <div class="inline-half layui-inline">
153 <label class="layui-form-label">厂商</label> 154 <label class="layui-form-label">厂商</label>
154 <div class="layui-input-inline"> 155 <div class="layui-input-inline">
155 - <select name="provider"></select> 156 + <select disabled="disabled" name="provider"></select>
156 </div> 157 </div>
157 </div> 158 </div>
158 </div> 159 </div>
@@ -97,12 +97,12 @@ @@ -97,12 +97,12 @@
97 </div> 97 </div>
98 <div class="layui-card-body"> 98 <div class="layui-card-body">
99 <div class="warn-btns"> 99 <div class="warn-btns">
100 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageAdd" type="button"><i  
101 - class="layui-icon">&#xe654;</i>新增  
102 - </button>  
103 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageCopy" type="button"><i  
104 - class="layui-icon">&#xe655;</i>拷贝  
105 - </button> 100 +<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageAdd" type="button"><i-->
  101 +<!-- class="layui-icon">&#xe654;</i>新增-->
  102 +<!-- </button>-->
  103 +<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageCopy" type="button"><i-->
  104 +<!-- class="layui-icon">&#xe655;</i>拷贝-->
  105 +<!-- </button>-->
106 <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageDel" type="button"><i 106 <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageDel" type="button"><i
107 class="layui-icon">&#xe640;</i>删除 107 class="layui-icon">&#xe640;</i>删除
108 </button> 108 </button>
@@ -136,9 +136,10 @@ @@ -136,9 +136,10 @@
136 type="button"><i 136 type="button"><i
137 class="layui-icon layui-icon-export"></i>导出资源 137 class="layui-icon layui-icon-export"></i>导出资源
138 </button> 138 </button>
139 - <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageDownloadTemp"  
140 - type="button"><i class="layui-icon">&#xe601;</i>下载模板  
141 - </button> 139 + <!--屏蔽，监控不再新增资源-->
  140 +<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageDownloadTemp"-->
  141 +<!-- type="button"><i class="layui-icon">&#xe601;</i>下载模板-->
  142 +<!-- </button>-->
142 </div> 143 </div>
143 </div> 144 </div>
144 <table id="resManageTable" lay-filter="resManageTable"></table> 145 <table id="resManageTable" lay-filter="resManageTable"></table>