diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index bee77b243..b6ddbb910 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -264,9 +264,6 @@ this.isError = false; this.searchTime = bus.getTimezontDateRange(); this.chart = JSON.parse(JSON.stringify(chartInfo)); - - console.log('chart',this.chart,chartInfo) - let chartType= chartInfo.type; let chartContainerId = 'chartEchartPreview'; if(chartType==='table'){ diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 0030f3f50..97f6ebf9b 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -1538,9 +1538,7 @@ let a=arr.splice(0,1); arr.reverse(); arr.unshift(a[0]); - console.log(arr); this.selection.pen.data.valueMapping=arr; - console.log('aaa') } }, valueMappingDel(index,row){ diff --git a/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue b/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue index 29ea2e438..1fbc49954 100644 --- a/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue +++ b/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue @@ -123,7 +123,6 @@ }, undo(){//撤销 getTopology(this.index).undo(); - console.log(getTopology(this.index).caches.index); // if(!this.redoFlag){ // this.$emit('redoIndexChange',getTopology(this.index).caches.index) // } @@ -134,7 +133,6 @@ // },200) }, redo(){//重做 - console.log(getTopology(this.index)) getTopology(this.index).redo(); }, centerView(){//居中显示 diff --git a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue index 539e8a2c6..48fde2fb7 100644 --- a/nezha-fronted/src/components/common/project/popData/expressionInfo.vue +++ b/nezha-fronted/src/components/common/project/popData/expressionInfo.vue @@ -29,7 +29,6 @@ this.expressionInfoData=this.expressionInfoData.concat(item.data.result); } }); - console.log(this.expressionInfoData); } } }, @@ -45,7 +44,6 @@ this.expressionInfoData=this.expressionInfoData.concat(item.data.result); } }); - console.log(this.expressionInfoData); } }, methods:{ diff --git a/nezha-fronted/src/components/common/project/topologyL5.vue b/nezha-fronted/src/components/common/project/topologyL5.vue index 8edc97447..5cc39ede1 100644 --- a/nezha-fronted/src/components/common/project/topologyL5.vue +++ b/nezha-fronted/src/components/common/project/topologyL5.vue @@ -384,6 +384,7 @@ name:'', }, saveData:{}, + oldTopologyData:'', redoIndex:0, dataLength:0, editTopologyFlag:false, @@ -670,6 +671,7 @@ // getTopology(this.topologyIndex).scaleTo(data.scale/2) // } // getTopology(this.topologyIndex).fitView(); + this.oldTopologyData=JSON.stringify(getTopology(this.topologyIndex).data) this.getNodesArr(); }); }) @@ -1771,27 +1773,32 @@ /*tools 方法*/ winResize(){ - let domRect=document.getElementById('topology-canvas'+this.topologyIndex).getBoundingClientRect(); - // this.toolShow.attrCord=[domRect.width-350,0]; - // this.toolShow.height=domRect.height; - getTopology(this.topologyIndex).canvasPos=domRect; - let flag=false; + setTimeout(()=>{ + let domRect=document.getElementById('topology-canvas'+this.topologyIndex).getBoundingClientRect(); + // this.toolShow.attrCord=[domRect.width-350,0]; + // this.toolShow.height=domRect.height; + getTopology(this.topologyIndex).canvasPos=domRect; + if(this.fromOverView){ + getTopology(this.topologyIndex).open(this.oldTopologyData); + } + let flag=false; - let position={ - x:this.$refs['topology-canvas'+this.topologyIndexF].offsetWidth, - y:this.$refs['topology-canvas'+this.topologyIndexF].offsetHeight, - } - getTopology(this.topologyIndex).data.pens.forEach(item=>{ - if(flag){ - return + let position={ + x:this.$refs['topology-canvas'+this.topologyIndexF].offsetWidth, + y:this.$refs['topology-canvas'+this.topologyIndexF].offsetHeight, } - if(item.rect.ex>position.x || item.rect.ey>position.y){ - getTopology(this.topologyIndex).fitView(20); - flag=true - } - }); - getTopology(this.topologyIndex).centerView(20); - this.getNodesArr(); + getTopology(this.topologyIndex).data.pens.forEach(item=>{ + if(flag){ + return + } + if(item.rect.ex>position.x || item.rect.ey>position.y){ + getTopology(this.topologyIndex).fitView(20); + flag=true + } + }); + getTopology(this.topologyIndex).centerView(20); + this.getNodesArr(); + },100) }, canvasMove(e){// 画布上的移动 确定tooltip的位置 if(this.tooltipPosition.show){ diff --git a/nezha-fronted/src/components/common/project/topologyPrev.vue b/nezha-fronted/src/components/common/project/topologyPrev.vue index 5a3c92be5..5010a1f45 100644 --- a/nezha-fronted/src/components/common/project/topologyPrev.vue +++ b/nezha-fronted/src/components/common/project/topologyPrev.vue @@ -384,6 +384,7 @@ name:'', }, saveData:{}, + oldTopologyData:'', redoIndex:0, dataLength:0, editTopologyFlag:false, @@ -670,6 +671,7 @@ // getTopology(this.topologyIndex).scaleTo(data.scale/2) // } // getTopology(this.topologyIndex).fitView(); + this.oldTopologyData=JSON.stringify(getTopology(this.topologyIndex).data) this.getNodesArr(); }); }) @@ -1771,27 +1773,32 @@ /*tools 方法*/ winResize(){ - let domRect=document.getElementById('topology-canvas'+this.topologyIndex).getBoundingClientRect(); - // this.toolShow.attrCord=[domRect.width-350,0]; - // this.toolShow.height=domRect.height; - getTopology(this.topologyIndex).canvasPos=domRect; - let flag=false; + setTimeout(()=>{ + let domRect=document.getElementById('topology-canvas'+this.topologyIndex).getBoundingClientRect(); + // this.toolShow.attrCord=[domRect.width-350,0]; + // this.toolShow.height=domRect.height; + getTopology(this.topologyIndex).canvasPos=domRect; + if(this.fromOverView){ + getTopology(this.topologyIndex).open(this.oldTopologyData); + } + let flag=false; - let position={ - x:this.$refs['topology-canvas'+this.topologyIndexF].offsetWidth, - y:this.$refs['topology-canvas'+this.topologyIndexF].offsetHeight, - } - getTopology(this.topologyIndex).data.pens.forEach(item=>{ - if(flag){ - return + let position={ + x:this.$refs['topology-canvas'+this.topologyIndexF].offsetWidth, + y:this.$refs['topology-canvas'+this.topologyIndexF].offsetHeight, } - if(item.rect.ex>position.x || item.rect.ey>position.y){ - getTopology(this.topologyIndex).fitView(20); - flag=true - } - }); - getTopology(this.topologyIndex).centerView(20); - this.getNodesArr(); + getTopology(this.topologyIndex).data.pens.forEach(item=>{ + if(flag){ + return + } + if(item.rect.ex>position.x || item.rect.ey>position.y){ + getTopology(this.topologyIndex).fitView(20); + flag=true + } + }); + getTopology(this.topologyIndex).centerView(20); + this.getNodesArr(); + },100) }, canvasMove(e){// 画布上的移动 确定tooltip的位置 if(this.tooltipPosition.show){ diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index c3c9c88bf..ef2b5bad4 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -30,10 +30,6 @@ id="alert-box-input-promql" > - - - - diff --git a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue index 0707e4eb8..25cc0e3d9 100644 --- a/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue +++ b/nezha-fronted/src/components/common/rightBox/batchEditAsset.vue @@ -670,7 +670,6 @@ } }); }else{ - console.log(213123123123); this.prevent_opt.save=false; return false; } diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index f20142fe4..2784c2790 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -778,7 +778,6 @@ return ''; }, changeTopologyIndexF(){ - console.log(132123132123123); this.topologyIndexF=0; }, },