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 @@ -32,7 +32,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
32 return false; 32 return false;
33 } 33 }
34 }); 34 });
35 - 35 + //lsq 通知压缩查询增加搜索按钮 2022-06-21
  36 + $('#seachNoticemerge').unbind('click').on('click',function (){
  37 + reloadTable();
  38 + return false;
  39 + })
36 /** 40 /**
37 * 加载服务信息表格 41 * 加载服务信息表格
38 */ 42 */
@@ -7847,7 +7847,29 @@ form[lay-filter="activewarning-form"] .layui-inline { @@ -7847,7 +7847,29 @@ form[lay-filter="activewarning-form"] .layui-inline {
7847 /*lsq 告警中心搜索条件栏样式 2022-06-21*/ 7847 /*lsq 告警中心搜索条件栏样式 2022-06-21*/
7848 margin-top:5px; 7848 margin-top:5px;
7849 } 7849 }
7850 - 7850 +/*lsq 通知查询/通知压缩查询/历史告警搜索条件栏样式 2022-06-21*/
  7851 +form[lay-filter="notice_search_form"] .layui-inline,form[lay-filter="noticemerge-form"] .layui-inline ,form[lay-filter="historywarning-form"] .layui-inline {
  7852 + margin-top:5px;
  7853 +}
  7854 +form[lay-filter="activewarning-form"],form[lay-filter="historywarning-form"]{
  7855 + display: flex;
  7856 + justify-content: flex-start;
  7857 +}
  7858 +#seachActiveWarning,#seachHistoryWarning{
  7859 + margin-top:6px;
  7860 + margin-right:6px;
  7861 +}
  7862 +#openStow,#openStowHis{
  7863 + color:#1E9FFF;
  7864 + cursor: pointer;
  7865 + line-height: 50px;
  7866 +}
  7867 +#noticeSearchQueryBtn,#seachNoticemerge{
  7868 + margin-top:-3px;
  7869 +}
  7870 +#queryMore{
  7871 + cursor: pointer;
  7872 +}
7851 .div-link-state-list .layui-badge-dot { 7873 .div-link-state-list .layui-badge-dot {
7852 margin: 2px; 7874 margin: 2px;
7853 } 7875 }
@@ -6,90 +6,97 @@ @@ -6,90 +6,97 @@
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status"> 7 <div class="layui-status">
8 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="activewarning-form"> 8 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="activewarning-form">
9 - <div class="layui-form-item">  
10 - <div class="layui-inline">  
11 - <div class="layui-input-inline layui-input-inline--long">  
12 - <input type="text" id="activewarningkw" name="activewarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input" lay-tips="关键字检索包括:<br>资源名称<br>告警编号<br>IP<br>内容"> 9 + <div class="form-item-open-stow">
  10 + <div class="layui-form-item">
  11 + <div class="layui-inline">
  12 + <div class="layui-input-inline layui-input-inline--long">
  13 + <input type="text" id="activewarningkw" name="activewarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input" lay-tips="关键字检索包括:<br>资源名称<br>告警编号<br>IP<br>内容">
  14 + </div>
13 </div> 15 </div>
14 - </div>  
15 - <div class="layui-inline">  
16 - <div class="layui-input-inline">  
17 - <select name="alarmKpi" lay-filter="alarmKpiSearch" lay-verify="required" lay-search="" id="alarmKpiSearchBox">  
18 - </select> 16 + <div class="layui-inline">
  17 + <div class="layui-input-inline">
  18 + <select name="alarmKpi" lay-filter="alarmKpiSearch" lay-verify="required" lay-search="" id="alarmKpiSearchBox">
  19 + </select>
  20 + </div>
19 </div> 21 </div>
20 - </div>  
21 - <div class="layui-inline">  
22 - <div class="layui-input-inline layui-input-inline--long">  
23 -<!-- <select name="bisTypeSearchBox" lay-filter="bisTypeSearch" lay-verify="required" lay-search="" id="bisTypeSearchBox">-->  
24 -<!-- <option value="">选择/搜索业务</option>-->  
25 -<!-- </select>--> 22 + <div class="layui-inline">
26 <div class="layui-input-inline layui-input-inline--long"> 23 <div class="layui-input-inline layui-input-inline--long">
27 - <div id="bisTypeSearchBox" class="xm-select-demo"></div> 24 + <!-- <select name="bisTypeSearchBox" lay-filter="bisTypeSearch" lay-verify="required" lay-search="" id="bisTypeSearchBox">-->
  25 + <!-- <option value="">选择/搜索业务</option>-->
  26 + <!-- </select>-->
  27 + <div class="layui-input-inline layui-input-inline--long">
  28 + <div id="bisTypeSearchBox" class="xm-select-demo"></div>
  29 + </div>
28 </div> 30 </div>
29 </div> 31 </div>
30 - </div>  
31 - <div class="layui-inline">  
32 - <div class="layui-input-inline">  
33 - <div id="resTypeSearchBox"></div> 32 + <div class="layui-inline">
  33 + <div class="layui-input-inline">
  34 + <div id="resTypeSearchBox"></div>
  35 + </div>
34 </div> 36 </div>
35 - </div>  
36 - <div class="layui-inline">  
37 - <div class="layui-input-inline layui-input-inline--long">  
38 - <input type="text" class="layui-input" id="activewarningStartdate" placeholder="开始时间"> 37 + <div class="layui-inline">
  38 + <div class="layui-input-inline layui-input-inline--long">
  39 + <input type="text" class="layui-input" id="activewarningStartdate" placeholder="开始时间">
  40 + </div>
39 </div> 41 </div>
40 - </div>  
41 - <div class="layui-inline layui-inline--sm">-</div>  
42 - <div class="layui-inline">  
43 - <div class="layui-input-inline layui-input-inline--long">  
44 - <input type="text" class="layui-input" id="activewarningEnddate" placeholder="结束时间"> 42 + <div class="layui-inline layui-inline--sm">-</div>
  43 + <div class="layui-inline">
  44 + <div class="layui-input-inline layui-input-inline--long">
  45 + <input type="text" class="layui-input" id="activewarningEnddate" placeholder="结束时间">
  46 + </div>
45 </div> 47 </div>
46 - </div>  
47 - <div class="layui-inline">  
48 - <div class="layui-input-inline layui-input-inline-sm">  
49 - <select name="alarmStatusSearchBox" lay-filter="alarmStatusSearch" lay-verify="required" lay-search="" id="alarmStatusSearchBox">  
50 - <option value="">=告警状态=</option>  
51 - <option value="1">已关闭</option>  
52 - <option value="0">未关闭</option>  
53 - </select> 48 + <div class="layui-inline">
  49 + <div class="layui-input-inline layui-input-inline-sm">
  50 + <select name="alarmStatusSearchBox" lay-filter="alarmStatusSearch" lay-verify="required" lay-search="" id="alarmStatusSearchBox">
  51 + <option value="">=告警状态=</option>
  52 + <option value="1">已关闭</option>
  53 + <option value="0">未关闭</option>
  54 + </select>
  55 + </div>
54 </div> 56 </div>
55 - </div>  
56 - <div class="layui-inline">  
57 - <div class="layui-input-inline layui-input-inline-sm">  
58 - <select name="alarmLevelSearchBox" lay-filter="alarmLevelSearch" lay-verify="required" lay-search="" id="alarmLevelSearchBox">  
59 - <option value="">=告警级别=</option>  
60 - <option value="3">严重告警</option>  
61 - <option value="2">重要告警</option>  
62 - <option value="1">一般告警</option>  
63 - </select> 57 + <div class="layui-inline">
  58 + <div class="layui-input-inline layui-input-inline-sm">
  59 + <select name="alarmLevelSearchBox" lay-filter="alarmLevelSearch" lay-verify="required" lay-search="" id="alarmLevelSearchBox">
  60 + <option value="">=告警级别=</option>
  61 + <option value="3">严重告警</option>
  62 + <option value="2">重要告警</option>
  63 + <option value="1">一般告警</option>
  64 + </select>
  65 + </div>
64 </div> 66 </div>
65 - </div>  
66 - <div class="layui-inline">  
67 - <div class="layui-input-inline layui-input-inline-sm">  
68 - <select name="alarmConfirmSearchBox" lay-filter="alarmConfirmSearch" lay-verify="required" lay-search="" id="alarmConfirmSearchBox">  
69 - <option value="">=告警确认=</option>  
70 - <option value="1">已确认</option>  
71 - <option value="0">未确认</option>  
72 - </select> 67 + <div class="layui-inline">
  68 + <div class="layui-input-inline layui-input-inline-sm">
  69 + <select name="alarmConfirmSearchBox" lay-filter="alarmConfirmSearch" lay-verify="required" lay-search="" id="alarmConfirmSearchBox">
  70 + <option value="">=告警确认=</option>
  71 + <option value="1">已确认</option>
  72 + <option value="0">未确认</option>
  73 + </select>
  74 + </div>
73 </div> 75 </div>
74 - </div>  
75 - <div class="layui-inline" id="inline-condition-duration">  
76 - <sapn class="duration-desc">持续时间 大于</sapn>  
77 - <div class="layui-input-inline">  
78 - <input type="number" name="durationVal" class="layui-input">  
79 - <select name="durationUnit">  
80 - <option value="s">秒</option>  
81 - <option value="min">分钟</option>  
82 - <option value="hour">小时</option>  
83 - <option value="day">天</option>  
84 - </select> 76 + <div class="layui-inline" id="inline-condition-duration">
  77 + <sapn class="duration-desc">持续时间 大于</sapn>
  78 + <div class="layui-input-inline">
  79 + <input type="number" name="durationVal" class="layui-input">
  80 + <select name="durationUnit">
  81 + <option value="s">秒</option>
  82 + <option value="min">分钟</option>
  83 + <option value="hour">小时</option>
  84 + <option value="day">天</option>
  85 + </select>
  86 + </div>
85 </div> 87 </div>
  88 + <!--<div class="layui-inline">
  89 + <div class="layui-input-inline">
  90 + <button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button>
  91 + </div>
  92 + </div>-->
  93 +
86 </div> 94 </div>
87 - <!--<div class="layui-inline">  
88 - <div class="layui-input-inline">  
89 - <button class="layui-btn layui-btn-sm layui-btn-normal" type="button" id="todayOrAllBtn" >今日告警</button>  
90 - </div>  
91 - </div>-->  
92 </div> 95 </div>
  96 + <!--lsq 活动告警增加搜索按钮 2022-06-21-->
  97 + <button type="button" id="seachActiveWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
  98 + 查询</button>
  99 + <span id="openStow">展开</span>
93 </form> 100 </form>
94 </div> 101 </div>
95 </div> 102 </div>
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status"> 7 <div class="layui-status">
8 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="historywarning-form"> 8 <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="historywarning-form">
9 - <div class="layui-form-item"> 9 + <div class="form-item-open-stow">
  10 + <div class="layui-form-item">
10 <div class="layui-inline"> 11 <div class="layui-inline">
11 <div class="layui-input-inline layui-input-inline--long"> 12 <div class="layui-input-inline layui-input-inline--long">
12 <input type="text" id="historywarningkw" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input" lay-tips="关键字检索包括:<br>资源名称<br>告警编号<br>IP<br>内容"> 13 <input type="text" id="historywarningkw" name="historywarningkw" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input" lay-tips="关键字检索包括:<br>资源名称<br>告警编号<br>IP<br>内容">
@@ -80,6 +81,11 @@ @@ -80,6 +81,11 @@
80 </div> 81 </div>
81 </div> 82 </div>
82 </div> 83 </div>
  84 + </div>
  85 + <!--lsq 历史告警增加搜索按钮 2022-06-21-->
  86 + <button type="button" id="seachHistoryWarning" class="layui-btn layui-btn-normal layui-btn-normal" >
  87 + 查询</button>
  88 + <span id="openStowHis">展开</span>
83 </form> 89 </form>
84 </div> 90 </div>
85 </div> 91 </div>
@@ -6,13 +6,20 @@ @@ -6,13 +6,20 @@
6 <div class="layui-card"> 6 <div class="layui-card">
7 <div class="layui-card-header"> 7 <div class="layui-card-header">
8 <div class="layui-status"> 8 <div class="layui-status">
9 - <form class="layui-form layui-card-header layuiadmin-card-header-auto"> 9 + <form class="layui-form layui-card-header layuiadmin-card-header-auto" lay-filter="noticemerge-form">
10 <div class="layui-form-item"> 10 <div class="layui-form-item">
11 <div class="layui-inline"> 11 <div class="layui-inline">
12 <div class="layui-input-inline layui-input-inline--long"> 12 <div class="layui-input-inline layui-input-inline--long">
13 <input type="text" id="condition-noticemerge-name" lay-tips="关键字检索包含: </br>通知内容" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input"> 13 <input type="text" id="condition-noticemerge-name" lay-tips="关键字检索包含: </br>通知内容" placeholder="输入关键字，回车搜索" autocomplete="off" class="layui-input">
14 </div> 14 </div>
15 </div> 15 </div>
  16 + <!--lsq 通知压缩查询增加搜索按钮 2022-06-21-->
  17 + <div class="layui-inline">
  18 + <div class="layui-input-inline layui-input-inline-sm">
  19 + <button type="button" id="seachNoticemerge" class="layui-btn layui-btn-normal layui-btn-normal" >
  20 + 搜索</button>
  21 + </div>
  22 + </div>
16 </div> 23 </div>
17 </form> 24 </form>
18 </div> 25 </div>
@@ -228,6 +228,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -228,6 +228,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
228 reloadTable(); 228 reloadTable();
229 } 229 }
230 }); 230 });
  231 + //lsq 活动告警页增加搜索按钮 2022-06-21
  232 + $('#seachActiveWarning').unbind('click').on('click',function (){
  233 + reloadTable();
  234 + })
231 //选择框搜索事件 235 //选择框搜索事件
232 bindSelectEvent(); 236 bindSelectEvent();
233 initDate(); 237 initDate();
@@ -1271,5 +1275,27 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -1271,5 +1275,27 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
1271 }); 1275 });
1272 1276
1273 } 1277 }
  1278 + //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
  1279 + let formWidth=$('form[lay-filter="activewarning-form"] .layui-form-item').width();
  1280 + let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
  1281 + if(formWidth+100>winWidth){
  1282 + $('#openStow').css('display','inline-block')
  1283 + $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
  1284 + $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','50px');
  1285 + }else{
  1286 + $('#openStow').css('display','none')
  1287 + }
  1288 + $("#openStow").unbind('click').on('click',function (){
  1289 + if($(this).text()=='展开'){
  1290 + $(this).text('收起')
  1291 + $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
  1292 + $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','auto');
  1293 + }else{
  1294 + $(this).text('展开')
  1295 + $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
  1296 + $('form[lay-filter="activewarning-form"] .form-item-open-stow').css('height','50px');
  1297 + }
  1298 + })
  1299 + //end lsq 2022-06-21
1274 }); 1300 });
1275 }); 1301 });
@@ -174,7 +174,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -174,7 +174,10 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
174 reloadTable(); 174 reloadTable();
175 } 175 }
176 }); 176 });
177 - 177 + //lsq 历史告警页增加搜索按钮 2022-06-21
  178 + $('#seachHistoryWarning').unbind('click').on('click',function (){
  179 + reloadTable();
  180 + })
178 //选择框搜索事件 181 //选择框搜索事件
179 bindSelectEvent(); 182 bindSelectEvent();
180 183
@@ -785,6 +788,29 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -785,6 +788,29 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
785 }); 788 });
786 })(); 789 })();
787 790
  791 + //start lsq 历史告警搜索条件太多，增加展开/收起的功能 2022-06-21
  792 + let formWidth=$('form[lay-filter="historywarning-form"] .layui-form-item').width();
  793 + let winWidth=$('form[lay-filter="historywarning-form"]').parent().parent('.layui-card-header').width();
  794 + if(formWidth+100>winWidth){
  795 + $('#openStowHis').css('display','inline-block')
  796 +
  797 + $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
  798 + $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','50px');
  799 + }else{
  800 + $('#openStowHis').css('display','none')
  801 + }
  802 + $("#openStowHis").unbind('click').on('click',function (){
  803 + if($(this).text()=='展开'){
  804 + $(this).text('收起')
  805 + $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
  806 + $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','auto');
  807 + }else{
  808 + $(this).text('展开')
  809 + $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('width',(formWidth-50)+'px');
  810 + $('form[lay-filter="historywarning-form"] .form-item-open-stow').css('height','50px');
  811 + }
  812 + })
  813 + //end lsq 2022-06-21
788 }); 814 });
789 815
790 }); 816 });