Authored by 袁晋鹏

告警订阅功能优化

@@ -19,6 +19,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -19,6 +19,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
19 }else{ 19 }else{
20 var policyId = ""; 20 var policyId = "";
21 } 21 }
  22 + let protocolList = [];
22 var resIdList = (data && data.resIdList) ? data.resIdList : []; 23 var resIdList = (data && data.resIdList) ? data.resIdList : [];
23 var sessions = layui.sessions; 24 var sessions = layui.sessions;
24 var accessToken = sessions.getToken()['access_token']; 25 var accessToken = sessions.getToken()['access_token'];
@@ -129,6 +130,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -129,6 +130,23 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
129 }); 130 });
130 } 131 }
131 132
  133 + $.ajax({
  134 + url: common.domainName + `/log-deploy/v1/lm2_protocol?access_token=${accessToken}`,
  135 + method:"get",
  136 + success(res){
  137 + protocolList = res.data;
  138 + },
  139 + })
  140 + // 回显表格协议类型字段
  141 + function agreementType(agreementId) {
  142 + var agreementType = '';
  143 + protocolList.forEach(v => {
  144 + if (v.id == agreementId) {
  145 + agreementType = v.protocolType;
  146 + }
  147 + });
  148 + return agreementType;
  149 + };
132 initNoticeWaySelect(); 150 initNoticeWaySelect();
133 initSubWaySelect(); 151 initSubWaySelect();
134 152
@@ -513,7 +531,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -513,7 +531,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
513 if(res.data && res.data.length > 0){ 531 if(res.data && res.data.length > 0){
514 $.each(res.data,function (i,v){ 532 $.each(res.data,function (i,v){
515 trs += `<tr><td>${i+1}</td><td>${v.devIdent}</td><td>${v.ipAddr}</td><td>${v.logfmtDirName}</td> 533 trs += `<tr><td>${i+1}</td><td>${v.devIdent}</td><td>${v.ipAddr}</td><td>${v.logfmtDirName}</td>
516 - <td>${v.protocolType}</td><td><span id="${v.id}" class="link resource_sublist_del">删除</span></td></tr>`; 534 + <td>${agreementType(v.protocolType)}</td><td><span id="${v.id}" class="link resource_sublist_del">删除</span></td></tr>`;
517 }); 535 });
518 } 536 }
519 537
@@ -529,7 +547,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu @@ -529,7 +547,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','tree'], fu
529 var trs = ''; 547 var trs = '';
530 $.each(res.data,function (i,v){ 548 $.each(res.data,function (i,v){
531 trs += `<tr><td>${i+1}</td><td>${v.devIdent}</td><td>${v.ipAddr}</td><td>${v.logfmtDirName}</td> 549 trs += `<tr><td>${i+1}</td><td>${v.devIdent}</td><td>${v.ipAddr}</td><td>${v.logfmtDirName}</td>
532 - <td>${v.protocolType}</td><td><span id="${v.id}" class="link resource_sublist_del">删除</span></td></tr>`; 550 + <td>${agreementType(v.protocolType)}</td><td><span id="${v.id}" class="link resource_sublist_del">删除</span></td></tr>`;
533 }); 551 });
534 var tb = ` 552 var tb = `
535 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form" hidden> 553 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="dyglTools-form" hidden>