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

【1392】 删除告警策略时，同步清理redis的信息



See merge request !680

@@ -306,13 +306,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     ,type:"delete"
                     ,data:{ids:id}
                 }).done(function (res) {
-                    layer.msg('删除成功', {
-                        offset: '15px'
-                        , icon: 1
-                        , time: 1000
-                    }, function () {
-                        reloadAlarmPolicyTable();
-                    });
+                    if(res.success){
+                        layer.msg('删除成功', {
+                            offset: '15px'
+                            , icon: 1
+                            , time: 1000
+                        }, function () {
+                            reloadAlarmPolicyTable();
+                        });
+                    }else {
+                        layer.msg( res.msg,{offset: '15px', icon: 2, time: 2000});
+                    }
+
                 }).error(function (error) {
                     console.log(error);
                 });