Authored by 鲁尚清

【无】告警策略的是否默认-从master迁移

@@ -12,6 +12,55 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -12,6 +12,55 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
12 var sessions = layui.sessions; 12 var sessions = layui.sessions;
13 var accessToken = sessions.getToken()['access_token']; 13 var accessToken = sessions.getToken()['access_token'];
14 console.log(data) 14 console.log(data)
  15 + //lsq 是否默认从master迁移 2022-08-23
  16 + admin.req({
  17 + url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
  18 + , method: 'POST'
  19 + , async: false
  20 + }).done(function (res) {
  21 + let radioData = res.data;
  22 + let htmlRadio = ' <option value="">=策略类型=</option>';
  23 + if (radioData && radioData.length > 0) {
  24 + radioData.map(item => {
  25 + htmlRadio += `<option value="` + item.ddicSort + `">` + item.ddicName + '</option>'
  26 + })
  27 + }
  28 + ;
  29 + $('#alarmpolicy_policyType_add').html(htmlRadio);
  30 + });
  31 + //编辑
  32 + if (data && data.id) {
  33 + admin.req({
  34 + url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id
  35 + , async: false
  36 + , done: function (res) {
  37 + exprToChar(res.object, 'alarmContentExpr');
  38 + exprToChar(res.object, 'cleanPolicy');
  39 + exprToChar(res.object, 'commonlyExpr');
  40 + exprToChar(res.object, 'importantExpr');
  41 + exprToChar(res.object, 'seriousExpr');
  42 + form.val("add-alarmpolicy-form", res.object);
  43 + $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);
  44 + $("#seriousTimes").val(res.object.seriousTimes);
  45 + $("#alarmPolicyType").val(res.object.policyType);
  46 + $("#alarmpolicy_policyType_add").val(res.object.policyType);
  47 + }
  48 + });
  49 + // 获取通知合并策略的表达式
  50 + admin.req({
  51 + url: domainName + '/api-web/policyMerge/get?noticeMergePolicyId=' + data.id
  52 + , async: false
  53 + , done: function (res) {
  54 + if(res && res.data && res.data.length>0){
  55 + $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);
  56 + }
  57 + }
  58 + });
  59 +
  60 + } else {
  61 + $("#alarmpolicy_policyType_add").val('1');
  62 + $("#seriousTimes").val('00:00:00 - 23:59:59');
  63 + }
15 form.render(null, 'add-alarmpolicy-form'); 64 form.render(null, 'add-alarmpolicy-form');
16 //初始化日期组件 65 //初始化日期组件
17 laydate.render({ 66 laydate.render({
@@ -41,33 +90,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -41,33 +90,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
41 }) 90 })
42 } 91 }
43 92
44 - //编辑  
45 - if (data && data.id) {  
46 - admin.req({  
47 - url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id  
48 - , done: function (res) {  
49 - exprToChar(res.object, 'alarmContentExpr');  
50 - exprToChar(res.object, 'cleanPolicy');  
51 - exprToChar(res.object, 'commonlyExpr');  
52 - exprToChar(res.object, 'importantExpr');  
53 - exprToChar(res.object, 'seriousExpr');  
54 - form.val("add-alarmpolicy-form", res.object);  
55 - $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);  
56 - $("#seriousTimes").val(res.object.seriousTimes);  
57 - $("#alarmPolicyType").val(res.object.policyType);  
58 - }  
59 - });  
60 - // 获取通知合并策略的表达式  
61 - admin.req({  
62 - url: domainName + '/api-web/policyMerge/get?noticeMergePolicyId=' + data.id  
63 - , done: function (res) {  
64 - $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);  
65 - }  
66 - });  
67 93
68 - } else {  
69 - $("#seriousTimes").val('00:00:00 - 23:59:59');  
70 - }  
71 $('#btn-alarmpolicy-expr-add').unbind('click').on('click', function () { 94 $('#btn-alarmpolicy-expr-add').unbind('click').on('click', function () {
72 editNoticeExpr(); 95 editNoticeExpr();
73 return false; 96 return false;
@@ -208,6 +231,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -208,6 +231,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
208 data.seriousTimes = $("#seriousTimes").val(); 231 data.seriousTimes = $("#seriousTimes").val();
209 data.importantTimes = $("#seriousTimes").val(); 232 data.importantTimes = $("#seriousTimes").val();
210 data.commonlyTimes = $("#seriousTimes").val(); 233 data.commonlyTimes = $("#seriousTimes").val();
  234 + data.policyType = $("#alarmpolicy_policyType_add").val();
211 var that = this; 235 var that = this;
212 236
213 if (!data.kpiId) { 237 if (!data.kpiId) {
@@ -27,9 +27,10 @@ @@ -27,9 +27,10 @@
27 </div> 27 </div>
28 <div class="layui-inline"> 28 <div class="layui-inline">
29 <label class="layui-form-label">是否默认</label> 29 <label class="layui-form-label">是否默认</label>
30 - <div class="layui-input-inline padding-left-10">  
31 - <input name="policyType" title="默认" type="radio" value="1">  
32 - <input checked name="policyType" title="非默认" type="radio" value="0"> 30 + <!-- lsq master迁移 2000-08-23 -->
  31 + <div class="layui-input-inline">
  32 + <select lay-filter="alarmpolicy_policyType_add" id="alarmpolicy_policyType_add">
  33 + </select>
33 </div> 34 </div>
34 </div> 35 </div>
35 </div> 36 </div>
@@ -441,7 +442,9 @@ @@ -441,7 +442,9 @@
441 </div> 442 </div>
442 </div> 443 </div>
443 444
444 - <button class="layui-btn hide" id="alarmpolicy-form-save-id" lay-submit type="submit">保存</button> 445 +<!-- <button class="layui-btn hide" id="alarmpolicy-form-save-id" lay-submit type="submit">保存</button>-->
  446 + <button type="submit" lay-submit class="layui-btn hide" id="alarmpolicy-form-save-id">保存</button>
  447 +
445 </form> 448 </form>
446 <script> 449 <script>
447 layui.use('alarmpolicyAdd', function (fn) { 450 layui.use('alarmpolicyAdd', function (fn) {