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
, type: 'time'
, range: true
});
laydate.render({
elem: '#importantTimes'
, type: 'time'
, range: true
});
laydate.render({
elem: '#commonlyTimes'
, type: 'time'
, range: true
});
var resType = localStorage.getItem("currentResType");
var NoticeMergeFlag = 'off';
// 获取合并通知开关是否开启
... ... @@ -63,8 +54,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
form.val("add-alarmpolicy-form", res.object);
$("#alarm-policy-kpiName").val(res.object.kpiId + " " + res.object.kpiName);
$("#seriousTimes").val(res.object.seriousTimes);
$("#importantTimes").val(res.object.importantTimes);
$("#commonlyTimes").val(res.object.commonlyTimes);
$("#alarmPolicyType").val(res.object.policyType);
}
});
... ... @@ -78,10 +67,9 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
} else {
$("#seriousTimes").val('00:00:00 - 23:59:59');
$("#importantTimes").val('00:00:00 - 23:59:59');
$("#commonlyTimes").val('00:00:00 - 23:59:59');
}
$('#btn-alarmpolicy-expr-add').unbind('click').on('click', function () {
debugger
editNoticeExpr();
return false;
});
... ... @@ -102,6 +90,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
id = id.substring(0, id.length - 4);
alarmTimes = $('#' + id + 'Times').val();
}
debugger
editNoticeExpr($(this).val(), alarmTimes, id);
});
//指标信息
... ... @@ -219,8 +208,8 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
delete data['commonly-policy-type'];
delete data['alarmcotent-policy-type'];
data.seriousTimes = $("#seriousTimes").val();
data.importantTimes = $("#importantTimes").val();
data.commonlyTimes = $("#commonlyTimes").val();
data.importantTimes = $("#seriousTimes").val();
data.commonlyTimes = $("#seriousTimes").val();
var that = this;
if (!data.kpiId) {
... ... @@ -369,7 +358,6 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
var title = `<a class="layui-icon layui-icon-edit win_title_icon"></a>编辑通知表达式`;
common.openWin('baseconfig/alarmpolicy/noticeExprEdit', title, {
noticeExpr,
alarmTimes,
noticeType
}, ['保存', '取消'], function (index) {
$("#btn-noticeExpr-submit").click();
... ...
... ... @@ -217,7 +217,6 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
useList.forEach(item => {
if (['serious', 'important', 'commonly'].includes(item)) {
$('#' + item + "Expr").val(info.noticeExpr);
$('#' + item + "Times").val(info.alarmTimes);
} else {
$('#' + item).val(info.noticeExpr);
}
... ...
... ... @@ -63,6 +63,20 @@
</div>
</div>
</div>
<div class="layui-form-item">
<div class="layui-inline">
<label class="layui-form-label">告警时段</label>
<div class="layui-input-inline">
<div class="layui-input-inline">
<input class="layui-input" id="seriousTimes" placeholder=" 选择告警时间段 " type="text">
</div>
<div class="layui-form-mid layui-word-aux allday" data-flag="seriousTimes" lay-tips="全天"
style="margin-left: 15px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>
<div class="layui-form-mid layui-word-aux worktime" data-flag="seriousTimes" lay-tips="工作时间"
style="margin-left: 15px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>
</div>
</div>
</div>
<fieldset class="layui-elem-field layui-field-title">
<legend>告警策略
<button class="layui-btn layui-btn-xs layui-btn-normal fieldset-btn" id="btn-alarmpolicy-expr-add"
... ... @@ -158,21 +172,21 @@
</div>
</div>
</div>
<hr>
<div class="content-box-group">
<div class="box-group-left">告警时段</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-inline">
<input class="layui-input" id="seriousTimes" placeholder=" 选择告警时间段 " type="text">
</div>
<div class="layui-form-mid layui-word-aux allday" data-flag="seriousTimes" lay-tips="全天"
style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>
<div class="layui-form-mid layui-word-aux worktime" data-flag="seriousTimes" lay-tips="工作时间"
style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>
</div>
</div>
</div>
<!-- <hr>-->
<!-- <div class="content-box-group">-->
<!-- <div class="box-group-left">告警时段</div>-->
<!-- <div class="box-group-right">-->
<!-- <div class="layui-form-item">-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" id="seriousTimes" placeholder=" 选择告警时间段 " type="text">-->
<!-- </div>-->
<!-- <div class="layui-form-mid layui-word-aux allday" data-flag="seriousTimes" lay-tips="全天"-->
<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
<!-- <div class="layui-form-mid layui-word-aux worktime" data-flag="seriousTimes" lay-tips="工作时间"-->
<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="layui-tab-item important-tab-item">
<!-- 重要告警 -->
... ... @@ -239,22 +253,22 @@
</div>
</div>
</div>
<hr>
<div class="content-box-group">
<div class="box-group-left">告警时段</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-inline">
<input class="layui-input" id="importantTimes" placeholder=" 选择告警时间段 " type="text">
</div>
<div class="layui-form-mid layui-word-aux allday" data-flag="importantTimes" lay-tips="全天"
style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>
<div class="layui-form-mid layui-word-aux worktime" data-flag="importantTimes"
lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>
</div>
</div>
</div>
</div>
<!-- <hr>-->
<!-- <div class="content-box-group">-->
<!-- <div class="box-group-left">告警时段</div>-->
<!-- <div class="box-group-right">-->
<!-- <div class="layui-form-item">-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" id="importantTimes" placeholder=" 选择告警时间段 " type="text">-->
<!-- </div>-->
<!-- <div class="layui-form-mid layui-word-aux allday" data-flag="importantTimes" lay-tips="全天"-->
<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
<!-- <div class="layui-form-mid layui-word-aux worktime" data-flag="importantTimes"-->
<!-- lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="layui-tab-item commonly-tab-item">
<!-- 一般告警 -->
... ... @@ -320,22 +334,22 @@
</div>
</div>
</div>
<hr>
<div class="content-box-group">
<div class="box-group-left">告警时段</div>
<div class="box-group-right">
<div class="layui-form-item">
<div class="layui-input-inline">
<input class="layui-input" id="commonlyTimes" placeholder=" 选择告警时间段 " type="text">
</div>
<div class="layui-form-mid layui-word-aux allday" data-flag="commonlyTimes" lay-tips="全天"
style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>
<div class="layui-form-mid layui-word-aux worktime" data-flag="commonlyTimes"
lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>
</div>
</div>
</div>
</div>
<!-- <hr>-->
<!-- <div class="content-box-group">-->
<!-- <div class="box-group-left">告警时段</div>-->
<!-- <div class="box-group-right">-->
<!-- <div class="layui-form-item">-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" id="commonlyTimes" placeholder=" 选择告警时间段 " type="text">-->
<!-- </div>-->
<!-- <div class="layui-form-mid layui-word-aux allday" data-flag="commonlyTimes" lay-tips="全天"-->
<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
<!-- <div class="layui-form-mid layui-word-aux worktime" data-flag="commonlyTimes"-->
<!-- lay-tips="工作时间" style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="layui-tab-item filter-tab-item">
<!-- 过滤表达式 -->
... ...
... ... @@ -14,18 +14,18 @@
<input data-type="cleanPolicy" lay-filter="cbo-noticeExpr-use" title="告警消除" type="checkbox">
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">告警时段</label>
<div class="layui-form-block">
<div class="layui-input-inline">
<input class="layui-input" name="alarmTimes" placeholder=" 选择告警时间段 " type="text">
</div>
<div class="layui-form-mid layui-word-aux noticeExpr-allday" lay-tips="全天"
style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>
<div class="layui-form-mid layui-word-aux noticeExpr-worktime" lay-tips="工作时间"
style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>
</div>
</div>
<!-- <div class="layui-form-item">-->
<!-- <label class="layui-form-label">告警时段</label>-->
<!-- <div class="layui-form-block">-->
<!-- <div class="layui-input-inline">-->
<!-- <input class="layui-input" name="alarmTimes" placeholder=" 选择告警时间段 " type="text">-->
<!-- </div>-->
<!-- <div class="layui-form-mid layui-word-aux noticeExpr-allday" lay-tips="全天"-->
<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe637;</i></div>-->
<!-- <div class="layui-form-mid layui-word-aux noticeExpr-worktime" lay-tips="工作时间"-->
<!-- style="margin-right: 30px;"><i class="layui-icon form-btn-icon">&#xe665;</i></div>-->
<!-- </div>-->
<!-- </div>-->
<div class="layui-form-item">
<label class="layui-form-label">模式</label>
<div class="layui-input-block">
... ...