diff --git a/src/components/Table/TableFormatters/DetailFormatter.vue b/src/components/Table/TableFormatters/DetailFormatter.vue index cf1e80e06..6f8b3198c 100644 --- a/src/components/Table/TableFormatters/DetailFormatter.vue +++ b/src/components/Table/TableFormatters/DetailFormatter.vue @@ -99,7 +99,7 @@ export default { if (routeQuery && typeof routeQuery === 'object') { detailRoute.query = this.formatterArgs.routeQuery if (detailRoute.query.tab) { - detailRoute.query = detailRoute.query.tab + detailRoute.name = detailRoute.query.tab } } return detailRoute diff --git a/src/layout/components/GenericListTableDialog/index.vue b/src/layout/components/GenericListTableDialog/index.vue index 357394599..ac6aed59d 100644 --- a/src/layout/components/GenericListTableDialog/index.vue +++ b/src/layout/components/GenericListTableDialog/index.vue @@ -2,10 +2,10 @@ @@ -54,7 +54,3 @@ export default { } } - - diff --git a/src/views/assets/Asset/AssetDetail/PermUser.vue b/src/views/assets/Asset/AssetDetail/PermUser.vue index 6f08d4250..7720dbe8a 100644 --- a/src/views/assets/Asset/AssetDetail/PermUser.vue +++ b/src/views/assets/Asset/AssetDetail/PermUser.vue @@ -206,10 +206,13 @@ export default { } } } + }, + watch: { + $route: { + handler(newVal) { + newVal.fullPath.includes('/console/perms/asset-permissions/') && (this.GenericListTableDialogConfig.visible = false) + } + } } } - -