From 9a4f25ae06793f3df1c3d158f6a25b9e55665e94 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 27 Nov 2020 09:24:44 +0800 Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9Atopology=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=B1=95=E5=BC=80=E6=94=B6=E8=B5=B7=E7=9A=84=E5=8A=A8=E7=94=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/cli/webSSH.vue | 1 - .../bottomBox/tabs/endpointQueryTab.vue | 1 - .../common/bottomBox/tabs/endpointTab.vue | 1 - .../src/components/common/exportXLSX.vue | 1 - .../components/common/project/topology.vue | 87 ++++++++++++------- .../trafficSetting/trafficSettingTab.vue | 2 - .../src/components/page/config/mibBrowser.vue | 1 - 7 files changed, 55 insertions(+), 39 deletions(-) diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue index 9768e6519..ef2d3355f 100644 --- a/nezha-fronted/src/components/cli/webSSH.vue +++ b/nezha-fronted/src/components/cli/webSSH.vue @@ -567,7 +567,6 @@ let contentRightHeight = contentRightDom.offsetHeight;//可视高度 //点击时俩dom的初始高度： let subInitialHeight = subListDom.offsetHeight+resizeBarHeight; - console.log(subListDom.offsetHeight); //mainModalDom.style.display = "block"; resizeModalDom.style.cssText = `height: ${subInitialHeight}px; display: block;`; resizeBarDom.style.display = "none"; diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index ab4f85422..11ad79800 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -656,7 +656,6 @@ plpsscrolly(self){ let el = self.$refs.endpointQueryTable.$el.querySelector(".el-table__body-wrapper"); self.scrollTop=el.scrollTop; - console.log(self.scrollTop); if (el._ps_.scrollbarYTop > 50) { self.showTopBtn = true; self.tableHover = true; diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue index 4e8964a1a..d0b35d8bc 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointTab.vue @@ -354,7 +354,6 @@ }); }, editEndpoint(endpoint) { - console.log(endpoint); this.endpoint = JSON.parse(JSON.stringify(endpoint)); this.$set(this.endpoint,'projectId',this.endpoint.project.id); this.$set(this.endpoint,'moduleId',this.endpoint.moduleId); diff --git a/nezha-fronted/src/components/common/exportXLSX.vue b/nezha-fronted/src/components/common/exportXLSX.vue index 8ec75536e..5c907950f 100644 --- a/nezha-fronted/src/components/common/exportXLSX.vue +++ b/nezha-fronted/src/components/common/exportXLSX.vue @@ -252,7 +252,6 @@ params.type=this.paramsType; } axios.get(url,{responseType:'blob',params:params}).then(res=>{ - console.log(res) if(window.navigator.msSaveOrOpenBlob){ // 兼容ie11 let blobObject = new Blob([res.data]); diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue index 6961e4c93..0fbddf34d 100644 --- a/nezha-fronted/src/components/common/project/topology.vue +++ b/nezha-fronted/src/components/common/project/topology.vue @@ -31,19 +31,21 @@ id="network-pop" class="network-pop" :style="{transform:'scale('+zoom+')',width:'0',height:'0'}" - v-show="networkPopShow" ref="network-pop" > - - - - +
+ + + + + + +
@@ -65,7 +67,7 @@
- { + this.networkPop.style.top = position.y - 85 + 85*(1-this.zoom)+'px'; + this.networkPop.style.left = position.x - 32*this.zoom - 4.8*(1-this.zoom) +'px'; + },150) + if(this.NodeArr.length===0&&!this.editVisNetwork){ + setTimeout(()=>{ + this.networkPopShow=true; + },100) } this.NodeArr=[...this.NodeArr] }, @@ -700,6 +707,7 @@ this.expressionsInfoPosition={...position}; }, modelTopClick(item,index){ + console.log(index); this.activeIndex=index; this.activeModelItem=item; this.index=index; @@ -900,6 +908,11 @@ this_.selNodeId=selId; this_.cursorMove=true; this_.nodeData=this_.nodesArray.find((item)=>item.id===selId); + let index=this_.modelTop.findIndex((item)=>item.id===selId); + console.log(index); + this_.activeIndex=index; + this_.activeModelItem=this_.modelTop.find((item)=>item.id===selId); + this_.index=index; if(this_.NodeArr.indexOf(selId)!==-1){ let index = this_.NodeArr.indexOf(selId); this_.NodeArr=this_.NodeArr.filter((item,i)=> i !== index); @@ -960,6 +973,7 @@ this_.networkPopShow=false; this_.index=''; this_.activeIndex=''; + console.log(123123); let selId=params.nodes[0]; if(selId){ this_.selNodeId=selId @@ -1017,9 +1031,7 @@ this_.zoom=params.scale; this_.modelTopUpdate(); this_.selNodeArrUpdate(); - if(this_.networkPopShow){ - this_.setPopPosition(this_.selNodeId); - } + this_.networkPopShow=false; this_.topologyZoom(params.scale); return false }); @@ -1029,9 +1041,7 @@ this_.zoom=this_.network.canvasToDOM({x:0,y:1}).y-this_.network.canvasToDOM({x:0,y:0}).y; this_.modelTopUpdate(); this_.selNodeArrUpdate(); - if(this_.networkPopShow){ - this_.setPopPosition(this_.selNodeId); - } + this_.networkPopShow=false; }); return false }); @@ -1113,7 +1123,7 @@ color: #EC7F66; } .network-pop .selpop.nz-icon-hexagonBorder:hover{ - transform: scale(1.2); + transform: scale(1.1); color: #4BB49B; } .network-pop .selpop:hover .nz-icon-liubianxing{ @@ -1124,11 +1134,11 @@ color: #D7FAF1; } .network-pop .selpop:hover .noMove{ - transform: scale(1.2); + transform: scale(1.1); color: #4BB49B; } .network-pop .selpop.nz-icon-hexagonBorder.error-model-stat:hover{ - transform: scale(1.2); + transform: scale(1.1); color: #EC7F66; } .network-pop .selpop.error-model-stat:hover .nz-icon-liubianxing{ @@ -1139,7 +1149,7 @@ color: #FBE7E3; } .network-pop .selpop.error-model-stat:hover .noMove{ - transform: scale(1.2); + transform: scale(1.1); color: #EC7F66; } /*.network-pop .nz-icon-hexagonBorder.error-model-stat:hover{*/ @@ -1365,4 +1375,17 @@ #network_id /deep/ .vis-network{ outline: none; } + .scaleTool-enter-active { + animation: scaleTool-in .15s; + } + .scaleTool-leave-active { + animation: scaleTool-in .15s reverse; + } + @keyframes scaleTool-in { + from{ + top:18px; + left: 10px; + transform: scale(0.5); + } + } diff --git a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue index 08e6c7759..0323b846d 100644 --- a/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue +++ b/nezha-fronted/src/components/common/rightBox/trafficSetting/trafficSettingTab.vue @@ -409,7 +409,6 @@ this.$get('/asset',param).then(response=>{ if(response.code == 200){ let data=response.data.list; - console.log(data) let result=data.map(item=>{ return {label:item.host,value:item.host} }) @@ -424,7 +423,6 @@ }, popHide() { - console.log(this.assetSetting) this.queryInterfaceInfos(true); }, showInput:function(){ diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue index 47babdeca..f1714c757 100644 --- a/nezha-fronted/src/components/page/config/mibBrowser.vue +++ b/nezha-fronted/src/components/page/config/mibBrowser.vue @@ -433,7 +433,6 @@ wrapper.scrollTop = wrapper._ps_.contentHeight; } this.resultData = this.resultData.concat(response.data.list); - console.log(this.resultData); if (this.searchParam.operation == 'set') { this.$message({duration: 2000, type: 'success', message: this.$t("tip.success")}); }