monitor_v3 / hg-monitor-web · Commits

09 Nov, 2021

4 commits

Merge branch 'master-v32-xwx' into 'master' ...
37b6062b
```
杭州-综合监控-告警模板配置策略bug修改



See merge request !39
```
by 王涛
2021-11-09 21:15:55 +0800
Browse Files
Merge branch 'master-v32-lushangqing' into 'master' ...
5d460db2
```
map地图组件引入，折线图、柱状图接口联调，导航轮播组件



See merge request !40
```
by 王涛
2021-11-09 21:15:10 +0800
Browse Files
map地图组件引入，折线图、柱状图接口联调，导航轮播组件
cbfcc357

by 鲁尚清
2021-11-09 16:14:31 +0800
Browse Files
杭州-文档管理-增加输入框回车搜索
bad78545

by xwx
2021-11-09 11:42:51 +0800
Browse Files

08 Nov, 2021

6 commits

Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx
e1a88fc4

by xwx
2021-11-08 18:44:57 +0800
Browse Files
杭州-综合监控-告警模板配置策略bug修改
f3ad4e89

by xwx
2021-11-08 18:44:49 +0800
Browse Files
Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … ...
26d660d5
```
…master-v32-lushangqing
```
by 鲁尚清
2021-11-08 11:58:43 +0800
Browse Files
lineChart封装为组件
03f8fb86

by 鲁尚清
2021-11-08 11:58:24 +0800
Browse Files
Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web
f48b2528

by 王涛
2021-11-08 11:56:55 +0800
Browse Files
文档管理代码优化
11b958c3

by 王涛
2021-11-08 11:56:40 +0800
Browse Files

06 Nov, 2021

3 commits

Merge branch 'master-v32-xwx' into 'master' ...
796f031c
```
杭州-订阅管理-通知类型和通知方式加边框



See merge request !38
```
by 王涛
2021-11-06 17:04:12 +0800
Browse Files
杭州-订阅管理-通知类型和通知方式加边框
278caa2c

by xwx
2021-11-06 16:36:43 +0800
Browse Files
优化
3fedb99c

by 王涛
2021-11-06 15:03:38 +0800
Browse Files

05 Nov, 2021

6 commits

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web
748ce079

by 王涛
2021-11-05 17:43:39 +0800
Browse Files
文档管理优化
64e84819

by 王涛
2021-11-05 17:43:12 +0800
Browse Directory »
Merge branch 'master-v32-lushangqing' into 'master' ...
bcaf97f4
```
大屏页面引入所有组件



See merge request !37
```
by 王涛
2021-11-05 17:38:05 +0800
Browse Files
大屏引入组件update
ddb2ea6e

by 鲁尚清
2021-11-05 17:31:01 +0800
Browse Files
Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … ...
19fe9be8
```
…master-v32-lushangqing
```
by 鲁尚清
2021-11-05 17:21:05 +0800
Browse Files
大屏引入所写组件
e6b6b97f

by 鲁尚清
2021-11-05 17:20:43 +0800
Browse Files

04 Nov, 2021

21 commits

Merge branch 'master-v32-xwx' into 'master' ...
aefb26b9
```
浙江-任务管理-资源弹窗界面禁用上报样式调整   杭州-用户管理-删除所在部门多余字段



See merge request !36
```
by 王涛
2021-11-04 19:27:47 +0800
Browse Files
Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web
dc92ea70

by 王涛
2021-11-04 19:26:20 +0800
Browse Files
文件预览；文档管理优化
b8157372

by 王涛
2021-11-04 19:26:14 +0800
Browse Files
Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx
e6a36a51

by xwx
2021-11-04 18:48:26 +0800
Browse Files
杭州-综合监控-修改密码提示语文字修改
c5610efe

by xwx
2021-11-04 18:48:14 +0800
Browse Files
Merge branch 'monitor-web-yuanjp' into 'master' ...
7e053405
```
资产维修记录



See merge request !35
```
by 王涛
2021-11-04 17:59:40 +0800
Browse Files
资产维修记录
a1290b15

by 袁晋鹏
2021-11-04 17:50:43 +0800
Browse Files
今日申报折线图与柱状图(80%)，系统资源统计(80%),云平台(10%)
f736793d

by 鲁尚清
2021-11-04 17:42:46 +0800
Browse Files
Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx
782f3150

by xwx
2021-11-04 17:24:11 +0800
Browse Files
Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web
d7e452eb

by 王涛
2021-11-04 16:56:53 +0800
Browse Files
文档管理优化
3d2aa557

by 王涛
2021-11-04 16:56:44 +0800
Browse Files
Merge branch 'master-v32-xwx' into 'master' ...
315d5728
```
浙江-任务管理-修改历史版本页面关闭时关闭所有子页面   浙江-首页-首页告警展示数量样式调整



See merge request !34
```
by 王涛
2021-11-04 16:55:56 +0800
Browse Files
杭州-用户管理-删除所在部门多余字段
9f80c734

by xwx
2021-11-04 16:50:27 +0800
Browse Files
乙方运维用户资产功能优化
fe977eb2

by 王涛
2021-11-04 16:27:29 +0800
Browse Files
Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web ...
84a2371f
```
 Conflicts:
	doc/SQL/zj/V1015_1_乙方运维数据库设计SQL.txt
	hg-monitor-web-zj/src/main/resources/static/vue3/src/components/page/operationMaintenance/user/index.js
```
by 王涛
2021-11-04 16:26:59 +0800
Browse Directory »
乙方运维用户资产功能优化；基础组件版本升级
7bfd0738

by 王涛
2021-11-04 16:25:25 +0800
Browse Files
浙江-任务管理-修改历史版本页面关闭时关闭所有子页面
dba24376

by xwx
2021-11-04 10:20:44 +0800
Browse Files
浙江-首页-首页告警展示数量注释添加
1e4d1da0

by xwx
2021-11-04 10:12:39 +0800
Browse Files
Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-v32-xwx
ccb69875

by xwx
2021-11-04 10:03:11 +0800
Browse Files
浙江-首页-首页告警展示数量样式调整
d3bc08a0

by xwx
2021-11-04 10:02:58 +0800
Browse Files
Merge branch 'master-V32-XuHaoJie' into 'master' ...
f2f661b7
```
杭州-资源视图-arms详情页最新优化



See merge request !33
```
by 王涛
2021-11-04 09:09:34 +0800
Browse Files