monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit d33e8151249cea6b1cec58a4fd51a47661b66eed 2 parents c0396c96 4c375885

Merge branch 'master-v32-xwx' into 'master' 

告警模板绑定告警策略只能添加非默认策略



See merge request !727
Inline Side-by-side
Showing 2 changed files with 2 additions and 2 deletions
@@ -60,7 +60,7 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports) @@ -60,7 +60,7 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports)
60 //选择策略 60 //选择策略
61 $("#add_alarmtemplate_policy").on("click",function (){ 61 $("#add_alarmtemplate_policy").on("click",function (){
62 $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click'); 62 $('[lay-id="/baseconfig/alarmpolicy/index"]').find('.layui-tab-close').trigger('click');
63 - common.openWin("baseconfig/alarmpolicy/index","选择策略",{},["选择","取消"], function () { 63 + common.openWin("baseconfig/alarmpolicy/index","选择策略",{type:'alarmTemplate'},["选择","取消"], function () {
64 var data = layui.alarmpolicyIndex().getData(); 64 var data = layui.alarmpolicyIndex().getData();
65 createAlarmtemplatePolicyTable(data); 65 createAlarmtemplatePolicyTable(data);
66 return true; 66 return true;
@@ -77,7 +77,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions' @@ -77,7 +77,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
77 } 77 }
78 78
79 if (tempData && tempData.length > 0) { 79 if (tempData && tempData.length > 0) {
80 - common.openWin("baseconfig/alarmpolicy/index", "选择策略", {oldData: oldAlarmPolicyIdList}, ["选择", "取消"], function () { 80 + common.openWin("baseconfig/alarmpolicy/index", "选择策略", {oldData: oldAlarmPolicyIdList,type:'alarmTemplate'}, ["选择", "取消"], function () {
81 var policyData = layui.alarmpolicyIndex().getData(); 81 var policyData = layui.alarmpolicyIndex().getData();
82 var tempIds = [], policyIds = []; 82 var tempIds = [], policyIds = [];
83 $.each(tempData, function (i, v) { 83 $.each(tempData, function (i, v) {