monitor_v3 / hg-monitor-web · Commits

fix:告警订阅删除失败问题处理

fix:告警订阅删除失败问题处理

See merge request !1163

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

fix:工作日志厂商数据加载不出来的问题处理



See merge request !1162

Master mj ztq



See merge request !1161

fix:工作日志下载功能新增



See merge request !1160

feat:监控配置->资源管理（修改密码功能不能用页面报错



See merge request !1159

Master mj ztq



See merge request !1158

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/controller/alarmsubscribeIndex.js
	hg-monitor-web-base/src/main/resources/static/src/controller/alarmtemplateIndex.js
	hg-monitor-web-base/src/main/resources/static/src/controller/bustype.js
	hg-monitor-web-base/src/main/resources/static/src/controller/collectorlist.js
	hg-monitor-web-base/src/main/resources/static/src/controller/ddicAdd.js

fix:迁移告警压缩查询功能，优化资源管理删除不展示、监控概况业务莫i快不展示的问题，和工作日志不能删除的问题



See merge request !1157