From 6b357a4baab4e4d32502cace9b17d64b542d7a7d Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Wed, 3 Aug 2022 16:24:00 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-2097=20fix=EF=BC=9A=E7=82=B9=E5=87=BB?=
 =?UTF-8?q?=E7=AD=9B=E9=80=89=E8=8F=9C=E5=8D=95=E9=A1=B5=E9=9D=A2=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E5=9B=9E=E8=B7=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/src/components/page/alert/alertMessage.vue      | 3 +++
 nezha-fronted/src/components/page/asset/asset.vue             | 3 +++
 .../src/components/page/monitor/endpoint/endpointList.vue     | 3 +++
 nezha-fronted/src/http.js                                     | 4 +++-
 nezha-fronted/src/permission.js                               | 2 +-
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue
index 2d6fe88c8..2984b84d6 100644
--- a/nezha-fronted/src/components/page/alert/alertMessage.vue
+++ b/nezha-fronted/src/components/page/alert/alertMessage.vue
@@ -1224,6 +1224,9 @@ export default {
       this.graphShow = show
     }
   },
+  beforeDestroy () {
+    clearTimeout(this.timer)
+  },
   destroyed () {
     localStorage.removeItem('alertMessageProjectId')
   }
diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue
index daf80e67d..c13866a7a 100644
--- a/nezha-fronted/src/components/page/asset/asset.vue
+++ b/nezha-fronted/src/components/page/asset/asset.vue
@@ -910,6 +910,9 @@ export default {
     this.getSnmpCredentialData()
     this.getFieldGroupData()
   },
+  beforeDestroy () {
+    clearTimeout(this.timer)
+  },
   watch: {
     $route: {
       immediate: true,
diff --git a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
index 6abbe67fe..39d78a636 100644
--- a/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
+++ b/nezha-fronted/src/components/page/monitor/endpoint/endpointList.vue
@@ -930,6 +930,9 @@ export default {
       }
     }
   },
+  beforeDestroy () {
+    clearTimeout(this.timer)
+  },
   destroyed () {
     localStorage.removeItem('endpointProjectId')
   }
diff --git a/nezha-fronted/src/http.js b/nezha-fronted/src/http.js
index 0ef26b6e5..080017e18 100644
--- a/nezha-fronted/src/http.js
+++ b/nezha-fronted/src/http.js
@@ -114,7 +114,9 @@ export function get (url, params, responseType) {
       if (err.response) {
         resolve(err.response.data)
       } else if (err.message) {
-        resolve(err.message)
+        if (err.message !== 'cancel') { // 判断是否是路由跳转取消的请求（是的话没必要提示message）
+          resolve(err.message)
+        }
       } else {
         resolve(err)
       }
diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js
index f5c807e7e..f0c9e3ee4 100644
--- a/nezha-fronted/src/permission.js
+++ b/nezha-fronted/src/permission.js
@@ -16,7 +16,7 @@ router.beforeEach((to, from, next) => {
     return
   }
   if (store.getters.getNowPath !== to.path && store.getters.getNowPath !== '/login') {
-    requestsArr.forEach(xhr => xhr.cancel())
+    requestsArr.forEach(xhr => xhr.cancel('cancel'))
   }
   store.commit('setNowPath', to.path)
   const configUrl = 'static/config.json?Timestamp=' + new Date().getTime()