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

告警模板策略类型替换为从字典获取



See merge request !853

@@ -34,7 +34,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
         });
         var table_data = [];
         if (data && data.type == 'alarmTemplate') {
-            $('#alarmpolicy_policyType').val('0');
+            $('#alarmpolicy_policyType').val('3');
             $('#alarmpolicy_policyType').attr('disabled','disabled');
         } else {
             $('#alarmpolicy_policyType').val('1');

@@ -73,10 +73,13 @@ layui.define(['form','table', 'admin', 'common','sessions'], function (exports)
                 var alarm_policy_tbody = '';
                 $.each(data,function (i,d){
                     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 = "全局默认策略";
+                        case "2":
+                            isDefault = "全局非默认策略";
+                        case "3":
+                            isDefault = "模板策略";
                     }
                     var kpiIdent = '';
                     if(d.kpiIdent == '0'){ kpiIdent = "基本指标";}