diff --git a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue index 4c2eb1d64..48fda71bf 100644 --- a/nezha-fronted/src/components/common/ChartDiagram/diagram.vue +++ b/nezha-fronted/src/components/common/ChartDiagram/diagram.vue @@ -154,10 +154,9 @@ -
@@ -696,7 +695,8 @@ export default { if (this.fromTopologyDialog && !this.isPreview) { setTimeout(() => { this.topologyLoading = false - getTopology(this.topologyIndex).open(data) + console.log(data) + getTopology(this.topologyIndex).open(data || {}) getTopology(this.topologyIndex).centerView() getTopology(this.topologyIndex).resize() this.editTopology() @@ -706,7 +706,7 @@ export default { if (!getTopology(this.topologyIndex)) { return } - getTopology(this.topologyIndex).open(data) + getTopology(this.topologyIndex).open(data || {}) getTopology(this.topologyIndex).lock(1) this.objChange = false let flag = false @@ -852,7 +852,8 @@ export default { gridSize: 10, gridColor: '#ededed', lineWidth: 1, - ruleColor: '#4e4e4e' + ruleColor: '#4e4e4e', + pens:[] } this.projectInfoShow = true this.projectAlertShow = true @@ -1750,7 +1751,7 @@ export default { const domRect = dom ? dom.getBoundingClientRect() : {} getTopology(this.topologyIndex).canvasPos = domRect if (this.fromOverView) { - getTopology(this.topologyIndex).open(this.oldTopologyData) + getTopology(this.topologyIndex).open(this.oldTopologyData || {}) } let flag = false const position = { diff --git a/nezha-fronted/src/components/common/project/L5/services/canvas.js b/nezha-fronted/src/components/common/project/L5/services/canvas.js index 405bc1a49..09a1a7efe 100644 --- a/nezha-fronted/src/components/common/project/L5/services/canvas.js +++ b/nezha-fronted/src/components/common/project/L5/services/canvas.js @@ -176,7 +176,7 @@ export const imageTemp = { } } export const imageTemp2 = { - name: 'rectangleImg', + name: 'rectangleImg2', icon: 'icon-image', data: { type: 0, @@ -193,7 +193,7 @@ export const imageTemp2 = { color: '#000000', background: '#ffffff00', animatePos: 0, - name: 'rectangleImg', + name: 'rectangleImg2', lineDashOffset: 0, text: '', textOffsetX: 0, diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 1bb9ce7be..1a6dc01ef 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -713,7 +713,7 @@ export default { if (!getTopology(this.topologyIndex)) { return } - getTopology(this.topologyIndex).open(data) + getTopology(this.topologyIndex).open(data || {}) getTopology(this.topologyIndex).lock(1) this.objChange = false let flag = false @@ -1551,7 +1551,6 @@ export default { break } case 'scale': { - let dom = document.getElementById('topology-canvas' + this.topologyIndexF) let domRect = dom ? dom.getBoundingClientRect() : {} if (getTopology(this.topologyIndex)) { @@ -2222,7 +2221,7 @@ export default { let domRect = document.getElementById('topology-canvas' + this.topologyIndex).getBoundingClientRect() getTopology(this.topologyIndex).canvasPos = domRect if (this.fromOverView) { - getTopology(this.topologyIndex).open(this.oldTopologyData) + getTopology(this.topologyIndex).open(this.oldTopologyData || {}) } let flag = false