From 0e0fa972d132197f6da4adc4979e6238dd160a33 Mon Sep 17 00:00:00 2001
From: Luo Fan <44999219+luofann@users.noreply.github.com>
Date: Thu, 5 Sep 2024 10:19:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=97=A0=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84=E9=97=AE=E9=A2=98=20--bug?=
 =?UTF-8?q?=3D128795439=20(#3490)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

# Reviewed, transaction id: 17298
---
 bcs-services/bcs-bscp/ui/src/components/head.vue  | 15 ++++++++-------
 .../ui/src/views/space/apply-perm-page.vue        |  3 +--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/bcs-services/bcs-bscp/ui/src/components/head.vue b/bcs-services/bcs-bscp/ui/src/components/head.vue
index e2114d78f1..e74a17cc81 100644
--- a/bcs-services/bcs-bscp/ui/src/components/head.vue
+++ b/bcs-services/bcs-bscp/ui/src/components/head.vue
@@ -16,17 +16,15 @@
                 v-for="secondNav in nav.children"
                 :key="secondNav.id"
                 :class="['secondNav-item', { actived: isSecondNavActived(secondNav.module) }]">
-                <router-link
-                  :to="{ name: secondNav.id, params: { spaceId: spaceId || 0 } }"
-                  @click="handleNavClick(secondNav.id)">
+                <a @click.stop="handleNavClick(secondNav.id)">
                   {{ secondNav.name }}
-                </router-link>
+                </a>
               </div>
             </div>
           </div>
-          <router-link v-else :to="{ name: nav.id, params: { spaceId: spaceId || 0 } }" @click="handleNavClick(nav.id)">
+          <a v-else @click.stop="handleNavClick(nav.id)">
             {{ nav.name }}
-          </router-link>
+          </a>
         </div>
       </div>
     </div>
@@ -224,13 +222,14 @@
         const detail = JSON.parse(lastAccessedServiceDetail);
         if (detail.spaceId === spaceId.value) {
           router.push({
-            name: navId === 'service-all' ? 'service-config' : (navId as RouteRecordName),
+            name: navId === 'service-all' && !showPermApplyPage.value ? 'service-config' : (navId as RouteRecordName),
             params: { spaceId: detail.spaceId, appId: detail.appId },
           });
           return;
         }
       }
     }
+    router.push({ name: navId, params: { spaceId: spaceId.value || 0 } });
   };
 
   const handleSpaceSearch = (searchStr: string) => {
@@ -417,6 +416,7 @@
           padding: 0 16px;
           font-size: 14px;
           color: #96a2b9;
+          cursor: pointer;
           a {
             color: #96a2b9;
           }
@@ -457,6 +457,7 @@
               padding: 0 16px;
               font-size: 14px;
               white-space: nowrap;
+              cursor: pointer;
               a {
                 color: #96a2b9;
               }
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/apply-perm-page.vue b/bcs-services/bcs-bscp/ui/src/views/space/apply-perm-page.vue
index 06142ca7ea..6f5b50ec99 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/apply-perm-page.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/apply-perm-page.vue
@@ -27,8 +27,7 @@
 
   const permTitle = computed(() => {
     if (applyPermResource.value.length > 0) {
-      // 暂时只展示最上层权限名称
-      const resource = applyPermResource.value[0];
+      const resource = applyPermResource.value[applyPermResource.value.length - 1];
       // 权限名称未做国际化，用action字段代替
       const permissionName = locale.value === 'en' ? ` ${resource.action} ` : resource.action_name;
       return `${t('无')}${permissionName}${t('权限')}`;