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
//业务下拉框
common.busTreeSelect({
el: '#resource-edit-bus',
disabled:true,
name: 'busId',
on(data) {
bizId = "";
... ...
... ... @@ -142,17 +142,18 @@
</div>
</div>
</div>
<!--监控不再编辑业务及厂商，均有cmdb调整-->
<div class="layui-form-item">
<div class="inline-half layui-inline">
<label class="layui-form-label">所属业务</label>
<div class="layui-input-inline">
<div class="xm-select" id="resource-edit-bus"></div>
<div class="xm-select" disabled="disabled" id="resource-edit-bus"></div>
</div>
</div>
<div class="inline-half layui-inline">
<label class="layui-form-label">厂商</label>
<div class="layui-input-inline">
<select name="provider"></select>
<select disabled="disabled" name="provider"></select>
</div>
</div>
</div>
... ...
... ... @@ -97,12 +97,12 @@
</div>
<div class="layui-card-body">
<div class="warn-btns">
<button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageAdd" type="button"><i
class="layui-icon">&#xe654;</i>新增
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageCopy" type="button"><i
class="layui-icon">&#xe655;</i>拷贝
</button>
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageAdd" type="button"><i-->
<!-- class="layui-icon">&#xe654;</i>新增-->
<!-- </button>-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageCopy" type="button"><i-->
<!-- class="layui-icon">&#xe655;</i>拷贝-->
<!-- </button>-->
<button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageDel" type="button"><i
class="layui-icon">&#xe640;</i>删除
</button>
... ... @@ -136,9 +136,10 @@
type="button"><i
class="layui-icon layui-icon-export"></i>导出资源
</button>
<button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageDownloadTemp"
type="button"><i class="layui-icon">&#xe601;</i>下载模板
</button>
<!--屏蔽，监控不再新增资源-->
<!-- <button class="layui-btn layui-btn-sm layui-btn-normal" id="resManageDownloadTemp"-->
<!-- type="button"><i class="layui-icon">&#xe601;</i>下载模板-->
<!-- </button>-->
</div>
</div>
<table id="resManageTable" lay-filter="resManageTable"></table>
... ...