From 5bca796040e4ba2b82bec91cce17653ab8012c82 Mon Sep 17 00:00:00 2001
From: zhangyu <m13716206235@163.com>
Date: Thu, 20 Aug 2020 09:40:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=20=E5=A4=84=E7=90=86=E7=9B=B4?=
 =?UTF-8?q?=E6=8E=A5=E8=BF=9B=E5=85=A5project=E4=B8=8D=E8=B5=B0watch?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/project/projectFacade.vue  | 12 +++++++++---
 .../src/components/common/project/topology.vue       | 11 +++++++++++
 .../src/components/common/project/visNetwork.vue     |  1 +
 .../src/components/page/project/project.vue          |  2 +-
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/projectFacade.vue b/nezha-fronted/src/components/common/project/projectFacade.vue
index 9f1d30c25..bc28b0620 100644
--- a/nezha-fronted/src/components/common/project/projectFacade.vue
+++ b/nezha-fronted/src/components/common/project/projectFacade.vue
@@ -178,7 +178,9 @@
       }
     },
     mounted(){
-		  console.log(this.obj);
+		  if(this.obj.id){
+        this.getProjectData(this.obj);
+      }
     },
     methods:{
 		  getProjectData(n){
@@ -187,14 +189,18 @@
         this.$get('project/info', {id:n.id}).then(response => {
           if (response.code === 200) {
             this.projectInfo={...this.projectInfo,...response.data.basic,moduleMum:response.data.module.length}
-            this.projectInfo.loading=false;
+           this.$nextTick(()=>{
+             this.projectInfo.loading=false;
+           })
           }
         });
 
         //获取所有asset
         this.alertData.loading=true;
         setTimeout(()=>{
-          this.alertData.loading=false;
+          this.$nextTick(()=>{
+            this.alertData.loading=false;
+          })
         },300)
       },
       focusInput() {
diff --git a/nezha-fronted/src/components/common/project/topology.vue b/nezha-fronted/src/components/common/project/topology.vue
index 034459e55..1ab1a544c 100644
--- a/nezha-fronted/src/components/common/project/topology.vue
+++ b/nezha-fronted/src/components/common/project/topology.vue
@@ -524,6 +524,17 @@
            }
            return false
          });
+         this.network.on("resize", function (params) {//检测resize
+           console.log(1111);
+           setTimeout(()=>{
+             this_.modelTopUpdate();
+             this_.selNodeArrUpdate();
+             if(this_.networkPopShow){
+               this_.setPopPosition(this_.selNodeId);
+             }
+           })
+           return false
+         });
        })
     }
 	}
diff --git a/nezha-fronted/src/components/common/project/visNetwork.vue b/nezha-fronted/src/components/common/project/visNetwork.vue
index 0e91ca8db..48a7ec348 100644
--- a/nezha-fronted/src/components/common/project/visNetwork.vue
+++ b/nezha-fronted/src/components/common/project/visNetwork.vue
@@ -96,6 +96,7 @@
           {id: 5,from: 1, to: 7, dashes:[15,15],label:"hahah",arrows:'from;to',smooth:true, color: {color:'#1e90ff',highlight:'#1e90ff',hover:'#1e90ff',opacity:1.0}},
         ],
         dragTitleShow:false,
+        dropdownMenuShow:false,
       }
 
     },
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 566957ac5..64cf6ac17 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -606,7 +606,7 @@
       //resize时刷新左侧列表滚动条
       let vm = this;
       window.onresize = function() {
-        vm.$refs.leftScrollbar.update();
+        // vm.$refs.leftScrollbar.update();
       };
     },
     computed: {