monitor_v3 / hg-monitor-web · Commits

…eb into master-500-dev

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/controller/reslist.js

任务管理-禅道150问题添加列。条件检索



See merge request !491

告警消除页面联调修改



See merge request !490

…eb into master-500-dev

告警消除页面增加props.amId



See merge request !489

…eb into master-500-dev

…eb into master-500-dev-lushangqing

告警消除页面审批人修改



See merge request !488

…eb into master-500-dev-lushangqing

告警消除页面增加审核意见



See merge request !487

告警消除页面联调接口当前处理人，当前负责人，当前告警统计信息，消除告警，从历史告警进入告警消除页面



See merge request !486

…eb into master-500-dev-lushangqing

告警消除页面搭建



See merge request !485

…eb into master-500-dev-lushangqing

aj配置功能还原



See merge request !483

资源视图监控状态未监控时健康状态不展示



See merge request !482

…eb into master-500-dev-xwx

…eb into master-500-dev

…eb into master-500-dev-xwx

wangEditor富文本框引入到项目中



See merge request !481

…eb into master-500-dev-lushangqing

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/vue3/src/router/index.js