From c5287bd7a3d6f5c6291dbdb33b5448817959d8f6 Mon Sep 17 00:00:00 2001
From: wangtao <1q2w3e4r>
Date: Tue, 14 Jun 2022 16:03:18 +0800
Subject: [PATCH] 告警合并提示优化
---
hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyAdd.js | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyAdd.js
index d60865a..4c8ef04 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyAdd.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyAdd.js
@@ -33,6 +33,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
// 获取合并通知开关是否开启
getNoticeMergeFlag();
+ let NoticeMergeFlag = 'off';
function getNoticeMergeFlag(){
admin.req({
url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
@@ -41,6 +42,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
, success: function (res) {
$.each(res.data, function (i, v) {
if(v.ddicCode == 'on'){
+ NoticeMergeFlag= 'on';
$('#noticeMergeTab').show();
}
});
@@ -231,14 +233,17 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
return false;
}
- if(!data.alarmContentExpr || data.alarmContentExpr == ''){
- layer.msg("请先填写告警内容描述表达式！", {
- icon: 7
- , time: 3000
- });
- return false;
+ if(NoticeMergeFlag && NoticeMergeFlag == 'on'){
+ if(!data.alarmContentExpr || data.alarmContentExpr == ''){
+ layer.msg("请先填写告警内容描述表达式！", {
+ icon: 7
+ , time: 3000
+ });
+ return false;
+ }
}
+
var importantPolicy = data.seriousPolicy;
var importantExpr = data.importantPolicy;
var commonlyPolicy = data.commonlyPolicy;
--
libgit2 0.24.0