diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue index 772ccf601..f32514036 100644 --- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue +++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue @@ -2,16 +2,21 @@
- - + +
-
@@ -23,7 +28,7 @@ - diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js index a5938b598..894913198 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js @@ -125,6 +125,7 @@ export default { // meta2d.on('add', this.appPen) // 添加新画笔· meta2d.on('click', this.topoClick) // click画笔· setTopology(this.meta2dId, meta2d) + this.reload() }, reload () { this.position.show = false @@ -132,12 +133,17 @@ export default { const startTime = endTime - 60 * this.params.timeType * 1000 this.getQueryValues(this.querysArray, startTime, endTime).then((arr) => { this.clacTopoData(this.topoData, arr).then((data) => { - console.log(data) + if (!getTopology(this.meta2dId)) { + return + } this.getModule() - console.log(this.meta2dId, getTopology(this.meta2dId)) - getTopology(this.meta2dId).open(data) getTopology(this.meta2dId).resize() - getTopology(this.meta2dId).centerView() + getTopology(this.meta2dId).open(data) + if (this.isChart) { + getTopology(this.meta2dId).fitView(20) + } else { + getTopology(this.meta2dId).centerView() + } getTopology(this.meta2dId).lock(1) this.getNodesArr() }) diff --git a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js index d570dd837..273f91e02 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js @@ -216,7 +216,6 @@ export default { pen.animateColor = mapping.color.bac pen.borderColor = mapping.color.border pen.color = mapping.color.text - console.log(!!pen.lineAnimateType) if (pen.lineAnimateType) { pen.autoPlay = true } diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue index 2712535fb..ee048252c 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dCanvas.vue @@ -126,7 +126,6 @@ export default { }, computed: { selectPenArrId () { - console.log(this.selectPenArr) return this.selectPenArr.active.map(item => item.id) } }, @@ -200,7 +199,6 @@ export default { }, penActive (item) { // bus.$emit('changeSelectPens', []) - console.log(getTopology(this.meta2dId).store) this.$emit('changeActiveName') this.$nextTick(() => { getTopology(this.meta2dId).active([item]) diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 72f027dc1..25f80e5ae 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -157,14 +157,18 @@ export default { }, watch: { topoData: { - immediate: true, + immediate: false, handler () { - this.reload() + if (!this.isChart) { + this.reload() + } } } }, mounted () { - this.init() + setTimeout(() => { + this.init() + }) bus.$on('changeSelectPens', this.pensActive) this.$refs.meta2dBox.addEventListener('mousemove', this.mousemove) // this.$refs.meta2dBox.addEventListener('mousedown', this.mousedown) @@ -182,11 +186,13 @@ export default { }, zoomMap (num) { getTopology(this.meta2dId).scale(getTopology(this.meta2dId).store.data.scale + num) - }, + } }, beforeDestroy () { - getTopology(this.meta2dId).clear() - setTopology(this.meta2dId, null) + if (getTopology(this.meta2dId)) { + getTopology(this.meta2dId).clear() + setTopology(this.meta2dId, null) + } bus.$off('changeSelectPens', this.pensActive) this.$refs.meta2dBox.removeEventListener('mousemove', this.mousemove) this.$refs.meta2dBox.removeEventListener('mouseup', this.mouseup) diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue index 9ac632251..9444a7f3d 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue @@ -18,7 +18,6 @@