monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by xwx
Commit a166d91c6795474e96fd9b64d0ed328044143562 2 parents 5927aeb3 15f338bc

Merge branch 'master-500-dev' of http://113.200.75.45:82/monitor_v3/hg-monitor-w… 

…eb into master-500-dev-xwx
Inline Side-by-side
Showing 31 changed files with 215 additions and 97 deletions
@@ -35,6 +35,7 @@ module.exports = { @@ -35,6 +35,7 @@ module.exports = {
35 {title: '版本说明', path: '/version520/'}, 35 {title: '版本说明', path: '/version520/'},
36 {title: '发布', path: '/version520/20220617'}, 36 {title: '发布', path: '/version520/20220617'},
37 {title: '乙方运维', path: '/version520/operationsMaintenance'}, 37 {title: '乙方运维', path: '/version520/operationsMaintenance'},
  38 + {title: '首页布局', path: '/version520/indexLayout'},
38 ] 39 ]
39 } 40 }
40 ] 41 ]
@@ -3,15 +3,45 @@ layout.html：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\v @@ -3,15 +3,45 @@ layout.html：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\v
3 layout-nx：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\views\layout.html 3 layout-nx：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\views\layout.html
4 ::: 4 :::
5 layout: 5 layout:
6 -<img src="/indexLayout.jpg" > 6 +![img](../picture/520/indexLayout/indexLayout.jpg) <br>
  7 +
7 layout-nx: 8 layout-nx:
8 -<img src="/indexLayout-nx.png" > 9 +![img](../picture/520/indexLayout/indexLayout-nx.png) <br>
  10 +
9 11
10 ::: tip 功能数据来源 12 ::: tip 功能数据来源
11 菜单功能：`user-center`.`sys_menu`<br/> 13 菜单功能：`user-center`.`sys_menu`<br/>
12 -主体卡片：<br/>  
13 -获取告警统计信息:/api-web/home/alarm/countByAlarmLevel <br/>  
14 -资源列表: 14 +:::
  15 +::: tip 菜单信息
  16 +菜单接口：/api-user/menus/current?type=1 </br>
  17 +:::
  18 +::: tip 主体卡片信息
  19 +业务卡片及业务统计：/api-web/home/business/getBusHealthResultByAlarm?filter=2&layout=layout <br/>
  20 +资源卡片及资源统计：/api-web/home/restype/getResTypeHealthResult <br/>
  21 +layout-nx主体应用信息：/api-web/home/restype/getResTypeHealthResult <br/>
  22 +:::
  23 +::: tip 告警统计信息
  24 +获取告警统计信息：/api-web/home/alarm/countByAlarmLevel <br/>
  25 +:::
  26 +::: tip 登录用户信息来源
  27 +个人信息接口：/api-user/users/1<br/>
  28 +扩展信息接口：/api-web/manage/ddic/findSucDdics/user_property <br/>
  29 +扩展信息数据字典：
  30 +```js
  31 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('1b95f628b40043e9a5ceb42bf3b550f4', 'userLayout', '自定义布局', '默认:layout,个性化布局:layout-nx', 8, 'user_property', '2022-02-08 17:16:47');
  32 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('270dfc935aa94c7097d0f6475b114805', 'intranetIP', '内网IP', '使用的内网Ip', 4, 'user_property', '2021-08-19 11:06:47');
  33 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('50a9a82e9a9b46318383e160451dd334', 'loginSkin', '登录皮肤', '默认:default,个性化布局:default，skin1，skin2', NULL, 'user_property', '2022-03-03 21:12:06');
  34 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('51dcf14aa73f4a3d9d6014297ea1b703', 'duties', '主要工作职责', '主要的工作范围以及负责的工作内容', 1, 'user_property', '2021-08-19 11:06:47');
  35 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('8b008e983a2b486d9120bbb772524f1d', 'roomNumber', '房间号', '房间号', 3, 'user_property', '2021-08-19 11:06:47');
  36 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('9999996bea8c222b465b8399f5b7eec', 'yunwei', '是否是运维', '是否是运维', 6, 'user_property', '2021-08-19 11:06:47');
  37 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('9e7315d1e1e54107b2ce817c04929ba8', 'mobilePhone', '手机', '手机', NULL, 'user_property', '2021-08-19 11:06:47');
  38 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('a049bd9694414f2bb7cde31ffa9cd7d2', 'user_property', '人员属性信息', '人员扩展属性信息是用户扩展的属性字典信息', 10021, '0', '2021-08-12 15:49:47');
  39 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('a852c07bc72146bea8c222b465b8399f', 'devOpsAccount', '运维平台账号', '运维平台的账号', 6, 'user_property', '2021-08-19 11:06:47');
  40 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('c5a76076491e4f01a22485caea6696c5', 'telephone', '座机', '固定电话号码', 5, 'user_property', '2021-08-19 11:06:47');
  41 +INSERT INTO `cloud_backend_monitor`.`sys_ddic`(`ddicId`, `ddicCode`, `ddicName`, `ddicDesc`, `ddicSort`, `ddicCategory`, `createTime`) VALUES ('d057168ed5e946c69713d7394f5b7eec', 'stationTime', '驻场时间', '驻场时间，如：长期', 2, 'user_property', '2021-08-19 11:06:47');
  42 +
  43 +```
  44 +
15 ::: 45 :::
16 ::: tip 搜索条件来源 46 ::: tip 搜索条件来源
17 字典：<br/> 47 字典：<br/>
@@ -65,7 +65,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi @@ -65,7 +65,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
65 , page: false 65 , page: false
66 , limit: 9999 66 , limit: 9999
67 , limits: [] 67 , limits: []
68 - , height: 'full-80' 68 + , height: 'full-200'
  69 + // , height: 'full-80'
69 , data: dataArr 70 , data: dataArr
70 , cols: [[ 71 , cols: [[
71 { 72 {
@@ -88,8 +88,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common', @@ -88,8 +88,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
88 resType: resType 88 resType: resType
89 } 89 }
90 //lsq 弹框中空白太多,高度调整 2022-06-07 90 //lsq 弹框中空白太多,高度调整 2022-06-07
91 - // , height: 'full-200'  
92 - , height: 'full-445' 91 + , height: 'full-200'
  92 + // , height: 'full-445'
93 , cellMinWidth: 80 93 , cellMinWidth: 80
94 , page: { 94 , page: {
95 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip'] 95 layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
@@ -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 //默认加载过滤页面
@@ -30,6 +30,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl', @@ -30,6 +30,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
30 renderIpCard(); 30 renderIpCard();
31 } 31 }
32 }); 32 });
  33 + //lsq IP视图页增加搜索按钮 2022-06-29
  34 + $('#seachIP').unbind('click').on('click', function () {
  35 + renderIpCard();
  36 + })
33 form.render(); 37 form.render();
34 renderIpCard(); 38 renderIpCard();
35 //点击空白处隐藏子菜单 39 //点击空白处隐藏子菜单
@@ -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 });
@@ -47,6 +47,9 @@ layui.extend({ @@ -47,6 +47,9 @@ layui.extend({
47 defaultIndex = setter.entry; 47 defaultIndex = setter.entry;
48 } 48 }
49 setter.entry = ''; 49 setter.entry = '';
  50 + //lsq 无数据返回时 给默认值，防止进入页面404 2022-06-28
  51 + }else{
  52 + defaultIndex = '/index-biz-card'
50 } 53 }
51 } 54 }
52 }); 55 });
@@ -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;
@@ -6838,8 +6838,9 @@ form.form-edit .layui-form-item .layui-input-inline { @@ -6838,8 +6838,9 @@ form.form-edit .layui-form-item .layui-input-inline {
6838 6838
6839 .layui-status .ip-form-item { 6839 .layui-status .ip-form-item {
6840 margin-right: 5%; 6840 margin-right: 5%;
6841 - width: 100%; 6841 + /*width: 100%;*/
6842 font-weight: 700; 6842 font-weight: 700;
  6843 + flex:1;
6843 } 6844 }
6844 6845
6845 .layui-ip-status-item-tips { 6846 .layui-ip-status-item-tips {
@@ -8536,8 +8537,10 @@ form.layui-card-header.layuiadmin-card-header-auto { @@ -8536,8 +8537,10 @@ form.layui-card-header.layuiadmin-card-header-auto {
8536 .resIndexMain .layui-form-item .layui-inline, 8537 .resIndexMain .layui-form-item .layui-inline,
8537 .bizIndexMain .layui-form-item .layui-inline, 8538 .bizIndexMain .layui-form-item .layui-inline,
8538 .relation .layui-form-item .layui-inline, 8539 .relation .layui-form-item .layui-inline,
8539 -.res .layui-form-item .layui-inline{ 8540 +.res .layui-form-item .layui-inline,
  8541 +.commonDiv .layui-form-item .layui-inline{
8540 margin-top:6px; 8542 margin-top:6px;
  8543 + margin-right: 6px;
8541 } 8544 }
8542 /*lsq 关系视图搜索栏样式调整 2022-06-27*/ 8545 /*lsq 关系视图搜索栏样式调整 2022-06-27*/
8543 .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,11 +49,10 @@ @@ -49,11 +49,10 @@
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>查询  
55 - </button>  
56 - </div> 52 + <button class="layui-btn layui-btn-normal" id="alarmpolicyQueryBtn" type="button">
  53 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  54 + 查询
  55 + </button>
57 </div> 56 </div>
58 <div class="layui-form-item"> 57 <div class="layui-form-item">
59 <div class="layui-inline"> 58 <div class="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">
@@ -56,12 +56,11 @@ @@ -56,12 +56,11 @@
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"  
61 - type="button"><i  
62 - class="layui-icon layui-icon-search"></i>查询  
63 - </button>  
64 - </div> 59 + <button class="layui-btn layui-btn-normal" id="alarmsubscribeQueryBtn"
  60 + type="button">
  61 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  62 + 查询
  63 + </button>
65 </div> 64 </div>
66 <div class="layui-form-item"> 65 <div class="layui-form-item">
67 <div class="layui-inline"> 66 <div class="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">
@@ -15,12 +15,10 @@ @@ -15,12 +15,10 @@
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">  
20 - <i  
21 - class="layui-icon layui-icon-search"></i>查询  
22 - </button>  
23 - </div> 18 + <button class="layui-btn layui-btn-normal" id="alarmtemplateQueryBtn" type="button">
  19 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  20 + 查询
  21 + </button>
24 </div> 22 </div>
25 <div class="layui-form-item"> 23 <div class="layui-form-item">
26 <div class="layui-inline"> 24 <div class="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"> 7 <div class="layui-status">
@@ -18,8 +18,9 @@ @@ -18,8 +18,9 @@
18 </div> 18 </div>
19 </div> 19 </div>
20 <div class="layui-inline"> 20 <div class="layui-inline">
21 - <button class="layui-btn layui-btn-normal" id="checkTempQueryBtn" type="button"><i  
22 - class="layui-icon layui-icon-search"></i>查询 21 + <button class="layui-btn layui-btn-normal" id="checkTempQueryBtn" type="button">
  22 + <!--lsq 查询按钮的图片取消掉 2022-06-28-->
  23 + 查询
23 </button> 24 </button>
24 </div> 25 </div>
25 </div> 26 </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">
@@ -33,12 +33,11 @@ @@ -33,12 +33,11 @@
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"  
38 - type="button"><i  
39 - class="layui-icon layui-icon-search"></i>查询  
40 - </button>  
41 - </div> 36 + <button class="layui-btn layui-btn-normal" id="btn-collector-list-search"
  37 + type="button">
  38 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  39 + 查询
  40 + </button>
42 </div> 41 </div>
43 </form> 42 </form>
44 </div> 43 </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,11 +40,10 @@ @@ -40,11 +40,10 @@
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>查询  
46 - </button>  
47 - </div> 43 + <button class="layui-btn layui-btn-normal" id="dirctiveQueryBtn" type="button">
  44 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  45 + 查询
  46 + </button>
48 </div> 47 </div>
49 </form> 48 </form>
50 </div> 49 </div>
@@ -98,14 +98,15 @@ @@ -98,14 +98,15 @@
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 - <i class="layui-icon form-btn-icon" id="noticeTimely-form-select-users">&#xe615;</i></div> 108 + style="margin-left: 10px; ">
  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">
111 <label class="layui-form-label textarea-label">内容</label> 112 <label class="layui-form-label textarea-label">内容</label>
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,12 +14,10 @@ @@ -14,12 +14,10 @@
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">  
19 - <i  
20 - class="layui-icon layui-icon-search"></i>查询  
21 - </button>  
22 - </div> 17 + <button class="layui-btn layui-btn-normal" id="noticeTimelyQueryBtn" type="button">
  18 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  19 + 查询
  20 + </button>
23 </div> 21 </div>
24 </form> 22 </form>
25 </div> 23 </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,11 +17,10 @@ @@ -17,11 +17,10 @@
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>查询  
23 - </button>  
24 - </div> 20 + <button class="layui-btn layui-btn-normal" id="orgQueryBtn" type="button">
  21 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  22 + 查询
  23 + </button>
25 </div> 24 </div>
26 </form> 25 </form>
27 </div> 26 </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,12 +31,10 @@ @@ -31,12 +31,10 @@
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">  
36 - <i  
37 - class="layui-icon layui-icon-search"></i>查询  
38 - </button>  
39 - </div> 34 + <button class="layui-btn layui-btn-normal" id="systemNoticeQueryBtn" type="button">
  35 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  36 + 查询
  37 + </button>
40 </div> 38 </div>
41 </form> 39 </form>
42 </div> 40 </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">
@@ -14,11 +14,10 @@ @@ -14,11 +14,10 @@
14 lay-tips="关键字检索包含 <br/>任务名称<br/>任务编号<br/>资源名称<br/>ip地址<br/>模板名称" placeholder="输入关键字，回车搜索" type="text"> 14 lay-tips="关键字检索包含 <br/>任务名称<br/>任务编号<br/>资源名称<br/>ip地址<br/>模板名称" 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="taskQueryBtn" type="button"><i  
19 - class="layui-icon layui-icon-search"></i>查询  
20 - </button>  
21 - </div> 17 + <button class="layui-btn layui-btn-normal" id="taskQueryBtn" type="button">
  18 + <!--lsq 取消掉查询按钮的图标 2022-06-28-->
  19 + 查询
  20 + </button>
22 </div> 21 </div>
23 </form> 22 </form>
24 </div> 23 </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,11 +22,10 @@ @@ -22,11 +22,10 @@
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>查询  
28 - </button>  
29 - </div> 25 + <button class="layui-btn layui-btn-normal" id="trapoidQueryBtn" type="button">
  26 + <!--lsq 查询按钮取消掉图标 2022-06-29-->
  27 + 查询
  28 + </button>
30 </div> 29 </div>
31 </form> 30 </form>
32 </div> 31 </div>
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;"> 66 <div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">
67 <button type="button" id="keyword" 67 <button type="button" id="keyword"
68 class="layui-btn layui-btn-normal layui-btn-normal"> 68 class="layui-btn layui-btn-normal layui-btn-normal">
69 - 搜索 69 + 查询
70 </button> 70 </button>
71 </div> 71 </div>
72 </div> 72 </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>
@@ -8,7 +8,7 @@ @@ -8,7 +8,7 @@
8 </style> 8 </style>
9 <article class="page-container template"> 9 <article class="page-container template">
10 <div class="page-panel"> 10 <div class="page-panel">
11 - <div class="main" style="overflow: hidden"> 11 + <div class="main commonDiv" style="overflow: hidden">
12 <div class="layui-card" style="height: 100%"> 12 <div class="layui-card" style="height: 100%">
13 <div class="layui-card-header"> 13 <div class="layui-card-header">
14 <div class="layui-status"> 14 <div class="layui-status">
@@ -27,6 +27,9 @@ @@ -27,6 +27,9 @@
27 type="text"> 27 type="text">
28 </div> 28 </div>
29 </div> 29 </div>
  30 + <button class="layui-btn layui-btn-normal" id="seachIP" type="button">
  31 + 查询
  32 + </button>
30 </div> 33 </div>
31 </form> 34 </form>
32 <div class="ip-form-item"> 35 <div class="ip-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">
@@ -27,8 +27,9 @@ @@ -27,8 +27,9 @@
27 </div> 27 </div>
28 </div> 28 </div>
29 <div class="layui-inline"> 29 <div class="layui-inline">
30 - <button class="layui-btn layui-btn-normal" id="mxgraphQueryBtn" type="button"><i  
31 - class="layui-icon layui-icon-search"></i>查询 30 + <button class="layui-btn layui-btn-normal" id="mxgraphQueryBtn" type="button">
  31 + <!--lsq 取消掉查询按钮的图标 2022-06-28-->
  32 + 查询
32 </button> 33 </button>
33 </div> 34 </div>
34 35
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="layui-form-item"> 10 + <div class="form-item-open-stow">
  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">
13 <input class="layui-input" id="reslist_keyword" name="title" placeholder="输入关键字，回车搜索" 14 <input class="layui-input" id="reslist_keyword" name="title" placeholder="输入关键字，回车搜索"
@@ -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>
@@ -163,4 +163,26 @@ custom-class="config-dialog" @@ -163,4 +163,26 @@ custom-class="config-dialog"
163 .resList-form.el-form--inline .el-form-item{ 163 .resList-form.el-form--inline .el-form-item{
164 align-items: center; 164 align-items: center;
165 margin-right:6px; 165 margin-right:6px;
  166 +}
  167 +/*lsq ping详情页面中搜索栏的样式调整 2022-06-28*/
  168 +.container .cm-card .search .condition.ping div{
  169 + margin-bottom: 0px !important;
  170 +}
  171 +.container .cm-card .search .condition.ping{
  172 + margin-bottom: 6px;
  173 +}
  174 +/*lsq elementUI的滚动条样式修改 2022-06-28*/
  175 +.el-scrollbar__bar.is-vertical {
  176 + width:15px;
  177 + top:0px;
  178 +}
  179 +.el-scrollbar__bar.is-horizontal {
  180 + height: 15px;
  181 + left:0px;
  182 +}
  183 +.el-scrollbar__thumb,.el-scrollbar__thumb:hover {
  184 + border-radius: 0px;
  185 + background-color: #CCCCCC;
  186 + opacity: 1;
  187 + width:10px;.el-scrollbar__bar.is-horizontal>div
166 } 188 }
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </el-descriptions> 45 </el-descriptions>
46 </div> 46 </div>
47 <div class="search"> 47 <div class="search">
48 - <div class="condition"> 48 + <div class="condition ping">
49 <el-form-item> 49 <el-form-item>
50 <el-input :size="$global.elementConfig.size.input" placeholder="=关键字=" 50 <el-input :size="$global.elementConfig.size.input" placeholder="=关键字="
51 v-model="search.keyword"></el-input> 51 v-model="search.keyword"></el-input>
@@ -86,7 +86,7 @@ @@ -86,7 +86,7 @@
86 86
87 </el-form-item> 87 </el-form-item>
88 <el-form-item> 88 <el-form-item>
89 - <el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button> 89 + <el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
90 </el-form-item> 90 </el-form-item>
91 </div> 91 </div>
92 </div> 92 </div>
@@ -331,7 +331,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', ' @@ -331,7 +331,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
331 } 331 }
332 } 332 }
333 } 333 }
334 - if (formWidth + 130 > winWidth) { 334 + if (formWidth + 260 > winWidth) {
335 $('.openStow').css('display', 'inline-block') 335 $('.openStow').css('display', 'inline-block')
336 $('.form-item-open-stow').css('height', '50px'); 336 $('.form-item-open-stow').css('height', '50px');
337 } else { 337 } else {