-
# Conflicts: # hg-monitor-web-zj/src/main/resources/static/src/controller/arms.js
-
cmdb数据同步页优化-去掉资源分类、资源处理状态改为同步状态、同步和忽略按钮调换位置、按钮颜色、关键文本框长度调整 See merge request !575
-
…eb into master-500-dev-lushangqing
-
#872 ping详情页调整-增加表格字段采集器id collectorId #3 See merge request !574
-
…eb into master-500-dev-lushangqing
-
#872 ping详情页调整-表格字段顺序，title名称，图标更换 #2 See merge request !573
-
…eb into master-500-dev-lushangqing
-
#872 ping详情数据联调 #1 See merge request !572
-
…eb into master-500-dev-lushangqing
-
cmdb数据同步忽略时的提示语更改 See merge request !571
-
…eb into master-500-dev-lushangqing
-
【682】Redis数据在页面不展示端口侦测数据,【611】IP视图将标题中的0 修改为X See merge request !570
-
…eb into master-500-dev-xwx
-
cmdb数据同步页列表无数据时调整，ping详情页列表静态页面搭建 #1 See merge request !569
-
…eb into master-500-dev-lushangqing Conflicts: hg-monitor-web-qh/src/main/resources/static/vue3/src/router/index.js
-
cmdb数据同步页列表接口、忽略接口、同步接口、纳入监控接口数据调用 See merge request !568
-
…eb into master-500-dev-lushangqing
-
活动告警告警闭环消除按钮默认不展示 See merge request !567