monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 8ded4c0932e4a3155edac14d1e960ec47a84ed0c 2 parents c76018d7 090409f7

Merge branch 'master-500-dev-lushangqing' into 'master-500-dev' 

【1390】【 告警中心】通知查询搜索条件栏样式调整 #2



See merge request !679
Inline Side-by-side
Showing 7 changed files with 173 additions and 75 deletions
... ... @@ -32,7 +32,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
return false;
}
});
//lsq 通知压缩查询增加搜索按钮 2022-06-21
$('#seachNoticemerge').unbind('click').on('click',function (){
reloadTable();
return false;
})
/**
* 加载服务信息表格
*/
... ...
... ... @@ -7847,7 +7847,29 @@ form[lay-filter="activewarning-form"] .layui-inline {
/*lsq 告警中心搜索条件栏样式 2022-06-21*/
margin-top:5px;
}
/*lsq 通知查询/通知压缩查询/历史告警搜索条件栏样式 2022-06-21*/
form[lay-filter="notice_search_form"] .layui-inline,form[lay-filter="noticemerge-form"] .layui-inline ,form[lay-filter="historywarning-form"] .layui-inline {
margin-top:5px;
}
form[lay-filter="activewarning-form"],form[lay-filter="historywarning-form"]{
display: flex;
justify-content: flex-start;
}
#seachActiveWarning,#seachHistoryWarning{
margin-top:6px;
margin-right:6px;
}
#openStow,#openStowHis{
color:#1E9FFF;
cursor: pointer;
line-height: 50px;
}
#noticeSearchQueryBtn,#seachNoticemerge{
margin-top:-3px;
}
#queryMore{
cursor: pointer;
}
.div-link-state-list .layui-badge-dot {
margin: 2px;
}
... ...
... ... @@ -6,90 +6,97 @@
<div class="layui-card-header">
<div class="layui-status">
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="activewarning-form">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="activewarningkw" name="activewarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input" lay-tips="关键字检索包括:<br>资源名称<br>告警编号<br>IP<br>内容">
<div class="form-item-open-stow">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="activewarningkw" name="activewarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input" lay-tips="关键字检索包括:<br>资源名称<br>告警编号<br>IP<br>内容">
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="alarmKpi" lay-filter="alarmKpiSearch" lay-verify="required" lay-search="" id="alarmKpiSearchBox">
</select>
<div class="layui-inline">
<div class="layui-input-inline">
<select name="alarmKpi" lay-filter="alarmKpiSearch" lay-verify="required" lay-search="" id="alarmKpiSearchBox">
</select>
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<!-- <select name="bisTypeSearchBox" lay-filter="bisTypeSearch" lay-verify="required" lay-search="" id="bisTypeSearchBox">-->
<!-- <option value="">选择/搜索业务</option>-->
<!-- </select>-->
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<div id="bisTypeSearchBox" class="xm-select-demo"></div>
<!-- <select name="bisTypeSearchBox" lay-filter="bisTypeSearch" lay-verify="required" lay-search="" id="bisTypeSearchBox">-->
<!-- <option value="">选择/搜索业务</option>-->
<!-- </select>-->
<div class="layui-input-inline layui-input-inline--long">
<div id="bisTypeSearchBox" class="xm-select-demo"></div>
</div>
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<div id="resTypeSearchBox"></div>
<div class="layui-inline">
<div class="layui-input-inline">
<div id="resTypeSearchBox"></div>
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" class="layui-input" id="activewarningStartdate" placeholder="开始时间">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" class="layui-input" id="activewarningStartdate" placeholder="开始时间">
</div>
</div>
</div>
<div class="layui-inline layui-inline--sm">-</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" class="layui-input" id="activewarningEnddate" placeholder="结束时间">
<div class="layui-inline layui-inline--sm">-</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" class="layui-input" id="activewarningEnddate" placeholder="结束时间">
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline-sm">
<select name="alarmStatusSearchBox" lay-filter="alarmStatusSearch" lay-verify="required" lay-search="" id="alarmStatusSearchBox">
<option value="">=告警状态=</option>
<option value="1">已关闭</option>
<option value="0">未关闭</option>
</select>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline-sm">
<select name="alarmStatusSearchBox" lay-filter="alarmStatusSearch" lay-verify="required" lay-search="" id="alarmStatusSearchBox">
<option value="">=告警状态=</option>
<option value="1">已关闭</option>
<option value="0">未关闭</option>
</select>
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline-sm">
<select name="alarmLevelSearchBox" lay-filter="alarmLevelSearch" lay-verify="required" lay-search="" id="alarmLevelSearchBox">
<option value="">=告警级别=</option>
<option value="3">严重告警</option>
<option value="2">重要告警</option>
<option value="1">一般告警</option>
</select>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline-sm">
<select name="alarmLevelSearchBox" lay-filter="alarmLevelSearch" lay-verify="required" lay-search="" id="alarmLevelSearchBox">
<option value="">=告警级别=</option>
<option value="3">严重告警</option>
<option value="2">重要告警</option>
<option value="1">一般告警</option>
</select>
</div>
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline-sm">
<select name="alarmConfirmSearchBox" lay-filter="alarmConfirmSearch" lay-verify="required" lay-search="" id="alarmConfirmSearchBox">
<option value="">=告警确认=</option>
<option value="1">已确认</option>
<option value="0">未确认</option>
</select>
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline-sm">
<select name="alarmConfirmSearchBox" lay-filter="alarmConfirmSearch" lay-verify="required" lay-search="" id="alarmConfirmSearchBox">
<option value="">=告警确认=</option>
<option value="1">已确认</option>
<option value="0">未确认</option>
</select>
</div>
</div>
</div>
<div class="layui-inline" id="inline-condition-duration">
<sapn class="duration-desc">持续时间 大于</sapn>
<div class="layui-input-inline">
<input type="number" name="durationVal" class="layui-input">
<select name="durationUnit">
<option value="s">秒</option>
<option value="min">分钟</option>
<option value="hour">小时</option>
<option value="day">天</option>
</select>
<div class="layui-inline" id="inline-condition-duration">
<sapn class="duration-desc">持续时间 大于</sapn>
<div class="layui-input-inline">
<input type="number" name="durationVal" class="layui-input">
<select name="durationUnit">
<option value="s">秒</option>
<option value="min">分钟</option>
<option value="hour">小时</option>
<option value="day">天</option>
</select>
</div>
</div>
<!--<div class="layui-inline">
<div class="layui-input-inline">
<button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button>
</div>
</div>-->
</div>
<!--<div class="layui-inline">
<div class="layui-input-inline">
<button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button>
</div>
</div>-->
</div>
<!--lsq 活动告警增加搜索按钮 2022-06-21-->
<button type="button" id="seachActiveWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
查询</button>
<span id="openStow">展开</span>
</form>
</div>
</div>
... ...
... ... @@ -6,7 +6,8 @@
<div class="layui-card-header">
<div class="layui-status">
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="historywarning-form">
<div class="layui-form-item">
<div class="form-item-open-stow">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="historywarningkw" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input" lay-tips="关键字检索包括:<br>资源名称<br>告警编号<br>IP<br>内容">
... ... @@ -80,6 +81,11 @@
</div>
</div>
</div>
</div>
<!--lsq 历史告警增加搜索按钮 2022-06-21-->
<button type="button" id="seachHistoryWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
查询</button>
<span id="openStowHis">展开</span>
</form>
</div>
</div>
... ...
... ... @@ -6,13 +6,20 @@
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
<form class="layui-form layui-card-header layuiadmin-card-header-auto">
<form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="noticemerge-form">
<div class="layui-form-item">
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline--long">
<input type="text" id="condition-noticemerge-name" lay-tips="关键字检索包含: </br>通知内容" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
</div>
</div>
<!--lsq 通知压缩查询增加搜索按钮 2022-06-21-->
<div class="layui-inline">
<div class="layui-input-inline layui-input-inline-sm">
<button type="button" id="seachNoticemerge" class="layui-btn layui-btn-normal layui-btn-normal" >
搜索</button>
</div>
</div>
</div>
</form>
</div>
... ...
... ... @@ -228,6 +228,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
reloadTable();
}
});
//lsq 活动告警页增加搜索按钮 2022-06-21
$('#seachActiveWarning').unbind('click').on('click',function (){
reloadTable();
})
//选择框搜索事件
bindSelectEvent();
initDate();
... ... @@ -1271,5 +1275,27 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
});
}
//start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
let formWidth=$('form[lay-filter="activewarning-form"] .layui-form-item').width();
let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
if(formWidth+100>winWidth){
$('#openStow').css('display','inline-block')
$('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
$('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','50px');
}else{
$('#openStow').css('display','none')
}
$("#openStow").unbind('click').on('click',function (){
if($(this).text()=='展开'){
$(this).text('收起')
$('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
$('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','auto');
}else{
$(this).text('展开')
$('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
$('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','50px');
}
})
//end lsq 2022-06-21
});
});
\ No newline at end of file
... ...
... ... @@ -174,7 +174,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
reloadTable();
}
});
//lsq 历史告警页增加搜索按钮 2022-06-21
$('#seachHistoryWarning').unbind('click').on('click',function (){
reloadTable();
})
//选择框搜索事件
bindSelectEvent();
... ... @@ -785,6 +788,29 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
});
})();
//start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21
let formWidth=$('form[lay-filter="historywarning-form"] .layui-form-item').width();
let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
if(formWidth+100>winWidth){
$('#openStowHis').css('display','inline-block')
$('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
$('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','50px');
}else{
$('#openStowHis').css('display','none')
}
$("#openStowHis").unbind('click').on('click',function (){
if($(this).text()=='展开'){
$(this).text('收起')
$('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
$('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','auto');
}else{
$(this).text('展开')
$('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
$('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','50px');
}
})
//end lsq 2022-06-21
});
});
... ...