From 4f215cbc4958a094c9ba85ec2671b10e568f01fa Mon Sep 17 00:00:00 2001
From: zhaojisen <1301338853@qq.com>
Date: Tue, 21 May 2024 14:22:05 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8D=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E4=B8=8D=E5=90=8C=20tab=20=E6=A0=87=E7=AD=BE=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2=E5=90=8E=20tab=20=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E4=B8=A2=E5=A4=B1=E6=88=96=E5=8F=98=E4=B8=BA=E5=90=8C?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=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/layout/components/TabPage/index.vue    | 18 ++++++++++--------
 src/views/accounts/Account/index.vue       |  3 ---
 src/views/accounts/AccountPush/index.vue   |  3 ---
 src/views/assets/Asset/AssetList/index.vue |  4 ----
 src/views/assets/Platform/PlatformList.vue |  4 ----
 src/views/users/Role/RoleList/index.vue    |  7 +++----
 6 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/src/layout/components/TabPage/index.vue b/src/layout/components/TabPage/index.vue
index f96003eaa..4854809f2 100644
--- a/src/layout/components/TabPage/index.vue
+++ b/src/layout/components/TabPage/index.vue
@@ -56,8 +56,6 @@
 import Page from '../Page/'
 import { toSentenceCase } from '@/utils/common'
 
-const ACTIVE_TAB_KEY = 'tab'
-
 export default {
   name: 'TabPage',
   components: {
@@ -125,18 +123,22 @@ export default {
       }
     }
   },
-  created() {
+  activated() {
+    this.iActiveMenu = this.getPropActiveTab()
+  },
+  mounted() {
     this.iActiveMenu = this.getPropActiveTab()
   },
   methods: {
     handleTabClick(tab) {
       this.$emit('tab-click', tab)
       this.$emit('update:activeMenu', tab.name)
-      this.$cookie.set(ACTIVE_TAB_KEY, tab.name, 1)
 
-      if (this.$router.currentRoute.query[ACTIVE_TAB_KEY]) {
+      this.$cookie.set(this.$route.path, tab.name, 1)
+
+      if (this.$router.currentRoute.query[this.$route.path]) {
         this.$router.push({
-          query: { ...this.$route.query, [ACTIVE_TAB_KEY]: '' }
+          query: { ...this.$route.query, [this.$route.path]: '' }
         })
       }
     },
@@ -144,8 +146,8 @@ export default {
       let activeTab = ''
 
       const preActiveTabs = [
-        this.$route.query[ACTIVE_TAB_KEY],
-        this.$cookie.get(ACTIVE_TAB_KEY),
+        this.$route.query[this.$route.path],
+        this.$cookie.get(this.$route.path),
         this.activeMenu
       ]
 
diff --git a/src/views/accounts/Account/index.vue b/src/views/accounts/Account/index.vue
index 948b24f57..f6d385f2d 100644
--- a/src/views/accounts/Account/index.vue
+++ b/src/views/accounts/Account/index.vue
@@ -32,6 +32,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>
diff --git a/src/views/accounts/AccountPush/index.vue b/src/views/accounts/AccountPush/index.vue
index 1c0f76b35..e5a64bdd3 100644
--- a/src/views/accounts/AccountPush/index.vue
+++ b/src/views/accounts/AccountPush/index.vue
@@ -33,6 +33,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-</style>
diff --git a/src/views/assets/Asset/AssetList/index.vue b/src/views/assets/Asset/AssetList/index.vue
index a95a8f772..45c217c47 100644
--- a/src/views/assets/Asset/AssetList/index.vue
+++ b/src/views/assets/Asset/AssetList/index.vue
@@ -101,7 +101,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>
diff --git a/src/views/assets/Platform/PlatformList.vue b/src/views/assets/Platform/PlatformList.vue
index 81b4e5955..253e2af12 100644
--- a/src/views/assets/Platform/PlatformList.vue
+++ b/src/views/assets/Platform/PlatformList.vue
@@ -165,7 +165,3 @@ export default {
   }
 }
 </script>
-
-<style lang="scss" scoped>
-
-</style>
diff --git a/src/views/users/Role/RoleList/index.vue b/src/views/users/Role/RoleList/index.vue
index 607a549d5..482cdef9f 100644
--- a/src/views/users/Role/RoleList/index.vue
+++ b/src/views/users/Role/RoleList/index.vue
@@ -44,6 +44,9 @@ export default {
       return this.$t('RoleList')
     }
   },
+  activated() {
+    this.switchGlobalOrg(this.config.activeMenu === 'OrgRoleList')
+  },
   mounted() {
     this.switchGlobalOrg(this.config.activeMenu === 'OrgRoleList')
   },
@@ -63,7 +66,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-
-</style>