monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 6616d9aed65ce75faeab4cdf8373f6577ee5939e 1 parent 6b9c6309

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

Inline Side-by-side
Showing 2 changed files with 55 additions and 28 deletions
@@ -12,39 +12,27 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -12,39 +12,27 @@ 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 - form.render(null, 'add-alarmpolicy-form');  
16 - //初始化日期组件  
17 - laydate.render({  
18 - elem: '#seriousTimes'  
19 - , type: 'time'  
20 - , range: true  
21 - });  
22 -  
23 - var resType = localStorage.getItem("currentResType");  
24 - var NoticeMergeFlag = 'off';  
25 - // 获取合并通知开关是否开启  
26 - getNoticeMergeFlag();  
27 -  
28 - function getNoticeMergeFlag() { 15 + //lsq 是否默认从master迁移 2022-08-23
29 admin.req({ 16 admin.req({
30 - url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag' 17 + url: common.domainName + '/api-web/manage/ddic/findSucDdics/alarm_strategy_type'
31 , method: 'POST' 18 , method: 'POST'
32 , async: false 19 , async: false
33 - , success: function (res) {  
34 - $.each(res.data, function (i, v) {  
35 - if (v.ddicCode == 'on') {  
36 - NoticeMergeFlag = 'on';  
37 - $('#noticeMergeTab').show();  
38 - }  
39 - });  
40 - } 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>'
41 }) 26 })
42 } 27 }
43 - 28 + ;
  29 + $('#alarmpolicy_policyType_add').html(htmlRadio);
  30 + });
44 //编辑 31 //编辑
45 if (data && data.id) { 32 if (data && data.id) {
46 admin.req({ 33 admin.req({
47 url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id 34 url: domainName + '/api-web/alarmPolicy/getbyId/' + data.id
  35 + , async: false
48 , done: function (res) { 36 , done: function (res) {
49 exprToChar(res.object, 'alarmContentExpr'); 37 exprToChar(res.object, 'alarmContentExpr');
50 exprToChar(res.object, 'cleanPolicy'); 38 exprToChar(res.object, 'cleanPolicy');
@@ -55,19 +43,54 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -55,19 +43,54 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
55 $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName); 43 $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);
56 $("#seriousTimes").val(res.object.seriousTimes); 44 $("#seriousTimes").val(res.object.seriousTimes);
57 $("#alarmPolicyType").val(res.object.policyType); 45 $("#alarmPolicyType").val(res.object.policyType);
  46 + $("#alarmpolicy_policyType_add").val(res.object.policyType);
58 } 47 }
59 }); 48 });
60 // 获取通知合并策略的表达式 49 // 获取通知合并策略的表达式
61 admin.req({ 50 admin.req({
62 url: domainName + '/api-web/policyMerge/get?noticeMergePolicyId=' + data.id 51 url: domainName + '/api-web/policyMerge/get?noticeMergePolicyId=' + data.id
  52 + , async: false
63 , done: function (res) { 53 , done: function (res) {
  54 + if(res && res.data && res.data.length>0){
64 $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr); 55 $("#noticeMergeFlagExpr").val(res.data[0].noticeMergeExpr);
65 } 56 }
  57 + }
66 }); 58 });
67 59
68 } else { 60 } else {
  61 + $("#alarmpolicy_policyType_add").val('1');
69 $("#seriousTimes").val('00:00:00 - 23:59:59'); 62 $("#seriousTimes").val('00:00:00 - 23:59:59');
70 } 63 }
  64 + form.render(null, 'add-alarmpolicy-form');
  65 + //初始化日期组件
  66 + laydate.render({
  67 + elem: '#seriousTimes'
  68 + , type: 'time'
  69 + , range: true
  70 + });
  71 +
  72 + var resType = localStorage.getItem("currentResType");
  73 + var NoticeMergeFlag = 'off';
  74 + // 获取合并通知开关是否开启
  75 + getNoticeMergeFlag();
  76 +
  77 + function getNoticeMergeFlag() {
  78 + admin.req({
  79 + url: common.domainName + '/api-web/manage/ddic/findSucDdics/noticeMergeFlag'
  80 + , method: 'POST'
  81 + , async: false
  82 + , success: function (res) {
  83 + $.each(res.data, function (i, v) {
  84 + if (v.ddicCode == 'on') {
  85 + NoticeMergeFlag = 'on';
  86 + $('#noticeMergeTab').show();
  87 + }
  88 + });
  89 + }
  90 + })
  91 + }
  92 +
  93 +
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) {