From 3cea2cf3d8648d5e7dd8da92ef135795bda9145e Mon Sep 17 00:00:00 2001
From: zhangyu <zhangyu@geedgenetworks.com>
Date: Fri, 20 Nov 2020 15:52:06 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=85=B3=E4=BA=8E=E5=9B=9E?=
 =?UTF-8?q?=E5=88=B0=E9=A1=B6=E9=83=A8=E7=9A=84=E4=BA=8B=E4=BB=B6=E8=A7=A3?=
 =?UTF-8?q?=E7=BB=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/cli/webSSH.vue   |  3 ++
 .../common/alert/alertMessageTable.vue        |  2 +-
 .../common/bottomBox/tabs/cabinetTab.vue      | 20 ++++++----
 .../common/project/popData/lineChart.vue      |  3 ++
 .../src/components/page/alert/config.vue      |  2 +-
 .../src/components/page/asset/WebSSH.vue      |  4 +-
 .../src/components/page/config/account.vue    | 37 ++++++++++++-------
 .../src/components/page/config/dc.vue         |  2 +-
 .../src/components/page/config/mib.vue        |  2 +-
 .../src/components/page/config/model.vue      |  2 +-
 .../components/page/config/operationlog.vue   |  8 ++++
 .../components/page/config/terminallog.vue    | 37 ++++++++++++-------
 .../src/components/page/dashboard/panel.vue   | 17 +++++----
 .../src/components/page/project/project.vue   |  2 +-
 14 files changed, 92 insertions(+), 49 deletions(-)

diff --git a/nezha-fronted/src/components/cli/webSSH.vue b/nezha-fronted/src/components/cli/webSSH.vue
index cee98056c..a92d9ca79 100644
--- a/nezha-fronted/src/components/cli/webSSH.vue
+++ b/nezha-fronted/src/components/cli/webSSH.vue
@@ -687,6 +687,9 @@
     mounted() {
 
     },
+    beforeDestroy(){
+      window.removeEventListener('resize',this.debounce(this.windowChange, 1000),false);
+    }
   }
 </script>
 <style scoped>
diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 400ced771..8c7d8bac0 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -924,7 +924,7 @@
     */
     },
     beforeDestroy(){
-      let el = this.$refs.promTable.$el.querySelector(".el-table__body-wrapper");
+      let el = this.$refs.alertListTable.$el.querySelector(".el-table__body-wrapper");
       if (el._ps_) {
         el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
         el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
index d4e6a7737..76ed6d9f5 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/cabinetTab.vue
@@ -250,6 +250,13 @@
           })
         })
       },
+      plpsscrolly(el,self){
+        if (el._ps_.scrollbarYTop > 50) {
+          self.showTopBtn = true;
+        } else {
+          self.showTopBtn = false;
+        }
+      },
     },
     watch: {
       obj: {
@@ -269,18 +276,15 @@
         //绑定滚动条事件，控制top按钮
         let el = this.$refs.cabTable.$el.querySelector(".el-table__body-wrapper");
         if (el._ps_) {
-          el.addEventListener("ps-scroll-y", () => {
-            if (el._ps_.scrollbarYTop > 50) {
-              this.showTopBtn = true;
-            } else {
-              this.showTopBtn = false;
-            }
-          });
+          el.addEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
         }
       });
     },
     beforeDestroy(){
-
+      let el = this.$refs.cabTable.$el.querySelector(".el-table__body-wrapper");
+      if (el._ps_) {
+        el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
+      }
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/common/project/popData/lineChart.vue b/nezha-fronted/src/components/common/project/popData/lineChart.vue
index 0148dfcd9..755ed0b7a 100644
--- a/nezha-fronted/src/components/common/project/popData/lineChart.vue
+++ b/nezha-fronted/src/components/common/project/popData/lineChart.vue
@@ -1586,6 +1586,9 @@
       if(!document.onmousemove){// 移除鼠标移动事件监听
         document.onmousemove=null;
       }
+      setChart(this.chartIndex, null);
+      window.removeEventListener('resize', this.chartResize);
+      this.$refs.legendArea._ps_.destroy();
     },
   };
 
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index 32617f860..7fc65a835 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -575,7 +575,7 @@
       });
     },
     beforeDestroy(){
-      let el = this.$refs.promTable.$el.querySelector(".el-table__body-wrapper");
+      let el = this.$refs.alertRuleTable.$el.querySelector(".el-table__body-wrapper");
       if (el._ps_) {
         el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
         el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
diff --git a/nezha-fronted/src/components/page/asset/WebSSH.vue b/nezha-fronted/src/components/page/asset/WebSSH.vue
index 88d0e6406..a19855024 100644
--- a/nezha-fronted/src/components/page/asset/WebSSH.vue
+++ b/nezha-fronted/src/components/page/asset/WebSSH.vue
@@ -202,7 +202,7 @@ export default {
     }
   },
   created() {
-    window.addEventListener('beforeunload', e => this.beforeunloadFn(e))
+    window.addEventListener('beforeunload', this.beforeunloadFn.bind(e))
   },
   mounted() {
     this.getAssetData()
@@ -234,7 +234,7 @@ export default {
     // };
   },
   beforeDestroy(){
-
+    window.removeEventListener('beforeunload',this.beforeunloadFn)
   }
 }
 </script>
diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index 2efe9ad8b..7177479d8 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -342,6 +342,19 @@
         this.$set(this.searchLabel, "orderBy", orderBy);
         this.getTableData();
       },
+      plpsscrolly(el,self){
+        if (el._ps_.scrollbarYTop > 50) {
+          self.tools.showTopBtn = true;
+        } else {
+          self.tools.showTopBtn = false;
+        }
+      },
+      plmouseenter(el,self){
+        self.tools.tableHover = true;
+      },
+      plmouseleave(el,self){
+        self.tools.tableHover = false;
+      }
     },
     computed: {
       isCurrentUser() {
@@ -379,21 +392,19 @@
         //绑定滚动条事件，控制top按钮
         let el = this.$refs.accountTable.$el.querySelector(".el-table__body-wrapper");
         if (el._ps_) {
-          el.addEventListener("ps-scroll-y", () => {
-            if (el._ps_.scrollbarYTop > 50) {
-              this.tools.showTopBtn = true;
-            } else {
-              this.tools.showTopBtn = false;
-            }
-          });
-          el.addEventListener("mouseenter", () => {
-            this.tools.tableHover = true;
-          });
-          el.addEventListener("mouseleave", () => {
-            this.tools.tableHover = false;
-          });
+          el.addEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
+          el.addEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
+          el.addEventListener("mouseleave", this.plmouseleave.bind('',el,this));
         }
       });
+    },
+    beforeDestroy(){
+      let el = this.$refs.accountTable.$el.querySelector(".el-table__body-wrapper");
+      if (el._ps_) {
+        el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
+        el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
+        el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this));
+      }
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 1ba3480a4..8e5379294 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -537,7 +537,7 @@
       });
     },
     beforeDestroy(){
-      let el = this.$refs.promTable.$el.querySelector(".el-table__body-wrapper");
+      let el = this.$refs.dcTable.$el.querySelector(".el-table__body-wrapper");
       if (el._ps_) {
         el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
         el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index d92b3f515..c41f48a0e 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -371,7 +371,7 @@
       });
     },
     beforeDestroy(){
-      let el = this.$refs.promTable.$el.querySelector(".el-table__body-wrapper");
+      let el = this.$refs.mibTable.$el.querySelector(".el-table__body-wrapper");
       if (el._ps_) {
         el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
         el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index b2b5d8601..ff9ded959 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -376,7 +376,7 @@
       },
     },
     beforeDestroy(){
-      let el = this.$refs.promTable.$el.querySelector(".el-table__body-wrapper");
+      let el = this.$refs.modelTable.$el.querySelector(".el-table__body-wrapper");
       if (el._ps_) {
         el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
         el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue
index 26d2f1399..cca57b65d 100644
--- a/nezha-fronted/src/components/page/config/operationlog.vue
+++ b/nezha-fronted/src/components/page/config/operationlog.vue
@@ -305,6 +305,14 @@
           });
         }
       });
+    },
+    beforeDestroy(){
+      let el = this.$refs.operationLogTable.$el.querySelector(".el-table__body-wrapper");
+      if (el._ps_) {
+        el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
+        el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
+        el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this));
+      }
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue
index a0896bba0..52b9b3a76 100644
--- a/nezha-fronted/src/components/page/config/terminallog.vue
+++ b/nezha-fronted/src/components/page/config/terminallog.vue
@@ -283,6 +283,19 @@
         this.$set(this.searchLabel, "orderBy", orderBy);
         this.getTableData();
       },
+      plpsscrolly(el,self){
+        if (el._ps_.scrollbarYTop > 50) {
+          self.tools.showTopBtn = true;
+        } else {
+          self.tools.showTopBtn = false;
+        }
+      },
+      plmouseenter(el,self){
+        self.tools.tableHover = true;
+      },
+      plmouseleave(el,self){
+        self.tools.tableHover = false;
+      }
     },
     watch:{
     },
@@ -303,21 +316,19 @@
         //绑定滚动条事件，控制top按钮
         let el = this.$refs.terminalLogTable.$el.querySelector(".el-table__body-wrapper");
         if (el._ps_) {
-          el.addEventListener("ps-scroll-y", () => {
-            if (el._ps_.scrollbarYTop > 50) {
-              this.tools.showTopBtn = true;
-            } else {
-              this.tools.showTopBtn = false;
-            }
-          });
-          el.addEventListener("mouseenter", () => {
-            this.tools.tableHover = true;
-          });
-          el.addEventListener("mouseleave", () => {
-            this.tools.tableHover = false;
-          });
+          el.addEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
+          el.addEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
+          el.addEventListener("mouseleave", this.plmouseleave.bind('',el,this));
         }
       });
+    },
+    beforeDestroy(){
+      let el = this.$refs.terminalLogTable.$el.querySelector(".el-table__body-wrapper");
+      if (el._ps_) {
+        el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
+        el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));
+        el.removeEventListener("mouseleave", this.plmouseleave.bind('',el,this));
+      }
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 18932b3b0..bc64796c4 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -720,19 +720,22 @@
         this.$nextTick(()=>{
           document.querySelector(".panel-dropdown-title-space")._ps_.update()
         })
-      }
+      },
+      tableListEnter(self){
+        self.tableHover = true;
+      },
+      tableListLeave(self){
+        self.tableHover = false;
+      },
+
     },
     created() {
       this.getTableData();
     },
     mounted() {
       this.onScroll();
-      document.querySelector("#tableList").addEventListener("mouseenter", () => {
-        this.tableHover = true;
-      });
-      document.querySelector("#tableList").addEventListener("mouseleave", () => {
-        this.tableHover = false;
-      });
+      document.querySelector("#tableList").addEventListener("mouseenter", this.tableListEnter.bind('',this));
+      document.querySelector("#tableList").addEventListener("mouseleave", this.tableListLeave.bind('',this));
     },
     watch: {
       'filter.searchName': function(n,o){
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index e91fb83a7..4137fbdc8 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -865,7 +865,7 @@
       bus.$off('alert-message-change')
     },
     beforeDestroy(){
-      let el = this.$refs.promTable.$el.querySelector(".el-table__body-wrapper");
+      let el = this.$refs.endpointTable.$el.querySelector(".el-table__body-wrapper");
       if (el._ps_) {
         el.removeEventListener("ps-scroll-y", this.plpsscrolly.bind('',el,this));
         el.removeEventListener("mouseenter",  this.plmouseenter.bind('',el,this));