diff --git a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue index 64194a4d7..210029540 100644 --- a/nezha-fronted/src/components/chart/chart/chartAutotopology.vue +++ b/nezha-fronted/src/components/chart/chart/chartAutotopology.vue @@ -17,6 +17,7 @@ :show-zoom="false" class="meta2d-chart" :is-chart="true" + :iconArray="iconArray" :ref="'topology' + index" /> @@ -37,7 +38,8 @@ export default { data () { return { topologyLoading: false, - allProject: [] + allProject: [], + iconArray: [] } }, mixins: [chartMixin], @@ -136,6 +138,9 @@ export default { }, mounted () { // this.queryAllProjectData() + this.$get('/topology/icon').then(res => { + this.iconArray = [...res.data.list] + }) }, beforeDestroy () { this.allProject = [] diff --git a/nezha-fronted/src/components/common/mixin/beforeMeta2d.js b/nezha-fronted/src/components/common/mixin/beforeMeta2d.js index 4062f49aa..adb15bcb0 100644 --- a/nezha-fronted/src/components/common/mixin/beforeMeta2d.js +++ b/nezha-fronted/src/components/common/mixin/beforeMeta2d.js @@ -4,7 +4,8 @@ export default { topoData: {}, querysArray: [], meta2dType: '', - params: {} + params: {}, + iconArray: [] } }, watch: { 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 ca6fc12ec..ee7b048fe 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js @@ -74,7 +74,6 @@ export default { offsetX: 0, offsetY: 0, moduleId: '', - iconArray: [] } }, mixins: [topoUtil], @@ -121,9 +120,6 @@ export default { // meta2d.on('add', this.appPen) // 添加新画笔· meta2d.on('click', this.topoClick) // click画笔· setTopology(this.meta2dId, meta2d) - this.$get('/topology/icon').then(res => { - this.iconArray = [...res.data.list] - }) this.reload() }, reload () { diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index d14e82270..269d99725 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -126,6 +126,12 @@ export default { mixins: [meta2dMain, topoUtil], props: { meta2dId: {}, // 唯一id 不可重复 + iconArray: { + type: Array, + default: () => { + return [] + } + }, topoData: {}, // topo图数据 isChart: { type: Boolean, diff --git a/nezha-fronted/src/components/page/monitor/project/project.vue b/nezha-fronted/src/components/page/monitor/project/project.vue index e265e965d..09ff50255 100644 --- a/nezha-fronted/src/components/page/monitor/project/project.vue +++ b/nezha-fronted/src/components/page/monitor/project/project.vue @@ -57,6 +57,7 @@ :querysArray="isPreview.querysArray" :project="isPreview.currentProject" :params="isPreview.params" + :iconArray="iconArray" /> @@ -620,7 +621,9 @@ export default { setTimeout(() => { this.ready = true }, 300) - + this.$get('/topology/icon').then(res => { + this.iconArray = [...res.data.list] + }) this.initEvent() }, computed: {