diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js index 57e768552..87d7629b1 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMainCalc.js @@ -81,8 +81,9 @@ export default { init: function () { const meta2dOptions = { minScale: this.minScale, - maxScale: 2, - autoAnchor: false + // maxScale: 2, + autoAnchor: false, + // disableAnchor: true } const meta2d = new window.Meta2d(this.meta2dId, meta2dOptions) meta2d.register(flowPens()) @@ -126,9 +127,12 @@ export default { this.position.show = false let endTime = new Date().getTime() let startTime = endTime - 60 * this.params.timeType * 1000 - if (this.isChart) { + if (this.isChart && this.timeRange) { startTime = this.timeRange[0] endTime = this.timeRange[1] + } else if (this.filterTime) { + startTime = this.filterTime[0] + endTime = this.filterTime[1] } this.getQueryValues(this.querysArray, startTime, endTime).then((arr) => { this.clacTopoData(this.$lodash.cloneDeep(this.topoData), arr).then((data) => { @@ -306,6 +310,9 @@ export default { }, pensActive (pens, e) { // 选中节点 setTimeout(() => { + pens.forEach(item => { + item.disableAnchor = false + }) this.selectPens = pens this.modulesDiff(pens[0]) this.$nextTick(() => { diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 54fa0bdf7..5179befed 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -137,6 +137,11 @@ export default { option: this.option } }, + computed: { + filterTime () { + return this.$store.getters.getTimeRange + }, + }, props: { meta2dId: {}, // 唯一id 不可重复 iconArray: { diff --git a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue index 00d4db522..061753ea2 100644 --- a/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue +++ b/nezha-fronted/src/components/common/project/meta2d/topologyTopTool.vue @@ -289,9 +289,9 @@ export default { if (this.scaleNum < 25) { this.scaleNum = 25 } - if (this.scaleNum > 400) { - this.scaleNum = 400 - } + // if (this.scaleNum > 400) { + // this.scaleNum = 400 + // } this.scale(this.scaleNum) }, scale (val) { diff --git a/nezha-fronted/static/roteCursor.cur b/nezha-fronted/static/roteCursor.cur deleted file mode 100644 index 09bc2775b..000000000 Binary files a/nezha-fronted/static/roteCursor.cur and /dev/null differ