monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit c080a4829e74d19dbec5633656b5e04b41e7cf08 2 parents 6504dc6c e0c45fb5

Merge branch 'master-500-dev-LH' into 'master-500-dev' 

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



See merge request !491
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'
protocol:protocol,
editMode: 'true',
resCategory: 'resources',
pageName:'reslist'
pageName:'reslist',
isBind:'0'
}
, height: 'full-350'
, cellMinWidth: 80
... ... @@ -109,6 +110,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
{type: 'numbers', title: '序号', align: 'center'}
, {field: 'resName', title: '资源名称', minWidth: 300, align: 'center'}
, {field: 'ip', title: 'IP地址', align: 'center'}
, {field: 'os', title: 'os', align: 'center'}
, {field: 'collProtocol', title: '采集协议', align: 'center'}
, {field: 'adminName', title: '负责人', align: 'center'}
, {field: 'resTypeName', title: '资源类型', align: 'center'}
, {field: 'healthDesc', title: '资源状态', align: 'center'}
... ... @@ -153,6 +156,15 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
form.on('select(reslist_provider)', function(data){
reloadTable(resType);
});
//监控状态
form.on('select(state)', function(data){
reloadTable(resType);
});
//是否绑定任务
form.on('select(isBind)', function(data){
reloadTable(resType);
});
}
//刷新表格
function reloadTable(resType) {
... ... @@ -160,10 +172,13 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions', 'xmSelect'
url: common.domainName + '/api-web/home/res-list/' + (resType ? resType : 'all')
, where: {
access_token: accessToken,
keyword:$("#reslist_keyword").val(),
resName: $("#reslist_keyword").val(),
busId: $("#reslist_resListBizTypes").val(),
resHealth: $("#reslist_resStatus").val(),
provider:$("#reslist_provider").val(),
state:$("#state").val(),
isBind:$("#isBind").val(),
collectorId: collectorId,
trapCollectorId: trapCollectorId,
alarmTempId: alarmTempId,
... ...
... ... @@ -17,7 +17,15 @@
<div id="reslist_restype"></div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="isBind" id="isBind" lay-filter="isBind" lay-verify="required">
<option value="">=是否绑定任务=</option>
<option value="0">未绑定</option>
<option value="1">已绑定</option>
</select>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="reslist_resStatus" id="reslist_resStatus" lay-filter="reslist_resStatus" lay-verify="required">
... ...