monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 6497464fb9b567df5c8a5365c1279e0256853757 2 parents c9ab51a7 87ccec10

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

【915】 【活动告警】告警详情页历史数据页面优化（1、滚动条优化和系统其他页面保持一致。2、排查一下‘采集值’和‘扩展信息展示是否正常’） #1



See merge request !697
Inline Side-by-side
Showing 17 changed files with 93 additions and 26 deletions
... ... @@ -35,6 +35,7 @@ module.exports = {
{title: '版本说明', path: '/version520/'},
{title: '发布', path: '/version520/20220617'},
{title: '乙方运维', path: '/version520/operationsMaintenance'},
{title: '首页布局', path: '/version520/indexLayout'},
]
}
]
... ...
... ... @@ -3,15 +3,45 @@ layout.html：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\v
layout-nx：hg-monitor-web\hg-monitor-web-base\src\main\resources\static\src\views\layout.html
:::
layout:
<img src="/indexLayout.jpg" >
![img](../picture/520/indexLayout/indexLayout.jpg) <br>
layout-nx:
<img src="/indexLayout-nx.png" >
![img](../picture/520/indexLayout/indexLayout-nx.png) <br>
::: tip 功能数据来源
菜单功能：`user-center`.`sys_menu`<br/>
主体卡片：<br/>
获取告警统计信息:/api-web/home/alarm/countByAlarmLevel <br/>
资源列表:
:::
::: tip 菜单信息
菜单接口：/api-user/menus/current?type=1 </br>
:::
::: tip 主体卡片信息
业务卡片及业务统计：/api-web/home/business/getBusHealthResultByAlarm?filter=2&layout=layout <br/>
资源卡片及资源统计：/api-web/home/restype/getResTypeHealthResult <br/>
layout-nx主体应用信息：/api-web/home/restype/getResTypeHealthResult <br/>
:::
::: tip 告警统计信息
获取告警统计信息：/api-web/home/alarm/countByAlarmLevel <br/>
:::
::: tip 登录用户信息来源
个人信息接口：/api-user/users/1<br/>
扩展信息接口：/api-web/manage/ddic/findSucDdics/user_property <br/>
扩展信息数据字典：
```js
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');
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');
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');
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');
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');
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');
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');
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');
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');
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');
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');
```
:::
::: tip 搜索条件来源
字典：<br/>
... ...
... ... @@ -65,7 +65,8 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
, page: false
, limit: 9999
, limits: []
, height: 'full-80'
, height: 'full-200'
// , height: 'full-80'
, data: dataArr
, cols: [[
{
... ...
... ... @@ -88,8 +88,8 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
resType: resType
}
//lsq 弹框中空白太多,高度调整 2022-06-07
// , height: 'full-200'
, height: 'full-445'
, height: 'full-200'
// , height: 'full-445'
, cellMinWidth: 80
, page: {
layout: ['count', 'prev', 'page', 'next', 'limit', 'skip']
... ...
... ... @@ -30,6 +30,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laytpl',
renderIpCard();
}
});
//lsq IP视图页增加搜索按钮 2022-06-29
$('#seachIP').unbind('click').on('click', function () {
renderIpCard();
})
form.render();
renderIpCard();
//点击空白处隐藏子菜单
... ...
... ... @@ -47,6 +47,9 @@ layui.extend({
defaultIndex = setter.entry;
}
setter.entry = '';
//lsq 无数据返回时 给默认值，防止进入页面404 2022-06-28
}else{
defaultIndex = '/index-biz-card'
}
}
});
... ...
... ... @@ -6838,8 +6838,9 @@ form.form-edit .layui-form-item .layui-input-inline {
.layui-status .ip-form-item {
margin-right: 5%;
width: 100%;
/*width: 100%;*/
font-weight: 700;
flex:1;
}
.layui-ip-status-item-tips {
... ... @@ -8536,7 +8537,8 @@ form.layui-card-header.layuiadmin-card-header-auto {
.resIndexMain .layui-form-item .layui-inline,
.bizIndexMain .layui-form-item .layui-inline,
.relation .layui-form-item .layui-inline,
.res .layui-form-item .layui-inline{
.res .layui-form-item .layui-inline,
.commonDiv .layui-form-item .layui-inline{
margin-top:6px;
}
/*lsq 关系视图搜索栏样式调整 2022-06-27*/
... ...
<title>指令模板管理</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -18,8 +18,9 @@
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="checkTempQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="checkTempQueryBtn" type="button">
<!--lsq 查询按钮的图片取消掉 2022-06-28-->
查询
</button>
</div>
</div>
... ...
<title>任务管理</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -14,12 +14,11 @@
lay-tips="关键字检索包含 <br/>任务名称<br/>任务编号<br/>资源名称<br/>ip地址<br/>模板名称" placeholder="输入关键字，回车搜索" type="text">
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="taskQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="taskQueryBtn" type="button">
<!--lsq 取消掉查询按钮的图标 2022-06-28-->
查询
</button>
</div>
</div>
</form>
</div>
</div>
... ...
... ... @@ -66,7 +66,7 @@
<div class="layui-input-inline layui-input-inline--long" style="margin-top: -4px;">
<button type="button" id="keyword"
class="layui-btn layui-btn-normal layui-btn-normal">
搜索
查询
</button>
</div>
</div>
... ...
... ... @@ -8,7 +8,7 @@
</style>
<article class="page-container template">
<div class="page-panel">
<div class="main" style="overflow: hidden">
<div class="main commonDiv" style="overflow: hidden">
<div class="layui-card" style="height: 100%">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -27,6 +27,9 @@
type="text">
</div>
</div>
<button class="layui-btn layui-btn-normal" id="seachIP" type="button">
查询
</button>
</div>
</form>
<div class="ip-form-item">
... ...
<title>拓扑列表</title>
<article class="page-container">
<div class="page-panel">
<div class="main">
<div class="main commonDiv">
<div class="layui-card">
<div class="layui-card-header">
<div class="layui-status">
... ... @@ -27,8 +27,9 @@
</div>
</div>
<div class="layui-inline">
<button class="layui-btn layui-btn-normal" id="mxgraphQueryBtn" type="button"><i
class="layui-icon layui-icon-search"></i>查询
<button class="layui-btn layui-btn-normal" id="mxgraphQueryBtn" type="button">
<!--lsq 取消掉查询按钮的图标 2022-06-28-->
查询
</button>
</div>
... ...
... ... @@ -164,3 +164,25 @@ custom-class="config-dialog"
align-items: center;
margin-right:6px;
}
/*lsq ping详情页面中搜索栏的样式调整 2022-06-28*/
.container .cm-card .search .condition.ping div{
margin-bottom: 0px !important;
}
.container .cm-card .search .condition.ping{
margin-bottom: 6px;
}
/*lsq elementUI的滚动条样式修改 2022-06-28*/
.el-scrollbar__bar.is-vertical {
width:15px;
top:0px;
}
.el-scrollbar__bar.is-horizontal {
height: 15px;
left:0px;
}
.el-scrollbar__thumb,.el-scrollbar__thumb:hover {
border-radius: 0px;
background-color: #CCCCCC;
opacity: 1;
width:10px;.el-scrollbar__bar.is-horizontal>div
}
\ No newline at end of file
... ...
... ... @@ -45,7 +45,7 @@
</el-descriptions>
</div>
<div class="search">
<div class="condition">
<div class="condition ping">
<el-form-item>
<el-input :size="$global.elementConfig.size.input" placeholder="=关键字="
v-model="search.keyword"></el-input>
... ... @@ -86,7 +86,7 @@
</el-form-item>
<el-form-item>
<el-button :size="$global.elementConfig.size.button" @click="getDataList">查询</el-button>
<el-button :size="$global.elementConfig.size.button" type="primary" @click="getDataList">查询</el-button>
</el-form-item>
</div>
</div>
... ...
... ... @@ -331,7 +331,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
}
}
}
if (formWidth + 130 > winWidth) {
if (formWidth + 260 > winWidth) {
$('.openStow').css('display', 'inline-block')
$('.form-item-open-stow').css('height', '50px');
} else {
... ...