diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/dirctiveIndex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/dirctiveIndex.js index eddc9c0..0e57b77 100644 --- a/hg-monitor-web-base/src/main/resources/static/src/controller/dirctiveIndex.js +++ b/hg-monitor-web-base/src/main/resources/static/src/controller/dirctiveIndex.js @@ -15,6 +15,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', var writeBackDirctiveList = (data && data.writeBackDirctiveList) ? data.writeBackDirctiveList : []; var systemType = (data && data.systemType) ? data.systemType : ''; var protocol = (data && data.protocol) ? data.protocol : ''; + var xjType = (data && data.xjType) ? data.xjType : ''; var accessToken = sessions.getToken()['access_token']; var loginName = localStorage.getItem("lgn"); var restoreVersionTable = {}; @@ -107,7 +108,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', , where: { access_token: accessToken, dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(), - collScope: $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(), + collScope: (data && data.protocol) ? data.protocol : $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(), systemType: systemType, syncFlag: $("#dirctiveSearchForm").find("select[name='syncFlag']").val() } @@ -417,6 +418,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', }).done(function (res) { xmSelect.render({ el: '#dir_dirctiveProtocol' + ,initValue: protocol.split(',') , filterable: true , tips: '=采集协议=' , name: 'dirctiveProtocol' @@ -545,17 +547,27 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', //刷新表格 function reloadTable() { var formData = form.val('dirctive-form'); - dirctiveTable.reload({ - page: { - curr: 1 - } - ,where: { - access_token: accessToken, + var wheres={}; + if(xjType=='xjType'){ + wheres={ access_token: accessToken, dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(), + collScope: protocol, + systemType: 2, + syncFlag: formData.syncFlag} + }else{ + wheres= { + access_token: accessToken, dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(), collScope: $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(), systemType: formData.systemType, syncFlag: formData.syncFlag } + } + + dirctiveTable.reload({ + page: { + curr: 1 + } + ,where: wheres }); } });