monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit e4d44f1c1cf99f199937895d0f197f7c3df26d20 1 parent 7feef60c

【167】告警策略配置功能调整

Inline Side-by-side
Showing 4 changed files with 78 additions and 77 deletions
@@ -19,16 +19,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -19,16 +19,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
19 , type: 'time' 19 , type: 'time'
20 , range: true 20 , range: true
21 }); 21 });
22 - laydate.render({  
23 - elem: '#importantTimes'  
24 - , type: 'time'  
25 - , range: true  
26 - });  
27 - laydate.render({  
28 - elem: '#commonlyTimes'  
29 - , type: 'time'  
30 - , range: true  
31 - }); 22 +
32 var resType = localStorage.getItem("currentResType"); 23 var resType = localStorage.getItem("currentResType");
33 var NoticeMergeFlag = 'off'; 24 var NoticeMergeFlag = 'off';
34 // 获取合并通知开关是否开启 25 // 获取合并通知开关是否开启
@@ -63,8 +54,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -63,8 +54,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
63 form.val("add-alarmpolicy-form", res.object); 54 form.val("add-alarmpolicy-form", res.object);
64 $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName); 55 $("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);
65 $("#seriousTimes").val(res.object.seriousTimes); 56 $("#seriousTimes").val(res.object.seriousTimes);
66 - $("#importantTimes").val(res.object.importantTimes);  
67 - $("#commonlyTimes").val(res.object.commonlyTimes);  
68 $("#alarmPolicyType").val(res.object.policyType); 57 $("#alarmPolicyType").val(res.object.policyType);
69 } 58 }
70 }); 59 });
@@ -78,10 +67,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -78,10 +67,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
78 67
79 } else { 68 } else {
80 $("#seriousTimes").val('00:00:00 - 23:59:59'); 69 $("#seriousTimes").val('00:00:00 - 23:59:59');
81 - $("#importantTimes").val('00:00:00 - 23:59:59');  
82 - $("#commonlyTimes").val('00:00:00 - 23:59:59');  
83 } 70 }
84 $('#btn-alarmpolicy-expr-add').unbind('click').on('click', function () { 71 $('#btn-alarmpolicy-expr-add').unbind('click').on('click', function () {
  72 + debugger
85 editNoticeExpr(); 73 editNoticeExpr();
86 return false; 74 return false;
87 }); 75 });
@@ -102,6 +90,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -102,6 +90,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
102 id = id.substring(0, id.length - 4); 90 id = id.substring(0, id.length - 4);
103 alarmTimes = $('#' + id + 'Times').val(); 91 alarmTimes = $('#' + id + 'Times').val();
104 } 92 }
  93 + debugger
105 editNoticeExpr($(this).val(), alarmTimes, id); 94 editNoticeExpr($(this).val(), alarmTimes, id);
106 }); 95 });
107 //指标信息 96 //指标信息
@@ -219,8 +208,8 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -219,8 +208,8 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
219 delete data['commonly-policy-type']; 208 delete data['commonly-policy-type'];
220 delete data['alarmcotent-policy-type']; 209 delete data['alarmcotent-policy-type'];
221 data.seriousTimes = $("#seriousTimes").val(); 210 data.seriousTimes = $("#seriousTimes").val();
222 - data.importantTimes = $("#importantTimes").val();  
223 - data.commonlyTimes = $("#commonlyTimes").val(); 211 + data.importantTimes = $("#seriousTimes").val();
  212 + data.commonlyTimes = $("#seriousTimes").val();
224 var that = this; 213 var that = this;
225 214
226 if (!data.kpiId) { 215 if (!data.kpiId) {
@@ -369,7 +358,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f @@ -369,7 +358,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
369 var title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>编辑通知表达式`; 358 var title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>编辑通知表达式`;
370 common.openWin('baseconfig/alarmpolicy/noticeExprEdit', title, { 359 common.openWin('baseconfig/alarmpolicy/noticeExprEdit', title, {
371 noticeExpr, 360 noticeExpr,
372 - alarmTimes,  
373 noticeType 361 noticeType
374 }, ['保存', '取消'], function (index) { 362 }, ['保存', '取消'], function (index) {
375 $("#btn-noticeExpr-submit").click(); 363 $("#btn-noticeExpr-submit").click();
@@ -217,7 +217,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate' @@ -217,7 +217,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
217 useList.forEach(item => { 217 useList.forEach(item => {
218 if (['serious', 'important', 'commonly'].includes(item)) { 218 if (['serious', 'important', 'commonly'].includes(item)) {
219 $('#' + item + "Expr").val(info.noticeExpr); 219 $('#' + item + "Expr").val(info.noticeExpr);
220 - $('#' + item + "Times").val(info.alarmTimes);  
221 } else { 220 } else {
222 $('#' + item).val(info.noticeExpr); 221 $('#' + item).val(info.noticeExpr);
223 } 222 }
@@ -63,6 +63,20 @@ @@ -63,6 +63,20 @@
63 </div> 63 </div>
64 </div> 64 </div>
65 </div> 65 </div>
  66 + <div class="layui-form-item">
  67 + <div class="layui-inline">
  68 + <label class="layui-form-label">告警时段</label>
  69 + <div class="layui-input-inline">
  70 + <div class="layui-input-inline">
  71 + <input class="layui-input" id="seriousTimes" placeholder=" 选择告警时间段 " type="text">
  72 + </div>
  73 + <div class="layui-form-mid layui-word-aux allday" data-flag="seriousTimes" lay-tips="全天"
  74 + style="margin-left: 15px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>
  75 + <div class="layui-form-mid layui-word-aux worktime" data-flag="seriousTimes" lay-tips="工作时间"
  76 + style="margin-left: 15px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>
  77 + </div>
  78 + </div>
  79 + </div>
66 <fieldset class="layui-elem-field layui-field-title"> 80 <fieldset class="layui-elem-field layui-field-title">
67 <legend>告警策略 81 <legend>告警策略
68 <button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-alarmpolicy-expr-add" 82 <button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-alarmpolicy-expr-add"
@@ -158,21 +172,21 @@ @@ -158,21 +172,21 @@
158 </div> 172 </div>
159 </div> 173 </div>
160 </div> 174 </div>
161 - <hr>  
162 - <div class="content-box-group">  
163 - <div class="box-group-left">告警时段</div>  
164 - <div class="box-group-right">  
165 - <div class="layui-form-item">  
166 - <div class="layui-input-inline">  
167 - <input class="layui-input" id="seriousTimes" placeholder=" 选择告警时间段 " type="text">  
168 - </div>  
169 - <div class="layui-form-mid layui-word-aux allday" data-flag="seriousTimes" lay-tips="全天"  
170 - style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>  
171 - <div class="layui-form-mid layui-word-aux worktime" data-flag="seriousTimes" lay-tips="工作时间"  
172 - style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>  
173 - </div>  
174 - </div>  
175 - </div> 175 +<!-- <hr>-->
  176 +<!-- <div class="content-box-group">-->
  177 +<!-- <div class="box-group-left">告警时段</div>-->
  178 +<!-- <div class="box-group-right">-->
  179 +<!-- <div class="layui-form-item">-->
  180 +<!-- <div class="layui-input-inline">-->
  181 +<!-- <input class="layui-input" id="seriousTimes" placeholder=" 选择告警时间段 " type="text">-->
  182 +<!-- </div>-->
  183 +<!-- <div class="layui-form-mid layui-word-aux allday" data-flag="seriousTimes" lay-tips="全天"-->
  184 +<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
  185 +<!-- <div class="layui-form-mid layui-word-aux worktime" data-flag="seriousTimes" lay-tips="工作时间"-->
  186 +<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>-->
  187 +<!-- </div>-->
  188 +<!-- </div>-->
  189 +<!-- </div>-->
176 </div> 190 </div>
177 <div class="layui-tab-item important-tab-item"> 191 <div class="layui-tab-item important-tab-item">
178 <!-- 重要告警 --> 192 <!-- 重要告警 -->
@@ -239,22 +253,22 @@ @@ -239,22 +253,22 @@
239 </div> 253 </div>
240 </div> 254 </div>
241 </div> 255 </div>
242 - <hr>  
243 - <div class="content-box-group">  
244 - <div class="box-group-left">告警时段</div>  
245 - <div class="box-group-right">  
246 - <div class="layui-form-item">  
247 - <div class="layui-input-inline">  
248 - <input class="layui-input" id="importantTimes" placeholder=" 选择告警时间段 " type="text">  
249 - </div>  
250 - <div class="layui-form-mid layui-word-aux allday" data-flag="importantTimes" lay-tips="全天"  
251 - style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>  
252 - <div class="layui-form-mid layui-word-aux worktime" data-flag="importantTimes"  
253 - lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>  
254 - </div>  
255 - </div>  
256 - </div>  
257 - </div> 256 +<!-- <hr>-->
  257 +<!-- <div class="content-box-group">-->
  258 +<!-- <div class="box-group-left">告警时段</div>-->
  259 +<!-- <div class="box-group-right">-->
  260 +<!-- <div class="layui-form-item">-->
  261 +<!-- <div class="layui-input-inline">-->
  262 +<!-- <input class="layui-input" id="importantTimes" placeholder=" 选择告警时间段 " type="text">-->
  263 +<!-- </div>-->
  264 +<!-- <div class="layui-form-mid layui-word-aux allday" data-flag="importantTimes" lay-tips="全天"-->
  265 +<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
  266 +<!-- <div class="layui-form-mid layui-word-aux worktime" data-flag="importantTimes"-->
  267 +<!-- lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>-->
  268 +<!-- </div>-->
  269 +<!-- </div>-->
  270 +<!-- </div>-->
  271 +<!-- </div>-->
258 </div> 272 </div>
259 <div class="layui-tab-item commonly-tab-item"> 273 <div class="layui-tab-item commonly-tab-item">
260 <!-- 一般告警 --> 274 <!-- 一般告警 -->
@@ -320,22 +334,22 @@ @@ -320,22 +334,22 @@
320 </div> 334 </div>
321 </div> 335 </div>
322 </div> 336 </div>
323 - <hr>  
324 - <div class="content-box-group">  
325 - <div class="box-group-left">告警时段</div>  
326 - <div class="box-group-right">  
327 - <div class="layui-form-item">  
328 - <div class="layui-input-inline">  
329 - <input class="layui-input" id="commonlyTimes" placeholder=" 选择告警时间段 " type="text">  
330 - </div>  
331 - <div class="layui-form-mid layui-word-aux allday" data-flag="commonlyTimes" lay-tips="全天"  
332 - style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>  
333 - <div class="layui-form-mid layui-word-aux worktime" data-flag="commonlyTimes"  
334 - lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>  
335 - </div>  
336 - </div>  
337 - </div>  
338 - </div> 337 +<!-- <hr>-->
  338 +<!-- <div class="content-box-group">-->
  339 +<!-- <div class="box-group-left">告警时段</div>-->
  340 +<!-- <div class="box-group-right">-->
  341 +<!-- <div class="layui-form-item">-->
  342 +<!-- <div class="layui-input-inline">-->
  343 +<!-- <input class="layui-input" id="commonlyTimes" placeholder=" 选择告警时间段 " type="text">-->
  344 +<!-- </div>-->
  345 +<!-- <div class="layui-form-mid layui-word-aux allday" data-flag="commonlyTimes" lay-tips="全天"-->
  346 +<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
  347 +<!-- <div class="layui-form-mid layui-word-aux worktime" data-flag="commonlyTimes"-->
  348 +<!-- lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>-->
  349 +<!-- </div>-->
  350 +<!-- </div>-->
  351 +<!-- </div>-->
  352 +<!-- </div>-->
339 </div> 353 </div>
340 <div class="layui-tab-item filter-tab-item"> 354 <div class="layui-tab-item filter-tab-item">
341 <!-- 过滤表达式 --> 355 <!-- 过滤表达式 -->
@@ -14,18 +14,18 @@ @@ -14,18 +14,18 @@
14 <input data-type="cleanPolicy" lay-filter="cbo-noticeExpr-use" title="告警消除" type="checkbox"> 14 <input data-type="cleanPolicy" lay-filter="cbo-noticeExpr-use" title="告警消除" type="checkbox">
15 </div> 15 </div>
16 </div> 16 </div>
17 - <div class="layui-form-item">  
18 - <label class="layui-form-label">告警时段</label>  
19 - <div class="layui-form-block">  
20 - <div class="layui-input-inline">  
21 - <input class="layui-input" name="alarmTimes" placeholder=" 选择告警时间段 " type="text">  
22 - </div>  
23 - <div class="layui-form-mid layui-word-aux noticeExpr-allday" lay-tips="全天"  
24 - style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>  
25 - <div class="layui-form-mid layui-word-aux noticeExpr-worktime" lay-tips="工作时间"  
26 - style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>  
27 - </div>  
28 - </div> 17 +<!-- <div class="layui-form-item">-->
  18 +<!-- <label class="layui-form-label">告警时段</label>-->
  19 +<!-- <div class="layui-form-block">-->
  20 +<!-- <div class="layui-input-inline">-->
  21 +<!-- <input class="layui-input" name="alarmTimes" placeholder=" 选择告警时间段 " type="text">-->
  22 +<!-- </div>-->
  23 +<!-- <div class="layui-form-mid layui-word-aux noticeExpr-allday" lay-tips="全天"-->
  24 +<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
  25 +<!-- <div class="layui-form-mid layui-word-aux noticeExpr-worktime" lay-tips="工作时间"-->
  26 +<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>-->
  27 +<!-- </div>-->
  28 +<!-- </div>-->
29 <div class="layui-form-item"> 29 <div class="layui-form-item">
30 <label class="layui-form-label">模式</label> 30 <label class="layui-form-label">模式</label>
31 <div class="layui-input-block"> 31 <div class="layui-input-block">