monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit c553f1279508f9078463efff9a055db60e17cd3e 1 parent c96f3352

告警策略类型改为从字典获取

Inline Side-by-side
Showing 2 changed files with 123 additions and 101 deletions
1 //告警策略 1 //告警策略
2 -layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], function (exports) { 2 +layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], function (exports) {
3 var $ = layui.$; 3 var $ = layui.$;
4 var form = layui.form; 4 var form = layui.form;
5 var laydate = layui.laydate; 5 var laydate = layui.laydate;
@@ -18,34 +18,65 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -18,34 +18,65 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
18 , async: false 18 , async: false
19 }).done(function (res) { 19 }).done(function (res) {
20 let radioData = res.data; 20 let radioData = res.data;
21 - let htmlRadio = ''; 21 + let htmlRadio = ' <option value="">=策略类型=</option>';
22 if (radioData && radioData.length > 0) { 22 if (radioData && radioData.length > 0) {
23 radioData.map(item => { 23 radioData.map(item => {
24 - $('#alarmpolicy_policyType_add').append(`<input type="radio" data-sort="`+item.ddicSort+`" name="policyType" value="`+item.ddicSort+`" title="`+item.ddicName+`">`) 24 + htmlRadio += `<option value="` + item.ddicSort + `">` + item.ddicName + '</option>'
25 }) 25 })
26 } 26 }
27 - $('#alarmpolicy_policyType_add [data-sort]:nth-child(2)').attr("checked",true); 27 + ;
  28 + $('#alarmpolicy_policyType_add').html(htmlRadio);
28 }); 29 });
  30 + //编辑
  31 + if (data && data.id) {
  32 + // 获取通知合并策略的表达式
  33 + admin.req({
  34 + url: domainName + '/api-web/policyMerge/get?noticeMergePolicyId=' + data.id
  35 + , async: false
  36 + , done: function (res) {
  37 + $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);
  38 + }
  39 + });
  40 + var policyType = '';
  41 + admin.req({
  42 + url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id
  43 + , async: false
  44 + , done: function (res) {
  45 + exprToChar(res.object, 'alarmContentExpr');
  46 + exprToChar(res.object, 'cleanPolicy');
  47 + exprToChar(res.object, 'commonlyExpr');
  48 + exprToChar(res.object, 'importantExpr');
  49 + exprToChar(res.object, 'seriousExpr');
  50 + $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);
  51 + $("#seriousTimes").val(res.object.seriousTimes);
  52 + $("#alarmpolicy_policyType_add").val(res.object.policyType);
  53 + }
  54 + });
  55 + } else {
  56 + $("#alarmpolicy_policyType_add").val('1');
  57 + $("#seriousTimes").val('00:00:00 - 23:59:59');
  58 + }
29 form.render(null, 'add-alarmpolicy-form'); 59 form.render(null, 'add-alarmpolicy-form');
30 //初始化日期组件 60 //初始化日期组件
31 laydate.render({ 61 laydate.render({
32 elem: '#seriousTimes' 62 elem: '#seriousTimes'
33 - ,type: 'time'  
34 - ,range: true 63 + , type: 'time'
  64 + , range: true
35 }); 65 });
36 var resType = localStorage.getItem("currentResType"); 66 var resType = localStorage.getItem("currentResType");
37 var NoticeMergeFlag = 'off'; 67 var NoticeMergeFlag = 'off';
38 // 获取合并通知开关是否开启 68 // 获取合并通知开关是否开启
39 getNoticeMergeFlag(); 69 getNoticeMergeFlag();
40 - function getNoticeMergeFlag(){ 70 +
  71 + function getNoticeMergeFlag() {
41 admin.req({ 72 admin.req({
42 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag' 73 url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
43 , method: 'POST' 74 , method: 'POST'
44 , async: false 75 , async: false
45 , success: function (res) { 76 , success: function (res) {
46 $.each(res.data, function (i, v) { 77 $.each(res.data, function (i, v) {
47 - if(v.ddicCode == 'on'){  
48 - NoticeMergeFlag= 'on'; 78 + if (v.ddicCode == 'on') {
  79 + NoticeMergeFlag = 'on';
49 $('#noticeMergeTab').show(); 80 $('#noticeMergeTab').show();
50 } 81 }
51 }); 82 });
@@ -53,46 +84,19 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -53,46 +84,19 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
53 }) 84 })
54 } 85 }
55 86
56 - //编辑  
57 - if(data && data.id){  
58 - admin.req({  
59 - url:domainName + '/api-web/alarmPolicy/getbyId/'+data.id  
60 - ,done:function (res){  
61 - exprToChar(res.object, 'alarmContentExpr');  
62 - exprToChar(res.object, 'cleanPolicy');  
63 - exprToChar(res.object, 'commonlyExpr');  
64 - exprToChar(res.object, 'importantExpr');  
65 - exprToChar(res.object, 'seriousExpr');  
66 - form.val("add-alarmpolicy-form",res.object);  
67 - $("#alarm-policy-kpiName").val(res.object.kpiId +" "+ res.object.kpiName);  
68 - $("#seriousTimes").val(res.object.seriousTimes);  
69 - $("#alarmPolicyType").val(res.object.policyType);  
70 - }  
71 - });  
72 - // 获取通知合并策略的表达式  
73 - admin.req({  
74 - url:domainName + '/api-web/policyMerge/get?noticeMergePolicyId='+data.id  
75 - ,done:function (res){  
76 - $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);  
77 - }  
78 - });  
79 -  
80 - }else{  
81 - $("#seriousTimes").val('00:00:00 - 23:59:59');  
82 - }  
83 $('#btn-alarmpolicy-expr-add').unbind('click').on('click', function () { 87 $('#btn-alarmpolicy-expr-add').unbind('click').on('click', function () {
84 editNoticeExpr(); 88 editNoticeExpr();
85 return false; 89 return false;
86 }); 90 });
87 //全天 91 //全天
88 - $(".allday").on("click",function (){ 92 + $(".allday").on("click", function () {
89 var id = $(this).data("flag"); 93 var id = $(this).data("flag");
90 - $("#"+id).val('00:00:00 - 23:59:59'); 94 + $("#" + id).val('00:00:00 - 23:59:59');
91 }); 95 });
92 //工作时间 96 //工作时间
93 - $(".worktime").on("click",function (){ 97 + $(".worktime").on("click", function () {
94 var id = $(this).data("flag"); 98 var id = $(this).data("flag");
95 - $("#"+id).val('08:00:00 - 19:59:59'); 99 + $("#" + id).val('08:00:00 - 19:59:59');
96 }); 100 });
97 $('.noticeExpr').unbind('click').on('click', function () { 101 $('.noticeExpr').unbind('click').on('click', function () {
98 var id = $(this).prop('id'); 102 var id = $(this).prop('id');
@@ -104,7 +108,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -104,7 +108,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
104 editNoticeExpr($(this).val(), alarmTimes, id); 108 editNoticeExpr($(this).val(), alarmTimes, id);
105 }); 109 });
106 //指标信息 110 //指标信息
107 - if(data.kpiId){ 111 + if (data.kpiId) {
108 $("#alarm-policy-kpiId").val(data.kpiId); 112 $("#alarm-policy-kpiId").val(data.kpiId);
109 $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name); 113 $("#alarm-policy-kpiName").val(data.kpiId + " " + data.name);
110 } 114 }
@@ -112,48 +116,48 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -112,48 +116,48 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
112 //告警规则类型切换事件 116 //告警规则类型切换事件
113 form.on('radio(alarm-policy-rule-type)', function (data) { 117 form.on('radio(alarm-policy-rule-type)', function (data) {
114 var flag = $(data.elem).data("flag"); 118 var flag = $(data.elem).data("flag");
115 - if(data.value == '1'){ 119 + if (data.value == '1') {
116 $(`.${flag}-tab-item`).find("div.cont-base").show(); 120 $(`.${flag}-tab-item`).find("div.cont-base").show();
117 - }else{ 121 + } else {
118 $(`.${flag}-tab-item`).find("div.cont-base").hide(); 122 $(`.${flag}-tab-item`).find("div.cont-base").hide();
119 $(`#${flag}Policy`).val(''); 123 $(`#${flag}Policy`).val('');
120 } 124 }
121 }); 125 });
122 //选择指标 126 //选择指标
123 - $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click",function (){  
124 - common.openWin("template/res/reskpilist","选择指标", {resType:null},["选择","取消"], function () { 127 + $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").unbind('click').on("click", function () {
  128 + common.openWin("template/res/reskpilist", "选择指标", {resType: null}, ["选择", "取消"], function () {
125 var data = layui.reskpilist().getData(); 129 var data = layui.reskpilist().getData();
126 - if(data && data.length != 1){  
127 - layer.msg('只能选择一个指标！', {icon: 7,time:3000}); 130 + if (data && data.length != 1) {
  131 + layer.msg('只能选择一个指标！', {icon: 7, time: 3000});
128 return false; 132 return false;
129 } 133 }
130 - if(data && data.length > 0){ 134 + if (data && data.length > 0) {
131 $("#alarm-policy-kpiId").val(data[0].kpiId); 135 $("#alarm-policy-kpiId").val(data[0].kpiId);
132 $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName); 136 $("#alarm-policy-kpiName").val(data[0].kpiId + " " + data[0].kpiName);
133 $("#alarmPolicyName").val(data[0].kpiName + "告警策略"); 137 $("#alarmPolicyName").val(data[0].kpiName + "告警策略");
134 138
135 - var arry = [ "base", "cpu", "mem"]; 139 + var arry = ["base", "cpu", "mem"];
136 return true; 140 return true;
137 } 141 }
138 }); 142 });
139 }); 143 });
140 144
141 //增加一行策略表达式输入框 145 //增加一行策略表达式输入框
142 - $("i.policy-input-add").off("click").on("click",function (){ 146 + $("i.policy-input-add").off("click").on("click", function () {
143 var id = $(this).data("id"); 147 var id = $(this).data("id");
144 clonePolicyDoms(id); 148 clonePolicyDoms(id);
145 }); 149 });
146 //删除告警策略规则行 150 //删除告警策略规则行
147 - $("i.policy-input-del").on("click",function (){ 151 + $("i.policy-input-del").on("click", function () {
148 var id = $(this).data("id"); 152 var id = $(this).data("id");
149 $(`#${id}`).remove(); 153 $(`#${id}`).remove();
150 }); 154 });
151 155
152 156
153 //生成策略 157 //生成策略
154 - $("a.createpolicybtn").on("click",function (){ 158 + $("a.createpolicybtn").on("click", function () {
155 var kpiId = $("#alarm-policy-kpiId").val(); 159 var kpiId = $("#alarm-policy-kpiId").val();
156 - if(!kpiId){ 160 + if (!kpiId) {
157 layer.msg("请先选择指标！", { 161 layer.msg("请先选择指标！", {
158 icon: 7 162 icon: 7
159 , time: 3000 163 , time: 3000
@@ -161,30 +165,44 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -161,30 +165,44 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
161 return false; 165 return false;
162 } 166 }
163 var policyFlag = $(this).data("flag"); 167 var policyFlag = $(this).data("flag");
164 - var conOjb = {"0":">","1":"<","2":"=","3":">=","4":"<=","5":"equals","6":"contains","7":"startsWith","8":"endsWith"}; 168 + var conOjb = {
  169 + "0": ">",
  170 + "1": "<",
  171 + "2": "=",
  172 + "3": ">=",
  173 + "4": "<=",
  174 + "5": "equals",
  175 + "6": "contains",
  176 + "7": "startsWith",
  177 + "8": "endsWith"
  178 + };
165 var doms = $(`[id^=${policyFlag}-policy-box]`); 179 var doms = $(`[id^=${policyFlag}-policy-box]`);
166 var policyStr = ''; 180 var policyStr = '';
167 - $(doms).each(function(i,v){ 181 + $(doms).each(function (i, v) {
168 var domId = $(v).attr("id"); 182 var domId = $(v).attr("id");
169 - if(domId.indexOf("condition") != -1){//条件 183 + if (domId.indexOf("condition") != -1) {//条件
170 var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch"); 184 var open = $(v).find('.layui-form-switch').hasClass("layui-form-onswitch");
171 - if(open){ policyStr += "||" }else{ policyStr += "&&" }  
172 - }else{ //值  
173 - var conditon = $(v).find("."+policyFlag+"_condition").val();  
174 - var cls = policyFlag +"_value";  
175 - var conval = $(v).find('[flag="'+cls+'"]').val().trim();  
176 - if(conval){  
177 - if(conditon < 5){ //数字类的 185 + if (open) {
  186 + policyStr += "||"
  187 + } else {
  188 + policyStr += "&&"
  189 + }
  190 + } else { //值
  191 + var conditon = $(v).find("." + policyFlag + "_condition").val();
  192 + var cls = policyFlag + "_value";
  193 + var conval = $(v).find('[flag="' + cls + '"]').val().trim();
  194 + if (conval) {
  195 + if (conditon < 5) { //数字类的
178 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`; 196 policyStr += `Double.parseDouble([${kpiId},kpiValue])${conOjb[conditon]}${conval}`;
179 - }else{ //字符串类的 197 + } else { //字符串类的
180 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`; 198 policyStr += `[${kpiId},kpiValue].${conOjb[conditon]}("${conval}")`;
181 } 199 }
182 } 200 }
183 } 201 }
184 }); 202 });
185 - if(policyStr){ 203 + if (policyStr) {
186 $(`#${policyFlag}Policy`).val(policyStr); 204 $(`#${policyFlag}Policy`).val(policyStr);
187 - }else{ 205 + } else {
188 layer.msg("请先输入策略值！", { 206 layer.msg("请先输入策略值！", {
189 icon: 7 207 icon: 7
190 , time: 3000 208 , time: 3000
@@ -194,7 +212,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -194,7 +212,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
194 }); 212 });
195 213
196 //保存策略 214 //保存策略
197 - $("#alarmpolicy-form-save-id").on("click",function (){ 215 + $("#alarmpolicy-form-save-id").on("click", function () {
198 var data = form.val("add-alarmpolicy-form"); 216 var data = form.val("add-alarmpolicy-form");
199 //移除非数进性的属性 217 //移除非数进性的属性
200 delete data['serious-policy-type']; 218 delete data['serious-policy-type'];
@@ -208,7 +226,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -208,7 +226,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
208 data.commonlyTimes = $("#seriousTimes").val(); 226 data.commonlyTimes = $("#seriousTimes").val();
209 var that = this; 227 var that = this;
210 228
211 - if(!data.kpiId){ 229 + if (!data.kpiId) {
212 layer.msg("请先选择指标！", { 230 layer.msg("请先选择指标！", {
213 icon: 7 231 icon: 7
214 , time: 3000 232 , time: 3000
@@ -216,7 +234,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -216,7 +234,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
216 return false; 234 return false;
217 } 235 }
218 236
219 - if(!data.kpiId || data.kpiId == ''){ 237 + if (!data.kpiId || data.kpiId == '') {
220 layer.msg("请先选择指标！", { 238 layer.msg("请先选择指标！", {
221 icon: 7 239 icon: 7
222 , time: 3000 240 , time: 3000
@@ -232,7 +250,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -232,7 +250,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
232 return false; 250 return false;
233 } 251 }
234 252
235 - if(!data.alarmContentExpr || data.alarmContentExpr == ''){ 253 + if (!data.alarmContentExpr || data.alarmContentExpr == '') {
236 layer.msg("请先填写告警内容描述表达式！", { 254 layer.msg("请先填写告警内容描述表达式！", {
237 icon: 7 255 icon: 7
238 , time: 3000 256 , time: 3000
@@ -244,7 +262,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -244,7 +262,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
244 var importantPolicy = data.seriousPolicy; 262 var importantPolicy = data.seriousPolicy;
245 var importantExpr = data.importantPolicy; 263 var importantExpr = data.importantPolicy;
246 var commonlyPolicy = data.commonlyPolicy; 264 var commonlyPolicy = data.commonlyPolicy;
247 - if((!importantPolicy || importantPolicy == '') && (!importantExpr || importantExpr == '') && (!commonlyPolicy || commonlyPolicy == '')){ 265 + if ((!importantPolicy || importantPolicy == '') && (!importantExpr || importantExpr == '') && (!commonlyPolicy || commonlyPolicy == '')) {
248 layer.msg("严重、重要和一般告警的表达式必须有一项不为空！", { 266 layer.msg("严重、重要和一般告警的表达式必须有一项不为空！", {
249 icon: 7 267 icon: 7
250 , time: 3000 268 , time: 3000
@@ -252,8 +270,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -252,8 +270,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
252 return false; 270 return false;
253 } 271 }
254 272
255 - if(NoticeMergeFlag && NoticeMergeFlag == 'on'){  
256 - if(!data.noticeMergeFlagExpr || data.noticeMergeFlagExpr == ''){ 273 + if (NoticeMergeFlag && NoticeMergeFlag == 'on') {
  274 + if (!data.noticeMergeFlagExpr || data.noticeMergeFlagExpr == '') {
257 layer.msg("请先填写通知合并策略描述表达式！", { 275 layer.msg("请先填写通知合并策略描述表达式！", {
258 icon: 7 276 icon: 7
259 , time: 3000 277 , time: 3000
@@ -266,7 +284,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -266,7 +284,8 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
266 * 保存通知合并策略 284 * 保存通知合并策略
267 */ 285 */
268 var noticeMergeFlagExpr = $("#noticeMergeFlagExpr").val() 286 var noticeMergeFlagExpr = $("#noticeMergeFlagExpr").val()
269 - function saveNoticeMerge(id){ 287 +
  288 + function saveNoticeMerge(id) {
270 var noticeMergeData = { 289 var noticeMergeData = {
271 "mergePolicyId": id, 290 "mergePolicyId": id,
272 "mergePolicyName": data.alarmPolicyName, 291 "mergePolicyName": data.alarmPolicyName,
@@ -276,44 +295,45 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -276,44 +295,45 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
276 "kpiId": data.kpiId 295 "kpiId": data.kpiId
277 } 296 }
278 admin.req({ 297 admin.req({
279 - url : domainName + '/api-web/policyMerge/save?access_token='+accessToken  
280 - ,data:JSON.stringify(noticeMergeData)  
281 - ,type:'post'  
282 - ,contentType: "application/json; charset=utf-8"  
283 - ,done:function (res){  
284 - if(!res.success){  
285 - layer.msg(res.msg ? res.msg : '通知合并策略保存失败', { offset: '15px' , icon: 7 , time: 1000 }); 298 + url: domainName + '/api-web/policyMerge/save?access_token=' + accessToken
  299 + , data: JSON.stringify(noticeMergeData)
  300 + , type: 'post'
  301 + , contentType: "application/json; charset=utf-8"
  302 + , done: function (res) {
  303 + if (!res.success) {
  304 + layer.msg(res.msg ? res.msg : '通知合并策略保存失败', {offset: '15px', icon: 7, time: 1000});
286 } 305 }
287 } 306 }
288 }); 307 });
289 } 308 }
  309 +
290 charToExpr(data, 'alarmContentExpr'); 310 charToExpr(data, 'alarmContentExpr');
291 charToExpr(data, 'cleanPolicy'); 311 charToExpr(data, 'cleanPolicy');
292 charToExpr(data, 'commonlyExpr'); 312 charToExpr(data, 'commonlyExpr');
293 charToExpr(data, 'importantExpr'); 313 charToExpr(data, 'importantExpr');
294 charToExpr(data, 'seriousExpr'); 314 charToExpr(data, 'seriousExpr');
295 315
296 - form.on('submit(add-alarmpolicy-form)',function () { 316 + form.on('submit(add-alarmpolicy-form)', function () {
297 delete data.noticeMergeFlagExpr; 317 delete data.noticeMergeFlagExpr;
298 admin.req({ 318 admin.req({
299 - url : domainName + '/api-web/alarmPolicy/save?access_token='+accessToken  
300 - ,data:JSON.stringify(data)  
301 - ,type:'post'  
302 - ,contentType: "application/json; charset=utf-8"  
303 - ,done:function (res){  
304 - if(res.success){ 319 + url: domainName + '/api-web/alarmPolicy/save?access_token=' + accessToken
  320 + , data: JSON.stringify(data)
  321 + , type: 'post'
  322 + , contentType: "application/json; charset=utf-8"
  323 + , done: function (res) {
  324 + if (res.success) {
305 // 保存通知合并策略 325 // 保存通知合并策略
306 saveNoticeMerge(res.str); 326 saveNoticeMerge(res.str);
307 327
308 - localStorage.setItem("detailPageOfcustomPolicyId",res.str)  
309 - layer.msg(res.msg, { offset: '15px' , icon: 1 , time: 1000 },function (){ 328 + localStorage.setItem("detailPageOfcustomPolicyId", res.str)
  329 + layer.msg(res.msg, {offset: '15px', icon: 1, time: 1000}, function () {
310 localStorage.removeItem("currentResType"); 330 localStorage.removeItem("currentResType");
311 - if(layui.alarmpolicyIndex && layui.alarmpolicyIndex()){ 331 + if (layui.alarmpolicyIndex && layui.alarmpolicyIndex()) {
312 layui.alarmpolicyIndex().reloadAlarmPolicy() 332 layui.alarmpolicyIndex().reloadAlarmPolicy()
313 } 333 }
314 }); 334 });
315 - }else{  
316 - layer.msg(res.msg, { offset: '15px' , icon: 7 , time: 1000 }); 335 + } else {
  336 + layer.msg(res.msg, {offset: '15px', icon: 7, time: 1000});
317 } 337 }
318 } 338 }
319 }); 339 });
@@ -323,24 +343,24 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -323,24 +343,24 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
323 }); 343 });
324 344
325 //克隆告警策略元素 345 //克隆告警策略元素
326 - function clonePolicyDoms(id){ 346 + function clonePolicyDoms(id) {
327 var times = new Date().getTime() 347 var times = new Date().getTime()
328 var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition"> 348 var cond = `<div class="layui-form-item cont-base" id="${id}-${times}-condition">
329 <input type="checkbox" checked="" lay-skin="switch" lay-text="或|且"> 349 <input type="checkbox" checked="" lay-skin="switch" lay-text="或|且">
330 </div>`; 350 </div>`;
331 var clone = $(`#${id}`).clone(); 351 var clone = $(`#${id}`).clone();
332 - clone.attr("id",id+"-"+times).find("i.policy-input-add").addClass("hide")  
333 - .parent().parent().find("i.policy-input-del").attr("data-id",id + "-"+times).removeClass("hide") 352 + clone.attr("id", id + "-" + times).find("i.policy-input-add").addClass("hide")
  353 + .parent().parent().find("i.policy-input-del").attr("data-id", id + "-" + times).removeClass("hide")
334 .parent().parent().find("input.layui-input").val(""); 354 .parent().parent().find("input.layui-input").val("");
335 $(`#${id}`).after(clone).after(cond); 355 $(`#${id}`).after(clone).after(cond);
336 356
337 form.render(); 357 form.render();
338 //渲染新增事件 358 //渲染新增事件
339 - $("i.policy-input-add").off("click").on("click",function (){ 359 + $("i.policy-input-add").off("click").on("click", function () {
340 clonePolicyDoms($(this).data("id")); 360 clonePolicyDoms($(this).data("id"));
341 }); 361 });
342 //删除告警策略规则行 362 //删除告警策略规则行
343 - $("i.policy-input-del").off("click").on("click",function (){ 363 + $("i.policy-input-del").off("click").on("click", function () {
344 var id = $(this).data("id"); 364 var id = $(this).data("id");
345 $(`#${id}`).remove(); 365 $(`#${id}`).remove();
346 $(`#${id}-condition`).remove(); 366 $(`#${id}-condition`).remove();
@@ -348,7 +368,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -348,7 +368,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
348 } 368 }
349 369
350 function editNoticeExpr(noticeExpr, alarmTimes, noticeType) { 370 function editNoticeExpr(noticeExpr, alarmTimes, noticeType) {
351 - var title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>编辑通知表达式`; 371 + var title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>编辑通知表达式`;
352 common.openWin('baseconfig/alarmpolicy/noticeExprEdit', title, { 372 common.openWin('baseconfig/alarmpolicy/noticeExprEdit', title, {
353 noticeExpr, 373 noticeExpr,
354 noticeType 374 noticeType
@@ -370,7 +390,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun @@ -370,7 +390,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
370 //如果是详情页过来的，则不能改变指标和默认状态 390 //如果是详情页过来的，则不能改变指标和默认状态
371 if (data && data.from === 'detail') { 391 if (data && data.from === 'detail') {
372 $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click'); 392 $("#alarmpolicy-form-select-kpi, #alarm-policy-kpiName").off('click');
373 - $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled","disabled"); 393 + $('#add-alarmpolicy-form').find('[name="policyType"]').attr("disabled", "disabled");
374 } 394 }
375 }); 395 });
376 }); 396 });
@@ -21,7 +21,9 @@ @@ -21,7 +21,9 @@
21 </div> 21 </div>
22 <div class="layui-inline"> 22 <div class="layui-inline">
23 <label class="layui-form-label">是否默认</label> 23 <label class="layui-form-label">是否默认</label>
24 - <div class="layui-input-inline padding-left-10" id="alarmpolicy_policyType_add"> 24 + <div class="layui-input-inline">
  25 + <select lay-filter="alarmpolicy_policyType_add" id="alarmpolicy_policyType_add">
  26 + </select>
25 </div> 27 </div>
26 </div> 28 </div>
27 </div> 29 </div>