diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 0ebce2968..2e00d77c5 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -175,7 +175,7 @@ diff --git a/nezha-fronted/src/components/common/project/topologyPrev.vue b/nezha-fronted/src/components/common/project/topologyPrev.vue index fca38047c..6dd342f23 100644 --- a/nezha-fronted/src/components/common/project/topologyPrev.vue +++ b/nezha-fronted/src/components/common/project/topologyPrev.vue @@ -50,7 +50,7 @@
-
@@ -58,7 +58,7 @@ @@ -66,7 +66,7 @@
{{$t('project.topology.defaultLineType')}} - +
@@ -375,7 +375,10 @@
- +
+
+
+
@@ -518,9 +521,9 @@ chartData:{}, chartGetData:[], penLineType:[ - {d:'M5 19 a50,100 0 0,1 40,0',"stroke-dasharray":"",name:this.$t('project.topology.curve')}, - {d:'M5 8 l20 0 l0 12 l20 0',"stroke-dasharray":"",name:this.$t('project.topology.polyline')}, - {d:'M5 14 l40 0',"stroke-dasharray":"",name:this.$t('project.topology.line')}, + {d:'M5 19 a50,100 0 0,1 40,0',"stroke-dasharray":"",name:this.$t('project.topology.curve'),id:'curve'}, + {d:'M5 8 l20 0 l0 12 l20 0',"stroke-dasharray":"",name:this.$t('project.topology.polyline'),id:'polyline'}, + {d:'M5 14 l40 0',"stroke-dasharray":"",name:this.$t('project.topology.line'),id:'line'}, // {d:'M5 20 C0,8 50,0 85,0',"stroke-dasharray":"",name:'mind'}, ], lineName:'curve', @@ -1474,18 +1477,19 @@ case 'space': case 'scale': case 'translate': - if(!this.timer2){ - this.timer2=setTimeout(()=>{ - this.getNodesArr(); - this.timer2=null - },300) - }else{ - clearTimeout(this.timer2); - this.timer2=setTimeout(()=>{ - this.getNodesArr(); - this.timer2=null - },300) - } + this.getNodesArr(); + // if(!this.timer2){ + // this.timer2=setTimeout(()=>{ + // this.getNodesArr(); + // this.timer2=null + // },300) + // }else{ + // clearTimeout(this.timer2); + // this.timer2=setTimeout(()=>{ + // this.getNodesArr(); + // this.timer2=null + // },300) + // } break; } },0); @@ -1695,7 +1699,6 @@ }) }else{ this.imgageLoading=true; - this.tools[1].children=[]; let promiseArr=[]; imgidList.forEach((item,index)=>{ if(item.data.imageId){ @@ -1775,13 +1778,9 @@ } if(item.data.gradientType===0){ item.bkType=0; - } - if(item.data.gradientType===1 ||item.data.gradientType===3){ + }else{ item.bkType=1; } - if(item.data.gradientType===2 ||item.data.gradientType===4){ - item.bkType=2; - } }else if(item.type===1){ item.animateColor=item.data.animateColor; item.strokeStyle=item.data.strokeStyle; @@ -2054,9 +2053,12 @@ }); this.uploadPic.name=''; this.uploadPic.unit=''; - this.file=null + this.file=null; this.uploadPicShow=true; - } + }, + zoomMap(num){ + getTopology(this.topologyIndex).scaleTo(getTopology(this.topologyIndex).data.scale+num); + }, }, destroyed(){ getTopology(this.topologyIndex).destroy();