diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
index 31cba4354..b78b402a1 100644
--- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue
+++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue
@@ -903,7 +903,9 @@
     },
     beforeDestroy(){
      if(this.scrollbarWrap){
-       this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+       if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
      }
     }
   }
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
index 1304e198a..1f1b69e1b 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/panelTab.vue
@@ -488,7 +488,9 @@
     beforeDestroy(){
       document.querySelector("#tableList").removeEventListener("mouseenter", this.tableListEnter);
       document.querySelector("#tableList").removeEventListener("mouseleave", this.tableListLeave);
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/common/header.vue b/nezha-fronted/src/components/common/header.vue
index ccfa1be89..db1a20340 100644
--- a/nezha-fronted/src/components/common/header.vue
+++ b/nezha-fronted/src/components/common/header.vue
@@ -611,7 +611,7 @@
   }
   .header .el-menu--horizontal>.icon-menu-item .el-submenu__title {
     min-width: 50px !important;
-    line-height: 46px;
+    line-height: 50px;
     /*margin-right:20px;*/
   }
   .header .vertical-line{
diff --git a/nezha-fronted/src/components/common/leftMenu.vue b/nezha-fronted/src/components/common/leftMenu.vue
index 390281ec2..68f18efb2 100644
--- a/nezha-fronted/src/components/common/leftMenu.vue
+++ b/nezha-fronted/src/components/common/leftMenu.vue
@@ -218,6 +218,7 @@
               if (this.currentProject && this.currentProject.id && this.showProjectPanel) {
                 this.detailProject(this.currentProject);
               }
+              this.changeCurrentModule('');
             }
           },
         },
@@ -258,6 +259,9 @@
         getParentMenu(route) {
           let parentMenu = "";
           let end = false;
+          if (route != '/project'){
+            this.changeCurrentModule('');
+          }
           if (route != '/project' && route != '/asset') {
             this.$store.getters.menuList.forEach(menu => {
               if (!end) {
diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue
index 77391157b..2172c78e7 100644
--- a/nezha-fronted/src/components/page/alert/config.vue
+++ b/nezha-fronted/src/components/page/alert/config.vue
@@ -524,7 +524,9 @@
       bus.$off("alert-rule-list-change");
       bus.$off("dc-list-change");
       bus.$off('alert-message-change');
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
     created(){
       //是否存在分页缓存
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index ffa9523a6..04813944d 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -851,7 +851,9 @@
     beforeDestroy() {
       bus.$off("asset-filter-change");
       bus.$off('alert-message-change');
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue
index 7b7a6ebd1..9fff39d79 100644
--- a/nezha-fronted/src/components/page/config/account.vue
+++ b/nezha-fronted/src/components/page/config/account.vue
@@ -436,7 +436,9 @@
       }
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
     computed: {
       isCurrentUser() {
diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue
index 2c2a91e86..50d65c3ed 100644
--- a/nezha-fronted/src/components/page/config/dc.vue
+++ b/nezha-fronted/src/components/page/config/dc.vue
@@ -531,7 +531,9 @@
     },
     beforeDestroy(){
       bus.$off("dc-list-change");
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
     created(){
       //是否存在分页缓存
diff --git a/nezha-fronted/src/components/page/config/menus.vue b/nezha-fronted/src/components/page/config/menus.vue
index c6d4a0068..6f617a517 100644
--- a/nezha-fronted/src/components/page/config/menus.vue
+++ b/nezha-fronted/src/components/page/config/menus.vue
@@ -342,7 +342,9 @@
       this.getTableData();
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue
index 449a7b20a..c5ded4cfd 100644
--- a/nezha-fronted/src/components/page/config/mib.vue
+++ b/nezha-fronted/src/components/page/config/mib.vue
@@ -380,7 +380,9 @@
       this.getTableData();
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue
index 35ecd98a9..9998e950b 100644
--- a/nezha-fronted/src/components/page/config/model.vue
+++ b/nezha-fronted/src/components/page/config/model.vue
@@ -383,7 +383,9 @@
       }
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue
index 8340b857d..25ee3db77 100644
--- a/nezha-fronted/src/components/page/config/operationlog.vue
+++ b/nezha-fronted/src/components/page/config/operationlog.vue
@@ -281,7 +281,9 @@
       },
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
     computed: {
       isCurrentUser() {
diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue
index cd71a4e0e..b6f484524 100644
--- a/nezha-fronted/src/components/page/config/promServer.vue
+++ b/nezha-fronted/src/components/page/config/promServer.vue
@@ -434,7 +434,9 @@
       }
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
 
     watch: {
diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue
index 1035ef240..df406aad4 100644
--- a/nezha-fronted/src/components/page/config/roles.vue
+++ b/nezha-fronted/src/components/page/config/roles.vue
@@ -319,7 +319,9 @@
       }
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
     mounted() {
       //初始化表头
diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue
index ba4003415..227e55b24 100644
--- a/nezha-fronted/src/components/page/config/terminallog.vue
+++ b/nezha-fronted/src/components/page/config/terminallog.vue
@@ -289,7 +289,9 @@
       },
     },
     beforeDestroy() {
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
     created(){
       //是否存在分页缓存
diff --git a/nezha-fronted/src/components/page/dashboard/panel.vue b/nezha-fronted/src/components/page/dashboard/panel.vue
index 17e319f37..6e9ccea86 100644
--- a/nezha-fronted/src/components/page/dashboard/panel.vue
+++ b/nezha-fronted/src/components/page/dashboard/panel.vue
@@ -770,7 +770,9 @@
         document.querySelector("#tableList").removeEventListener("mouseenter", this.tableListEnter);
         document.querySelector("#tableList").removeEventListener("mouseleave", this.tableListLeave);
       }
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     }
   }
 </script>
diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue
index 1f0f182c3..d3648303d 100644
--- a/nezha-fronted/src/components/page/project/project.vue
+++ b/nezha-fronted/src/components/page/project/project.vue
@@ -226,6 +226,11 @@
       facade,
       'delete-button':deleteButton,
     },
+    computed:{
+      currentProjectChange() {
+        return this.$store.state.currentProject;
+      }
+    },
     data(){
       return {
         rightBox:{
@@ -844,13 +849,21 @@
           if (n.length === 0 && this.endpointPageObj.pageNo > 1) {
             this.endpointPageNo(this.endpointPageObj.pageNo-1);
           }
-          if(!this.delFlag){ // 不是删除时回到顶部 以及修改时
+          if(!this.delFlag&&this.pageType==='endpoint'){ // 不是删除时回到顶部 以及修改时
             this.$refs.endpointTable.bodyWrapper.scrollTop = 0
           }else{
             this.delFlag=false;
           }
         }
-      }
+      },
+      currentProject: {
+        handler(n, o) {
+          console.log(n);
+          if (n && o.id != this.currentProject.id) {
+            this.pageType='project';
+          }
+        },
+      },
     },
     beforeDestroy() {
       bus.$off("project-page-type");
@@ -860,7 +873,9 @@
       bus.$off("module-list-change");
       bus.$off("endpoint-list-change");
       bus.$off('alert-message-change');
-      this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      if(this.scrollbarWrap){
+        this.scrollbarWrap.removeEventListener('scroll', bus.debounce);
+      };
     },
   }
 </script>