Commit Graph

10 Commits

Author SHA1 Message Date
zhangyu
5f8474146d Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3 2022-07-20 10:03:17 +08:00
zhangyu
1712e7c926 NEZ-2051 fix:console 报错 2022-07-20 09:54:12 +08:00
zhangyu
ab7750cdfa Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/project/topologyL5.vue
2022-07-15 17:16:04 +08:00
zhangyu
60671e1d3b fix:删除控制台console 2022-07-15 17:05:03 +08:00
zhangyu
db7f526b1e NEZ-2024 fix:{{A.$labels}} 变量展示错误 2022-07-14 13:59:52 +08:00
zhangyu
6644b111bf Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
2022-07-14 11:33:43 +08:00
zhangyu
5061a0dd37 fix: 补充注释的监听事件 以及 diagram组件修改 2022-07-14 11:31:03 +08:00
zhangyu
2c91184bb0 Merge branch 'dev-3.2' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.3
# Conflicts:
#	.gitignore
#	nezha-fronted/src/assets/css/font/iconfont.js
#	nezha-fronted/src/components/chart/chart/chartAutotopology.vue
#	nezha-fronted/src/components/common/ChartDiagram/diagram.vue
#	nezha-fronted/src/components/common/detailView/view/detailViewRight.vue
#	nezha-fronted/src/components/common/js/common.js
#	nezha-fronted/src/components/common/js/tools.js
#	nezha-fronted/src/components/common/project/topologyL5.vue
#	nezha-fronted/static/config.json
2022-07-14 10:19:06 +08:00
zhangyu
73b71d578f fix:修改 topology 源码 删除创建的节点以及给节点创建的对应的事件 2022-07-14 09:55:10 +08:00
zhangyu
816b8c4efa fix:将 le5le 源码 移动至本地 2022-07-13 14:06:20 +08:00