Merge branch 'master-500-dev-xwx' into 'master-500-dev'

【167】告警策略配置功能调整



See merge request !844

@@ -233,6 +233,13 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
                 });
                 });
                 return false;
                 return false;
             }
             }
+            if (!data.seriousTimes || data.seriousTimes == '') {
+                layer.msg("请先填写告警时段！", {
+                    icon: 7
+                    , time: 3000
+                });
+                return false;
+            }
 
 
             if (NoticeMergeFlag && NoticeMergeFlag == 'on') {
             if (NoticeMergeFlag && NoticeMergeFlag == 'on') {
                 if (!data.alarmContentExpr || data.alarmContentExpr == '') {
                 if (!data.alarmContentExpr || data.alarmContentExpr == '') {