Authored by 王涛

任务绑定资源增加列和搜索条件;资源列表增加列,筛选条件;

@@ -146,7 +146,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -146,7 +146,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
146 function bindSelectEvent() { 146 function bindSelectEvent() {
147 //选择业务搜索 147 //选择业务搜索
148 form.on('select(reslist_resListBizTypes)', function(data){ 148 form.on('select(reslist_resListBizTypes)', function(data){
149 - busId = data.value;  
150 reloadTable(resType); 149 reloadTable(resType);
151 }); 150 });
152 // 资源状态 151 // 资源状态
@@ -163,7 +162,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -163,7 +162,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
163 }); 162 });
164 163
165 // 绑定 164 // 绑定
  165 + // Start Wang 2022/3/25 14:04 当资源列表选择绑定类型后,下列表的数据导致不能修改,默认设置为空
  166 + $("#resManageIndexForm").find("select[name='collectionState']").val('');
166 form.on('select(resManageCollectionState)', function(data){ 167 form.on('select(resManageCollectionState)', function(data){
  168 + // 内容变更后设置对应的值
  169 + $("#resManageIndexForm").find("select[name='collectionState']").val(data.value);
167 reloadTable(resType); 170 reloadTable(resType);
168 }); 171 });
169 } 172 }
@@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
43 <div class="layui-inline"> 43 <div class="layui-inline">
44 <div class="layui-input-inline"> 44 <div class="layui-input-inline">
45 <select name="state" lay-filter="resManageStateSelect"> 45 <select name="state" lay-filter="resManageStateSelect">
46 - <option value="">=资源状态=</option> 46 + <option value="">=资源监控状态=</option>
47 <option value="new">新增</option> 47 <option value="new">新增</option>
48 <option value="monitor">监控</option> 48 <option value="monitor">监控</option>
49 <option value="stop">暂停监控</option> 49 <option value="stop">暂停监控</option>
@@ -19,17 +19,8 @@ @@ -19,17 +19,8 @@
19 </div> 19 </div>
20 <div class="layui-inline"> 20 <div class="layui-inline">
21 <div class="layui-input-inline"> 21 <div class="layui-input-inline">
22 - <select name="isBind" id="isBind" lay-filter="isBind" lay-verify="required">  
23 - <option value="">=是否绑定任务=</option>  
24 - <option value="0">未绑定</option>  
25 - <option value="1">已绑定</option>  
26 - </select>  
27 - </div>  
28 - </div>  
29 - <div class="layui-inline">  
30 - <div class="layui-input-inline">  
31 <select name="reslist_resStatus" id="reslist_resStatus" lay-filter="reslist_resStatus" lay-verify="required"> 22 <select name="reslist_resStatus" id="reslist_resStatus" lay-filter="reslist_resStatus" lay-verify="required">
32 - <option value="">=资源状态=</option> 23 + <option value="">=资源健康状态=</option>
33 <option value="1"></option> 24 <option value="1"></option>
34 <option value="2"></option> 25 <option value="2"></option>
35 <option value="3"></option> 26 <option value="3"></option>
@@ -46,7 +37,7 @@ @@ -46,7 +37,7 @@
46 <div class="layui-inline"> 37 <div class="layui-inline">
47 <div class="layui-input-inline"> 38 <div class="layui-input-inline">
48 <select name="state" lay-filter="state"> 39 <select name="state" lay-filter="state">
49 - <option value="">=资源状态=</option> 40 + <option value="">=资源监控状态=</option>
50 <option value="new">新增</option> 41 <option value="new">新增</option>
51 <option value="monitor">监控</option> 42 <option value="monitor">监控</option>
52 <option value="stop">暂停监控</option> 43 <option value="stop">暂停监控</option>