diff --git a/src/components/Table/TableFormatters/DetailFormatter.vue b/src/components/Table/TableFormatters/DetailFormatter.vue index ba72c9d37..a33a38ef6 100644 --- a/src/components/Table/TableFormatters/DetailFormatter.vue +++ b/src/components/Table/TableFormatters/DetailFormatter.vue @@ -87,7 +87,9 @@ export default { console.error('No route found') return } + let detailRoute = { replace: true } + if (typeof route === 'string') { detailRoute.name = route detailRoute.params = { id: this.row.id } @@ -98,10 +100,6 @@ export default { const routeQuery = this.formatterArgs.routeQuery if (routeQuery && typeof routeQuery === 'object') { detailRoute.query = this.formatterArgs.routeQuery - - if (detailRoute.query.tab) { - detailRoute.name = detailRoute.query.tab - } } return detailRoute }, diff --git a/src/views/accounts/AccountGather/AccountGatherTaskList.vue b/src/views/accounts/AccountGather/AccountGatherTaskList.vue index 8549cf892..24939eec3 100644 --- a/src/views/accounts/AccountGather/AccountGatherTaskList.vue +++ b/src/views/accounts/AccountGather/AccountGatherTaskList.vue @@ -113,9 +113,9 @@ export default { } }, watch: { - $route(to, from) { - this.$router.go(0) - } + // $route(to, from) { + // this.$router.go(0) + // } } } diff --git a/src/views/accounts/AccountGather/TaskCreateUpdate.vue b/src/views/accounts/AccountGather/TaskCreateUpdate.vue index 15df56287..78d21e5d0 100644 --- a/src/views/accounts/AccountGather/TaskCreateUpdate.vue +++ b/src/views/accounts/AccountGather/TaskCreateUpdate.vue @@ -78,6 +78,3 @@ export default { } - - diff --git a/src/views/perms/const.js b/src/views/perms/const.js index 6d17c7456..7191670ed 100644 --- a/src/views/perms/const.js +++ b/src/views/perms/const.js @@ -35,6 +35,7 @@ export const AssetPermissionTableMeta = { name: { minWidth: '120px', formatterArgs: { + route: 'AssetPermissionDetail', routeQuery: { tab: 'AssetPermissionDetail' } diff --git a/src/views/users/User/UserDetail/index.vue b/src/views/users/User/UserDetail/index.vue index e6f0e96b7..56721aca0 100644 --- a/src/views/users/User/UserDetail/index.vue +++ b/src/views/users/User/UserDetail/index.vue @@ -7,24 +7,31 @@ - - diff --git a/src/views/users/User/UserList.vue b/src/views/users/User/UserList.vue index d197cdf42..9de41216c 100644 --- a/src/views/users/User/UserList.vue +++ b/src/views/users/User/UserList.vue @@ -59,6 +59,14 @@ export default { ] }, columnsMeta: { + name: { + formatterArgs: { + route: 'UserDetail', + routeQuery: { + tab: 'UserInfo' + } + } + }, mfa_level: { width: '75px' },