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

告警策略类型改为从字典获取



See merge request !851

@@ -12,6 +12,20 @@ layui.define(['form', 'admin', 'laydate', 'common','sessions','reskpilist'], fun
         var sessions = layui.sessions;
         var sessions = layui.sessions;
         var accessToken = sessions.getToken()['access_token'];
         var accessToken = sessions.getToken()['access_token'];
         console.log(data)
         console.log(data)
+        admin.req({
+            url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
+            , method: 'POST'
+            , async: false
+        }).done(function (res) {
+            let radioData = res.data;
+            let htmlRadio = '';
+            if (radioData && radioData.length > 0) {
+                radioData.map(item => {
+                    $('#alarmpolicy_policyType_add').append(`<input type="radio" data-sort="`+item.ddicSort+`" name="policyType"  value="`+item.ddicSort+`" title="`+item.ddicName+`">`)
+                })
+            }
+            $('#alarmpolicy_policyType_add [data-sort]:nth-child(2)').attr("checked",true);
+        });
         form.render(null, 'add-alarmpolicy-form');
         form.render(null, 'add-alarmpolicy-form');
         //初始化日期组件
         //初始化日期组件
         laydate.render({
         laydate.render({
@@ -20,7 +34,6 @@ 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();

@@ -18,6 +18,20 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
         var checkList = common.checkPermission(accessToken);
         var checkList = common.checkPermission(accessToken);
         var resName = '';
         var resName = '';
         resListSelectIds = [];
         resListSelectIds = [];
+        admin.req({
+            url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
+            , method: 'POST'
+            , async: false
+        }).done(function (res) {
+            let radioData = res.data;
+            let htmlRadio = ' <option value="">=策略类型=</option>';
+            if (radioData && radioData.length > 0) {
+                radioData.map(item => {
+                    htmlRadio += `<option value="` + item.ddicSort + `">`+ item.ddicName+'</option>'
+                })
+            };
+            $('#alarmpolicy_policyType').html(htmlRadio);
+        });
         var table_data = [];
         var table_data = [];
         if (data && data.type == 'alarmTemplate') {
         if (data && data.type == 'alarmTemplate') {
             $('#alarmpolicy_policyType').val('0');
             $('#alarmpolicy_policyType').val('0');
@@ -98,13 +112,16 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
             , even: true
             , even: true
             , cols: [[
             , cols: [[
                 {type: 'checkbox',field: 'checkbox'}
                 {type: 'checkbox',field: 'checkbox'}
-                , {field: 'policyType', title: '策略类型', align: 'center', sort: true, width:120,
+                , {field: 'policyType', title: '策略类型', align: 'center', sort: true, width:180,
                     templet: function(d){
                     templet: function(d){
-                        var checked = '';
-                        if(d.policyType == '1'){ //默认
-                            checked = "checked";
+                       switch (d.policyType){
+                            case "1":
+                                return "全局默认策略";
+                            case "2":
+                                return "全局非默认策略";
+                            case "3":
+                                return "模板策略";
                         }
                         }
-                        return `<input type="checkbox" id="${d.alarmPolicyId}" data-kpiid="${d.kpiId}" name="close" ${checked} lay-skin="switch" lay-filter="switchPolicyType" lay-text="默认|非默认">`;
                     }}
                     }}
                 , {
                 , {
                     field: 'alarmPolicyName', title: '策略名称', align: 'center', sort: true,
                     field: 'alarmPolicyName', title: '策略名称', align: 'center', sort: true,

@@ -21,9 +21,7 @@
         </div>
         </div>
         <div class="layui-inline">
         <div class="layui-inline">
             <label class="layui-form-label">是否默认</label>
             <label class="layui-form-label">是否默认</label>
-            <div class="layui-input-inline padding-left-10">
-                <input type="radio" name="policyType" value="1" title="默认">
-                <input type="radio" name="policyType" value="0" title="非默认" checked>
+            <div class="layui-input-inline padding-left-10" id="alarmpolicy_policyType_add">
             </div>
             </div>
         </div>
         </div>
     </div>
     </div>

@@ -40,9 +40,9 @@
                                 <div class="layui-inline">
                                 <div class="layui-inline">
                                     <div class="layui-input-inline layui-input-inline--long">
                                     <div class="layui-input-inline layui-input-inline--long">
                                         <select lay-filter="alarmpolicy_policyType" id="alarmpolicy_policyType">
                                         <select lay-filter="alarmpolicy_policyType" id="alarmpolicy_policyType">
-                                            <option value="">=策略类型=</option>
-                                            <option value="1">默认</option>
-                                            <option value="0">非默认</option>
+<!--                                            <option value="">=策略类型=</option>-->
+<!--                                            <option value="1">默认</option>-->
+<!--                                            <option value="0">非默认</option>-->
                                         </select>
                                         </select>
                                     </div>
                                     </div>
                                 </div>
                                 </div>