• This project
    • Loading...
  • Sign in

monitor_v3 / hg-monitor-web · Commits

Go to a project
11818 11818 11818 qq%e5%9b%be%e7%89%87 08 03 14 04 40

GitLab

  • Go to group
  • Project
  • Activity
  • Files
  • Commits
  • Pipelines 0
  • Builds 0
  • Graphs
  • Milestones
  • Issues 0
  • Merge Requests 0
  • Members
  • Labels
  • Wiki
  • Forks
  • Network
  • Create a new issue
  • Commits 2,315
  • Network
  • Compare
  • Branches 47
  • Tags 1
  • hg-monitor-web
08 Aug, 2023
5 commits
  • Merge branch 'master-mj-ztq' into 'master-mj' ...
    4aff2b9d
    feat:资源管理-资源编辑深色模式下需要修改样式
    
    
    
    See merge request !1172
    by 王涛
    2023-08-08 15:21:02 +0800  
    Browse Files
  • Merge branch 'master-mj-joke' into 'master-mj' ...
    a4aba49f
    fix:告警订阅订阅资源列表表头和数据错位
    
    fix:告警订阅订阅资源列表表头和数据错位
    
    See merge request !1171
    by 王涛
    2023-08-08 15:20:49 +0800  
    Browse Files
  • feat:资源管理-资源编辑深色模式下需要修改样式
    c55afcc4
    by zhangtianqi
    2023-08-08 15:16:32 +0800  
    Browse Directory »
  • fix:告警订阅订阅资源列表表头和数据错位
    84f22e44
    by 张凯
    2023-08-08 11:55:41 +0800  
    Browse Directory »
  • fix:网络视图资源配置新增的数据不能删除
    b2d851ea
    by zhichao
    2023-08-08 11:14:52 +0800  
    Browse Directory »

07 Aug, 2023
9 commits
  • Merge branch 'master-mj-yjpeng' into 'master-mj' ...
    b46588ce
    fix:查询厂商机房调用cmdb
    
    
    
    See merge request !1170
    by 王涛
    2023-08-07 19:56:18 +0800  
    Browse Directory »
  • fix:查询厂商机房调用cmdb
    2af78580
    by 袁晋鹏
    2023-08-07 19:51:40 +0800  
    Browse Files
  • fix: 优化拓扑管理
    dd48302a
    by wangtao
    2023-08-07 19:04:25 +0800  
    Browse Files
  • Merge branch 'master-mj-joke' into 'master-mj' ...
    4aea21ce
    fix:巡检结果通知人无法分页导致一页展示10条数据,无法选择其他用户
    
    fix:巡检结果通知人无法分页导致一页展示10条数据,无法选择其他用户
    
    See merge request !1169
    by 王涛
    2023-08-07 17:30:56 +0800  
    Browse Files
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke
    1d6eb1f8
    by 张凯
    2023-08-07 17:23:18 +0800  
    Browse Files
  • fix: 拓扑优化
    d47e8717
    by wangtao
    2023-08-07 17:22:45 +0800  
    Browse Files
  • fix:值班管理——>调换值班,换班时间段下拉没有时间导致不能保存
    69bef423
    by 张凯
    2023-08-07 17:18:29 +0800  
    Browse Files
  • fix:告警订阅——>通过订阅人数下探页面运营商字段未转义
    be99c5c1
    by 张凯
    2023-08-07 11:15:27 +0800  
    Browse Files
  • fix:巡检结果通知人无法分页导致一页展示10条数据,无法选择其他用户
    bec9a4d3
    by 张凯
    2023-08-07 10:14:51 +0800  
    Browse Files

06 Aug, 2023
26 commits
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj
    e5804fc4
    by wangtao
    2023-08-06 19:38:41 +0800  
    Browse Files
  • fix: 优化
    b32a1094
    by wangtao
    2023-08-06 19:38:31 +0800  
    Browse Files
  • Merge branch 'master-mj-joke' into 'master-mj' ...
    23070271
    fix:告警策略新增的数据无法删除
    
    fix:告警策略新增的数据无法删除
    
    See merge request !1168
    by 王涛
    2023-08-06 19:32:56 +0800  
    Browse Files
  • fix:告警策略新增的数据无法删除
    b58a138e
    by 张凯
    2023-08-06 19:29:32 +0800  
    Browse Directory »
  • Merge branch 'master-mj-ztq' into 'master-mj' ...
    b184f2f0
    Master mj ztq
    
    
    
    See merge request !1167
    by 王涛
    2023-08-06 18:29:38 +0800  
    Browse Files
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-ztq
    beee605a
    by zhangtianqi
    2023-08-06 18:25:42 +0800  
    Browse Directory »
  • feat:监控配置->资源管理(修改密码功能不能用页面报错
    09963815
    by zhangtianqi
    2023-08-06 18:25:29 +0800  
    Browse Directory »
  • Merge branch 'master-mj-joke' into 'master-mj' ...
    4e38b79c
    fix:告警策略--按照资源类型搜索下拉框设置高度
    
    fix:告警策略--按照资源类型搜索下拉框设置高度
    
    See merge request !1166
    by 王涛
    2023-08-06 17:39:23 +0800  
    Browse Files
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke
    9a87e0ea
    by 张凯
    2023-08-06 17:36:37 +0800  
    Browse Directory »
  • fix:告警策略--按照资源类型搜索下拉框设置高度
    ac72ca57
    by 张凯
    2023-08-06 17:36:23 +0800  
    Browse Directory »
  • Merge branch 'master-mj-yjpeng' into 'master-mj' ...
    2a91371c
    fix:基础环境功能bug优化
    
    
    
    See merge request !1165
    by 王涛
    2023-08-06 16:49:59 +0800  
    Browse Directory »
  • fix: 修改基线展示异常
    ec9cc339
    by wangtao
    2023-08-06 16:48:08 +0800  
    Browse Files
  • Merge branch 'master-mj-joke' into 'master-mj' ...
    8d6c3796
    fix:采集器心跳时间点击下探逻辑调整(改为like)
    
    fix:采集器心跳时间点击下探逻辑调整(改为like)
    
    See merge request !1164
    by 王涛
    2023-08-06 16:41:39 +0800  
    Browse Files
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke
    7b0fd2c1
    by 张凯
    2023-08-06 16:37:14 +0800  
    Browse Files
  • fix:采集器心跳时间点击下探逻辑调整(改为like)
    70f2595c
    by 张凯
    2023-08-06 16:36:58 +0800  
    Browse Directory »
  • Merge branch 'master-mj-joke' into 'master-mj' ...
    1ac1f0f4
    fix:告警订阅删除失败问题处理
    
    fix:告警订阅删除失败问题处理
    
    See merge request !1163
    by 王涛
    2023-08-06 16:04:42 +0800  
    Browse Files
  • fix:基础环境功能bug优化
    69990d18
    by 袁晋鹏
    2023-08-06 16:03:25 +0800  
    Browse Files
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke
    f57f6b20
    by 张凯
    2023-08-06 15:00:56 +0800  
    Browse Directory »
  • fix:1、告警订阅,订阅对象无法下探页面一直在转圈;2、下探后删除报错
    2ec3336c
    by 张凯
    2023-08-06 15:00:41 +0800  
    Browse Directory »
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj
    86b6d69e
    by wangtao
    2023-08-06 14:59:32 +0800  
    Browse Directory »
  • fix: 将指令添加图标修改为文字
    4614e4ba
    by wangtao
    2023-08-06 14:59:24 +0800  
    Browse Files
  • fix:告警模板新增状态下没有做校验,必填字段不填写也可以新增
    1d28efe4
    by 张凯
    2023-08-06 11:48:10 +0800  
    Browse Directory »
  • fix:告警模板——>告警策略右侧的选择策略文字没有展示出来
    0187d158
    by 张凯
    2023-08-06 11:30:13 +0800  
    Browse Directory »
  • Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj-joke ...
    5831d3f3
    # Conflicts:
    #	hg-monitor-web-base/src/main/resources/static/src/controller/alarmtemplateAdd.js
    by 张凯
    2023-08-06 11:26:34 +0800  
    Browse Directory »
  • fix:告警模板——>告警策略右侧的选择策略文字没有展示出来
    889c0379
    by 张凯
    2023-08-06 11:24:21 +0800  
    Browse Files
  • fix:告警模板删除失败问题处理
    f5f2d185
    by 张凯
    2023-08-06 10:23:39 +0800  
    Browse Directory »