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

(cherry picked from commit 6e94c731)

巡检选择指令-初始化加载协议参数
(cherry picked from commit 6e94c731)
‘superliu’
Commit cc1df3fe33b71c68f41a0f8ce2e3d0ff710fadf2 1 parent 919db08c
Showing 1 changed file with 6 additions and 4 deletions
hg-monitor-web-base/src/main/resources/static/src/controller/dirctiveIndex.js
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/dirctiveIndex.js
View file @cc1df3f
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/dirctiveIndex.js
View file @cc1df3f
@@ -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(),