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 {
}
}
-
-
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 {
}
}
-
-
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 {
}
}
-
-
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 {
}
}
-
-
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 {
}
}
-
-