From 786ef245592ce319b14a60e7df50823633aa025b Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 9 Sep 2022 09:30:10 +0800 Subject: [PATCH] =?UTF-8?q?NEZ-2193=20fix=EF=BC=9Aasset=20=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E8=A7=86=E5=9B=BE=20=E9=A1=B5=E9=9D=A2=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/detailView/view/detailViewRight.vue | 10 ++++++---- .../src/components/common/mixin/routerPathParams.js | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue index 33e43ea6a..2ce99fca4 100644 --- a/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue +++ b/nezha-fronted/src/components/common/detailView/view/detailViewRight.vue @@ -103,7 +103,7 @@ export default { from: { immediate: true, handler (n) { - this.setTargetTab() + this.setTargetTab(true) } }, obj: { @@ -294,9 +294,11 @@ export default { getTableData () { this.$emit('getTableData') }, - setTargetTab () { - if (this.$route.query.targetTab) { - this.targetTab = this.$route.query.targetTab + setTargetTab (flag) { + if (this.$route.query.targetTab && flag) { + this.$nextTick(()=>{ + this.targetTab = this.$route.query.targetTab + }) return } if (this.from === fromRoute.asset) { diff --git a/nezha-fronted/src/components/common/mixin/routerPathParams.js b/nezha-fronted/src/components/common/mixin/routerPathParams.js index 02d900ed1..661e473ae 100644 --- a/nezha-fronted/src/components/common/mixin/routerPathParams.js +++ b/nezha-fronted/src/components/common/mixin/routerPathParams.js @@ -97,7 +97,7 @@ export default { name: this.detailViewRightObj.name, configs: this.detailViewRightObj.configs ? this.detailViewRightObj.configs.map(item => { return { type: item.type, enable: item.enable } }) : '', childrenNum: this.detailViewRightObj.childrenNum || '', - clientState: this.bottomBox.object.clientState || '' + clientState: this.detailViewRightObj.clientState || '' }) this.$router.replace({ path: path, query: params }).catch(err => {}) } else if (from === 'bottomBox' && this.targetTab) {