monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by ‘superliu’
Commit 6e94c731711ef22e8c6f43cec012bfceca961097 1 parent 75d9eb4c

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

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', @@ -108,7 +108,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
108 , where: { 108 , where: {
109 access_token: accessToken, 109 access_token: accessToken,
110 dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(), 110 dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
111 - collScope: $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(), 111 + collScope: (data && data.protocol) ? data.protocol : $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
112 systemType: systemType, 112 systemType: systemType,
113 syncFlag: $("#dirctiveSearchForm").find("select[name='syncFlag']").val() 113 syncFlag: $("#dirctiveSearchForm").find("select[name='syncFlag']").val()
114 } 114 }
@@ -549,11 +549,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -549,11 +549,13 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
549 var formData = form.val('dirctive-form'); 549 var formData = form.val('dirctive-form');
550 var wheres={}; 550 var wheres={};
551 if(xjType=='xjType'){ 551 if(xjType=='xjType'){
552 - wheres={ access_token: accessToken, 552 + wheres={
  553 + access_token: accessToken,
553 dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(), 554 dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),
554 - collScope: protocol, 555 + collScope: $("#dirctiveSearchForm").find("input[name='dirctiveProtocol']").val(),
555 systemType: 2, 556 systemType: 2,
556 - syncFlag: formData.syncFlag} 557 + syncFlag: formData.syncFlag
  558 + }
557 }else{ 559 }else{
558 wheres= { 560 wheres= {
559 access_token: accessToken, dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(), 561 access_token: accessToken, dirctiveName: $("#dirctiveSearchForm").find("input[name='dirctiveName']").val(),