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

新增或修改告警策略时，未填写通知合并策略也可以保存 2#



See merge request !682

@@ -30,7 +30,7 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
             ,range: true
             ,range: true
         });
         });
         var resType = localStorage.getItem("currentResType");
         var resType = localStorage.getItem("currentResType");
-        
+
         var NoticeMergeFlag = 'off';
         var NoticeMergeFlag = 'off';
         // 获取合并通知开关是否开启
         // 获取合并通知开关是否开启
         getNoticeMergeFlag();
         getNoticeMergeFlag();
@@ -196,7 +196,6 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
 
 
         //保存策略
         //保存策略
         $("#alarmpolicy-form-save-id").on("click",function (){
         $("#alarmpolicy-form-save-id").on("click",function (){
-            debugger
             var data = form.val("add-alarmpolicy-form");
             var data = form.val("add-alarmpolicy-form");
             //移除非数进性的属性
             //移除非数进性的属性
             delete data['serious-policy-type'];
             delete data['serious-policy-type'];