monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by ‘superliu’
Commit e0c45fb58db7cec77e032a45e060262ef5c71649 1 parent 47b89589

任务管理-禅道150问题添加列。条件检索

Inline Side-by-side
Showing 2 changed files with 25 additions and 2 deletions
@@ -94,7 +94,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -94,7 +94,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
94 protocol:protocol, 94 protocol:protocol,
95 editMode: 'true', 95 editMode: 'true',
96 resCategory: 'resources', 96 resCategory: 'resources',
97 - pageName:'reslist' 97 + pageName:'reslist',
  98 + isBind:'0'
98 } 99 }
99 , height: 'full-350' 100 , height: 'full-350'
100 , cellMinWidth: 80 101 , cellMinWidth: 80
@@ -109,6 +110,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -109,6 +110,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
109 {type: 'numbers', title: '序号', align: 'center'} 110 {type: 'numbers', title: '序号', align: 'center'}
110 , {field: 'resName', title: '资源名称', minWidth: 300, align: 'center'} 111 , {field: 'resName', title: '资源名称', minWidth: 300, align: 'center'}
111 , {field: 'ip', title: 'IP地址', align: 'center'} 112 , {field: 'ip', title: 'IP地址', align: 'center'}
  113 + , {field: 'os', title: 'os', align: 'center'}
  114 + , {field: 'collProtocol', title: '采集协议', align: 'center'}
112 , {field: 'adminName', title: '负责人', align: 'center'} 115 , {field: 'adminName', title: '负责人', align: 'center'}
113 , {field: 'resTypeName', title: '资源类型', align: 'center'} 116 , {field: 'resTypeName', title: '资源类型', align: 'center'}
114 , {field: 'healthDesc', title: '资源状态', align: 'center'} 117 , {field: 'healthDesc', title: '资源状态', align: 'center'}
@@ -153,6 +156,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -153,6 +156,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
153 form.on('select(reslist_provider)', function(data){ 156 form.on('select(reslist_provider)', function(data){
154 reloadTable(resType); 157 reloadTable(resType);
155 }); 158 });
  159 + //监控状态
  160 + form.on('select(state)', function(data){
  161 + reloadTable(resType);
  162 + });
  163 +
  164 + //是否绑定任务
  165 + form.on('select(isBind)', function(data){
  166 + reloadTable(resType);
  167 + });
156 } 168 }
157 //刷新表格 169 //刷新表格
158 function reloadTable(resType) { 170 function reloadTable(resType) {
@@ -160,10 +172,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect' @@ -160,10 +172,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
160 url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all') 172 url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all')
161 , where: { 173 , where: {
162 access_token: accessToken, 174 access_token: accessToken,
  175 + keyword:$("#reslist_keyword").val(),
163 resName: $("#reslist_keyword").val(), 176 resName: $("#reslist_keyword").val(),
164 busId: $("#reslist_resListBizTypes").val(), 177 busId: $("#reslist_resListBizTypes").val(),
165 resHealth: $("#reslist_resStatus").val(), 178 resHealth: $("#reslist_resStatus").val(),
166 provider:$("#reslist_provider").val(), 179 provider:$("#reslist_provider").val(),
  180 + state:$("#state").val(),
  181 + isBind:$("#isBind").val(),
167 collectorId: collectorId, 182 collectorId: collectorId,
168 trapCollectorId: trapCollectorId, 183 trapCollectorId: trapCollectorId,
169 alarmTempId: alarmTempId, 184 alarmTempId: alarmTempId,
@@ -17,7 +17,15 @@ @@ -17,7 +17,15 @@
17 <div id="reslist_restype"></div> 17 <div id="reslist_restype"></div>
18 </div> 18 </div>
19 </div> 19 </div>
20 - 20 + <div class="layui-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>
21 <div class="layui-inline"> 29 <div class="layui-inline">
22 <div class="layui-input-inline"> 30 <div class="layui-input-inline">
23 <select name="reslist_resStatus" id="reslist_resStatus" lay-filter="reslist_resStatus" lay-verify="required"> 31 <select name="reslist_resStatus" id="reslist_resStatus" lay-filter="reslist_resStatus" lay-verify="required">