From 23a40f8e0c207c30a43c5e160369438beb227ff9 Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Mon, 21 Dec 2020 10:06:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E8=A7=A3=E5=86=B3=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/project/overViewTopology.vue       | 20 ++++++++++---------
 .../src/components/page/dashboard/panel.vue   |  6 ++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/nezha-fronted/src/components/common/project/overViewTopology.vue b/nezha-fronted/src/components/common/project/overViewTopology.vue
index 16d3e97f2..678cd6618 100644
--- a/nezha-fronted/src/components/common/project/overViewTopology.vue
+++ b/nezha-fronted/src/components/common/project/overViewTopology.vue
@@ -702,15 +702,17 @@
           setTimeout(()=>{
             this_.setData();
             setTimeout(()=>{
-              this_.zoom=this_.network.view.targetScale;
-              this_.network.moveTo({
-                // position: this_.viewsCenter,
-                scale: this_.zoom-0.1,
-                offset: {x:0, y:0},
-              });
-              this_.modelTopUpdate();
-              this_.selNodeArrUpdate();
-              this_.networkPopShow=false;
+              if(this_.network){
+                this_.zoom=this_.network.view.targetScale;
+                this_.network.moveTo({
+                  // position: this_.viewsCenter,
+                  scale: this_.zoom-0.1,
+                  offset: {x:0, y:0},
+                });
+                this_.modelTopUpdate();
+                this_.selNodeArrUpdate();
+                this_.networkPopShow=false;
+              }
             },100)
           });
           return false
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 6fa546a1e..ed3df073b 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -732,8 +732,10 @@
       },
     },
     beforeDestroy(){
-      document.querySelector("#tableList").removeEventListener("mouseenter", this.tableListEnter);
-      document.querySelector("#tableList").removeEventListener("mouseleave", this.tableListLeave);
+      if(document.querySelector("#tableList")){
+        document.querySelector("#tableList").removeEventListener("mouseenter", this.tableListEnter);
+        document.querySelector("#tableList").removeEventListener("mouseleave", this.tableListLeave);
+      }
       this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
     }
   }