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

告警策略新增类型创建错误



See merge request !858

@@ -28,7 +28,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
             $('#alarmpolicy_policyType_add').html(htmlRadio);
             $('#alarmpolicy_policyType_add').html(htmlRadio);
         });
         });
         //编辑
         //编辑
-        debugger
         if (data && data.id) {
         if (data && data.id) {
             // 获取通知合并策略的表达式
             // 获取通知合并策略的表达式
             admin.req({
             admin.req({
@@ -225,6 +224,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
             data.seriousTimes = $("#seriousTimes").val();
             data.seriousTimes = $("#seriousTimes").val();
             data.importantTimes = $("#seriousTimes").val();
             data.importantTimes = $("#seriousTimes").val();
             data.commonlyTimes = $("#seriousTimes").val();
             data.commonlyTimes = $("#seriousTimes").val();
+            data.policyType = $("#alarmpolicy_policyType_add").val();
             var that = this;
             var that = this;
 
 
             if (!data.kpiId) {
             if (!data.kpiId) {

@@ -331,10 +331,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
                                 var trs = '';
                                 var trs = '';
                                 $.each(res.data, function (i, d) {
                                 $.each(res.data, function (i, d) {
                                     var isDefault = '';
                                     var isDefault = '';
-                                    if (d.policyType == '1') { //默认
-                                        isDefault = '<button type="button" class="layui-btn layui-btn-warm layui-btn-radius layui-btn-xs p-0-15">默认</button>';
-                                    } else {
-                                        isDefault = '<button type="button" class="layui-btn layui-btn-primary layui-btn-radius layui-btn-xs p-0-15">非默认</button>';
+                                    switch (d.policyType){
+                                        case "1":
+                                            isDefault = "全局默认策略";
+                                            break;
+                                        case "2":
+                                            isDefault = "全局非默认策略";
+                                            break;
+                                        case "3":
+                                            isDefault = "模板策略";
+                                            break;
                                     }
                                     }
                                     var kpiIdent = '';
                                     var kpiIdent = '';
                                     if (d.kpiIdent == '0') {
                                     if (d.kpiIdent == '0') {

@@ -53,8 +53,8 @@
                                 </div>
                                 </div>
                                 <div class="layui-inline">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline">
                                     <div class="layui-input-inline">
-                                        <select name="parentId" id="slt_res_manage_superior" lay-filter="slt_res_manage_superior">
-                                            
+                                        <select name="parentId" id="slt_res_manage_superior" lay-filter="slt_res_manage_superior" lay-search="">
+
                                         </select>
                                         </select>
                                     </div>
                                     </div>
                                 </div>
                                 </div>