monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit 9f29cc9e1ed52e3eb0c2e3d5d91e25ace7a48d09 1 parent 87ccec10

【无】采集器管理、指令管理、TRAP配置、密码修改记录、告警策略、告警模板及告警模板中的配置资源，查询按钮取消掉图标，无查询按钮的增加查询按钮，搜索条件过多增加展开/收起 #1

Inline Side-by-side
Showing 9 changed files with 81 additions and 34 deletions
@@ -80,7 +80,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -80,7 +80,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
80 reloadTable(resType); 80 reloadTable(resType);
81 } 81 }
82 }); 82 });
83 - 83 + //lsq 资源页增加搜索按钮 2022-06-29
  84 + $('#seachResListTable').unbind('click').on('click', function () {
  85 + reloadTable(resType);
  86 + })
84 87
85 //选择框搜索事件 88 //选择框搜索事件
86 bindSelectEvent(); 89 bindSelectEvent();
@@ -110,7 +113,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -110,7 +113,9 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
110 collProtocolList: $("#resManageIndexForm").find("select[id='collProtocol']").val(), 113 collProtocolList: $("#resManageIndexForm").find("select[id='collProtocol']").val(),
111 pageName: 'reslist' 114 pageName: 'reslist'
112 } 115 }
113 - , height: 'full-350' 116 + // , height: 'full-350'
  117 + //lsq 配置资源弹框的表格高度调整 2022-06-29
  118 + , height: 'full-250'
114 , cellMinWidth: 80 119 , cellMinWidth: 80
115 , page: { 120 , page: {
116 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 121 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
@@ -289,6 +294,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect @@ -289,6 +294,46 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
289 function getAllCheckData() { 294 function getAllCheckData() {
290 return resListSelectIds; 295 return resListSelectIds;
291 } 296 }
  297 + //start lsq 活动告警搜索条件太多，增加展开/收起的功能 2022-06-21
  298 + let formWidth =$('.form-item-open-stow').width();
  299 + let elem=$('.form-item-open-stow');
  300 + if(elem){
  301 + for(let i=0;i<elem.length;i++){
  302 + if($(elem[i]).width()){
  303 + formWidth=$(elem[i]).width();
  304 + }
  305 + }
  306 + }
  307 + if(!formWidth){
  308 + formWidth= sessionStorage.getItem('formWidth');
  309 + }else{
  310 + sessionStorage.setItem('formWidth',formWidth)
  311 + }
  312 + let winWidth = $('.form-item-open-stow').parents('.layui-status').width();
  313 + let elemW=$('.form-item-open-stow').parents('.layui-status');
  314 + if(elemW){
  315 + for(let i=0;i<elemW.length;i++){
  316 + if($(elemW[i]).width()){
  317 + winWidth=$(elemW[i]).width();
  318 + }
  319 + }
  320 + }
  321 + if (formWidth + 130 > winWidth) {
  322 + $('.openStow').css('display', 'inline-block')
  323 + $('.form-item-open-stow').css('height', '50px');
  324 + } else {
  325 + $('.openStow').css('display', 'none')
  326 + }
  327 + $(".openStow").unbind('click').on('click', function () {
  328 + if ($(this).text() == '展开') {
  329 + $(this).text('收起')
  330 + $('.form-item-open-stow').css('height', 'auto');
  331 + } else {
  332 + $(this).text('展开')
  333 + $('.form-item-open-stow').css('height', '50px');
  334 + }
  335 + })
  336 + //end lsq 2022-06-21
292 337
293 return {getData: getCheckData, getAllCheckData: getAllCheckData, reloadResTable: reloadTable}; 338 return {getData: getCheckData, getAllCheckData: getAllCheckData, reloadResTable: reloadTable};
294 }); 339 });
@@ -6057,7 +6057,7 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6057,7 +6057,7 @@ form.form-edit .layui-form-item .layui-input-inline {
6057 } 6057 }
6058 /*lsq 健康状态样式 2022-06-27*/ 6058 /*lsq 健康状态样式 2022-06-27*/
6059 .info-box-count-res{ 6059 .info-box-count-res{
6060 - width:260px; 6060 + width:230px;
6061 } 6061 }
6062 .info-box-count > label { 6062 .info-box-count > label {
6063 color: #999; 6063 color: #999;
@@ -8540,6 +8540,7 @@ form.layui-card-header.layuiadmin-card-header-auto { @@ -8540,6 +8540,7 @@ form.layui-card-header.layuiadmin-card-header-auto {
8540 .res .layui-form-item .layui-inline, 8540 .res .layui-form-item .layui-inline,
8541 .commonDiv .layui-form-item .layui-inline{ 8541 .commonDiv .layui-form-item .layui-inline{
8542 margin-top:6px; 8542 margin-top:6px;
  8543 + margin-right: 6px;
8543 } 8544 }
8544 /*lsq 关系视图搜索栏样式调整 2022-06-27*/ 8545 /*lsq 关系视图搜索栏样式调整 2022-06-27*/
8545 .relation .layui-form-item .layui-inline{ 8546 .relation .layui-form-item .layui-inline{
1 <title>告警策略</title> 1 <title>告警策略</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main commonDiv">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status search_panel"> 7 <div class="layui-status search_panel">
@@ -49,12 +49,11 @@ @@ -49,12 +49,11 @@
49 </select> 49 </select>
50 </div> 50 </div>
51 </div> 51 </div>
52 - <div class="layui-inline">  
53 - <button class="layui-btn layui-btn-normal" id="alarmpolicyQueryBtn" type="button"><i  
54 - class="layui-icon layui-icon-search"></i>查询 52 + <button class="layui-btn layui-btn-normal" id="alarmpolicyQueryBtn" type="button">
  53 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  54 + 查询
55 </button> 55 </button>
56 </div> 56 </div>
57 - </div>  
58 <div class="layui-form-item"> 57 <div class="layui-form-item">
59 <div class="layui-inline"> 58 <div class="layui-inline">
60 <div class="layui-input-inline layui-input-inline--long"> 59 <div class="layui-input-inline layui-input-inline--long">
1 <title>告警模板</title> 1 <title>告警模板</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main commonDiv">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status search_panel"> 7 <div class="layui-status search_panel">
@@ -15,13 +15,11 @@ @@ -15,13 +15,11 @@
15 type="text"> 15 type="text">
16 </div> 16 </div>
17 </div> 17 </div>
18 - <div class="layui-inline">  
19 <button class="layui-btn layui-btn-normal" id="alarmtemplateQueryBtn" type="button"> 18 <button class="layui-btn layui-btn-normal" id="alarmtemplateQueryBtn" type="button">
20 - <i  
21 - class="layui-icon layui-icon-search"></i>查询 19 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  20 + 查询
22 </button> 21 </button>
23 </div> 22 </div>
24 - </div>  
25 <div class="layui-form-item"> 23 <div class="layui-form-item">
26 <div class="layui-inline"> 24 <div class="layui-inline">
27 <div class="layui-input-inline layui-input-inline--long"> 25 <div class="layui-input-inline layui-input-inline--long">
1 <title>采集器管理</title> 1 <title>采集器管理</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main commonDiv">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status"> 7 <div class="layui-status">
@@ -33,13 +33,12 @@ @@ -33,13 +33,12 @@
33 <div class="layui-inline"> 33 <div class="layui-inline">
34 <div class="multi-query" id="slt-collector-deployStatus"></div> 34 <div class="multi-query" id="slt-collector-deployStatus"></div>
35 </div> 35 </div>
36 - <div class="layui-inline">  
37 <button class="layui-btn layui-btn-normal" id="btn-collector-list-search" 36 <button class="layui-btn layui-btn-normal" id="btn-collector-list-search"
38 - type="button"><i  
39 - class="layui-icon layui-icon-search"></i>查询 37 + type="button">
  38 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  39 + 查询
40 </button> 40 </button>
41 </div> 41 </div>
42 - </div>  
43 </form> 42 </form>
44 </div> 43 </div>
45 </div> 44 </div>
1 <title>指令管理</title> 1 <title>指令管理</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main commonDiv">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status"> 7 <div class="layui-status">
@@ -40,12 +40,11 @@ @@ -40,12 +40,11 @@
40 </select> 40 </select>
41 </div> 41 </div>
42 </div> 42 </div>
43 - <div class="layui-inline">  
44 - <button class="layui-btn layui-btn-normal" id="dirctiveQueryBtn" type="button"><i  
45 - class="layui-icon layui-icon-search"></i>查询 43 + <button class="layui-btn layui-btn-normal" id="dirctiveQueryBtn" type="button">
  44 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  45 + 查询
46 </button> 46 </button>
47 </div> 47 </div>
48 - </div>  
49 </form> 48 </form>
50 </div> 49 </div>
51 </div> 50 </div>
1 <title>密码修改记录</title> 1 <title>密码修改记录</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main commonDiv">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status search_panel"> 7 <div class="layui-status search_panel">
@@ -17,12 +17,11 @@ @@ -17,12 +17,11 @@
17 <button class="layui-btn" id="orgSearchBtn" style="display: none;">搜索</button> 17 <button class="layui-btn" id="orgSearchBtn" style="display: none;">搜索</button>
18 </div> 18 </div>
19 </div> 19 </div>
20 - <div class="layui-inline">  
21 - <button class="layui-btn layui-btn-normal" id="orgQueryBtn" type="button"><i  
22 - class="layui-icon layui-icon-search"></i>查询 20 + <button class="layui-btn layui-btn-normal" id="orgQueryBtn" type="button">
  21 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  22 + 查询
23 </button> 23 </button>
24 </div> 24 </div>
25 - </div>  
26 </form> 25 </form>
27 </div> 26 </div>
28 </div> 27 </div>
1 <title>TRAP配置</title> 1 <title>TRAP配置</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main commonDiv">
5 <div class="layui-card"> 5 <div class="layui-card">
6 <div class="layui-card-header"> 6 <div class="layui-card-header">
7 <div class="layui-status"> 7 <div class="layui-status">
@@ -22,12 +22,11 @@ @@ -22,12 +22,11 @@
22 <div class="layui-inline"> 22 <div class="layui-inline">
23 <div class="layui-input-inline" id="slt_trapoid_resType"></div> 23 <div class="layui-input-inline" id="slt_trapoid_resType"></div>
24 </div> 24 </div>
25 - <div class="layui-inline">  
26 - <button class="layui-btn layui-btn-normal" id="trapoidQueryBtn" type="button"><i  
27 - class="layui-icon layui-icon-search"></i>查询 25 + <button class="layui-btn layui-btn-normal" id="trapoidQueryBtn" type="button">
  26 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  27 + 查询
28 </button> 28 </button>
29 </div> 29 </div>
30 - </div>  
31 </form> 30 </form>
32 </div> 31 </div>
33 </div> 32 </div>
1 <title>资源列表</title> 1 <title>资源列表</title>
2 <article class="page-container"> 2 <article class="page-container">
3 <div class="page-panel"> 3 <div class="page-panel">
4 - <div class="main"> 4 + <div class="main commonDiv">
5 <div class="layui-card"> 5 <div class="layui-card">
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" 8 <form class="layui-form layui-card-header layuiadmin-card-header-auto"
9 id="resManageIndexForm" lay-filter="res-list-query-form"> 9 id="resManageIndexForm" lay-filter="res-list-query-form">
  10 + <div class="form-item-open-stow">
10 <div class="layui-form-item"> 11 <div class="layui-form-item">
11 <div class="layui-inline"> 12 <div class="layui-inline">
12 <div class="layui-input-inline layui-input-inline--long"> 13 <div class="layui-input-inline layui-input-inline--long">
@@ -81,6 +82,13 @@ @@ -81,6 +82,13 @@
81 </div> 82 </div>
82 </div> 83 </div>
83 </div> 84 </div>
  85 + </div>
  86 + <!--lsq 资源增加搜索按钮 2022-06-29-->
  87 + <button class="layui-btn layui-btn-normal layui-btn-normal searchButton" id="seachResListTable"
  88 + type="button">
  89 + 查询
  90 + </button>
  91 + <span class="openStow">展开</span>
84 </form> 92 </form>
85 </div> 93 </div>
86 </div> 94 </div>