From bc366947f0d77285c177c75892132f3922a871f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9Chuailei000=E2=80=9D?= <2280131253@qq.com> Date: Thu, 15 Sep 2022 21:16:46 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AE=9E=E4=BE=8B=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=A4=9A=E9=80=89?= =?UTF-8?q?=E6=A1=86=EF=BC=9B=E8=AE=BE=E7=BD=AE=E4=BA=91=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E9=AB=98=E4=BA=AE=E6=98=BE=E7=A4=BA=EF=BC=9B=E4=BA=91=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E8=BF=9B=E5=85=A5=E8=AF=A6=E6=83=85=E4=B8=8D=E4=B8=BB?= =?UTF-8?q?=E5=8A=A8=E6=BF=80=E6=B4=BBdetail=E9=A1=B5=E5=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/console/xpack.js | 8 ++++++-- .../SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue | 1 + .../Cloud/SyncInstanceTask/SyncInstanceTaskList.vue | 5 +---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/router/console/xpack.js b/src/router/console/xpack.js index 0018a9bda..14fe9191d 100644 --- a/src/router/console/xpack.js +++ b/src/router/console/xpack.js @@ -1,6 +1,8 @@ import empty from '@/layout/empty' import i18n from '@/i18n/i18n' +const activateMenu = '/console/assets/assets' + export default [ { path: 'cloud', @@ -20,7 +22,7 @@ export default [ hidden: true, meta: { title: i18n.t('xpack.Cloud.CloudSync'), - activeMenu: '/console/assets/assets' + activeMenu: activateMenu } }, { @@ -71,6 +73,7 @@ export default [ hidden: true, meta: { title: i18n.t('xpack.Cloud.AccountDetail'), + activeMenu: activateMenu, permissions: ['xpack.view_account'] } } @@ -121,7 +124,8 @@ export default [ name: 'SyncInstanceTaskDetail', hidden: true, meta: { - title: i18n.t('xpack.Cloud.SyncInstanceTaskDetail') + title: i18n.t('xpack.Cloud.SyncInstanceTaskDetail'), + activeMenu: activateMenu } } ] diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue index 4d0f9407c..4a47bc984 100644 --- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue +++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskDetail/AssetList.vue @@ -38,6 +38,7 @@ export default { }, tableConfig: { url: `/api/v1/xpack/cloud/sync-instance-tasks/${this.object.id}/instances/`, + hasSelection: false, columns: [ 'instance_id', { diff --git a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue index 107377a20..9f0597653 100644 --- a/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue +++ b/src/views/assets/Cloud/SyncInstanceTask/SyncInstanceTaskList.vue @@ -58,10 +58,7 @@ export default { formatter: DetailFormatter, formatterArgs: { permissions: 'xpack.view_syncinstancedetail', - route: 'SyncInstanceTaskDetail', - routeQuery: { - activeTab: 'detail' - } + route: 'SyncInstanceTaskDetail' } }, history_count: {