monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 15f338bc9168172b298d22b7d15830b471cc287d 2 parents 8c069c21 da68b5c9

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

【无】指标过滤/压制增加查询按钮，告警订阅、及时消息配置、系统通知配置查询按钮取消掉图标，及时消息配置用户一行样式调整 #1



See merge request !704
Inline Side-by-side
Showing 6 changed files with 24 additions and 20 deletions
@@ -31,6 +31,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe @@ -31,6 +31,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'commonDe
31 } 31 }
32 }) 32 })
33 33
  34 + //lsq 指标过滤/压制页增加搜索按钮 2022-06-29
  35 + $('#searchFilterKpi').unbind('click').on('click', function () {
  36 + reloadTable();
  37 + return false;
  38 + })
34 } 39 }
35 40
36 //默认加载过滤页面 41 //默认加载过滤页面
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">
@@ -56,13 +56,12 @@ @@ -56,13 +56,12 @@
56 <div id="alarmsubscribe_user"></div> 56 <div id="alarmsubscribe_user"></div>
57 </div> 57 </div>
58 </div> 58 </div>
59 - <div class="layui-inline">  
60 <button class="layui-btn layui-btn-normal" id="alarmsubscribeQueryBtn" 59 <button class="layui-btn layui-btn-normal" id="alarmsubscribeQueryBtn"
61 - type="button"><i  
62 - class="layui-icon layui-icon-search"></i>查询 60 + type="button">
  61 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  62 + 查询
63 </button> 63 </button>
64 </div> 64 </div>
65 - </div>  
66 <div class="layui-form-item"> 65 <div class="layui-form-item">
67 <div class="layui-inline"> 66 <div class="layui-inline">
68 <div class="layui-input-inline layui-input-inline--long"> 67 <div class="layui-input-inline layui-input-inline--long">
@@ -98,13 +98,14 @@ @@ -98,13 +98,14 @@
98 </div> 98 </div>
99 </div> 99 </div>
100 </div> 100 </div>
101 - <div class="layui-form-item">  
102 - <label class="layui-form-label">用户</label>  
103 - <div class="layui-input-block tags-input" style="height: auto;width: 90% !important;"> 101 + <div class="layui-form-item layui-form-item-flex">
  102 + <label class="layui-form-label" style="height:42px;">用户</label>
  103 +<!-- lsq 输入框没在一行 2022-06-29 <div class="layui-input-block tags-input" style="height: auto;width: 90% !important;">-->
  104 + <div class="tags-input" style="height: auto;">
104 <div class="tags" id="select_noticeTimely_id_user"></div> 105 <div class="tags" id="select_noticeTimely_id_user"></div>
105 </div> 106 </div>
106 <div class="layui-form-mid layui-word-aux" 107 <div class="layui-form-mid layui-word-aux"
107 - style="padding: 0!important;position: relative;top: -28px;left: 98%;justify-content: center;margin-left: 10px; "> 108 + style="margin-left: 10px; ">
108 <i class="layui-icon form-btn-icon" id="noticeTimely-form-select-users">&#xe615;</i></div> 109 <i class="layui-icon form-btn-icon" id="noticeTimely-form-select-users">&#xe615;</i></div>
109 </div> 110 </div>
110 <div class="layui-form-item"> 111 <div class="layui-form-item">
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">
@@ -14,13 +14,11 @@ @@ -14,13 +14,11 @@
14 placeholder="输入关键字，回车搜索" type="text"> 14 placeholder="输入关键字，回车搜索" type="text">
15 </div> 15 </div>
16 </div> 16 </div>
17 - <div class="layui-inline">  
18 <button class="layui-btn layui-btn-normal" id="noticeTimelyQueryBtn" type="button"> 17 <button class="layui-btn layui-btn-normal" id="noticeTimelyQueryBtn" type="button">
19 - <i  
20 - class="layui-icon layui-icon-search"></i>查询 18 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  19 + 查询
21 </button> 20 </button>
22 </div> 21 </div>
23 - </div>  
24 </form> 22 </form>
25 </div> 23 </div>
26 </div> 24 </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">
@@ -31,13 +31,11 @@ @@ -31,13 +31,11 @@
31 type="text"> 31 type="text">
32 </div> 32 </div>
33 </div> 33 </div>
34 - <div class="layui-inline">  
35 <button class="layui-btn layui-btn-normal" id="systemNoticeQueryBtn" type="button"> 34 <button class="layui-btn layui-btn-normal" id="systemNoticeQueryBtn" type="button">
36 - <i  
37 - class="layui-icon layui-icon-search"></i>查询 35 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  36 + 查询
38 </button> 37 </button>
39 </div> 38 </div>
40 - </div>  
41 </form> 39 </form>
42 </div> 40 </div>
43 </div> 41 </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" style="overflow-x: hidden"> 4 + <div class="main commonDiv" style="overflow-x: hidden">
5 <div class="layui-card" style="margin-bottom: 0;height: calc(100% - 3px)"> 5 <div class="layui-card" style="margin-bottom: 0;height: calc(100% - 3px)">
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">
@@ -14,6 +14,9 @@ @@ -14,6 +14,9 @@
14 name="keyword" placeholder="输入关键字，回车搜索" type="text"> 14 name="keyword" placeholder="输入关键字，回车搜索" type="text">
15 </div> 15 </div>
16 </div> 16 </div>
  17 + <button class="layui-btn layui-btn-normal" id="searchFilterKpi" type="button">
  18 + 查询
  19 + </button>
17 </div> 20 </div>
18 </form> 21 </form>
19 </div> 22 </div>