monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d3677dfe15e66f090f1e27b2906fbbdf00b78f17 2 parents 75d9eb4c 6e94c731

Merge branch 'master-V32-LH' into 'master' 

巡检选择指令-初始化加载协议参数



See merge request !426
Inline Side-by-side
Showing 1 changed file with 6 additions and 4 deletions
... ... @@ -108,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()
}
... ... @@ -549,11 +549,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
var formData = form.val('dirctive-form');
var wheres={};
if(xjType=='xjType'){
wheres={ access_token: accessToken,
wheres={
access_token: accessToken,
dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
collScope: protocol,
collScope: $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
systemType: 2,
syncFlag: formData.syncFlag}
syncFlag: formData.syncFlag
}
}else{
wheres= {
access_token: accessToken, dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
... ...