From aaf85ccf22bd022d0aac4fb5d6851825300ca964 Mon Sep 17 00:00:00 2001
From: Asoka <iiloli@88.com>
Date: Thu, 5 Jun 2025 09:58:45 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=B7=AF=E7=94=B1=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/navBars/topBar/index.vue           |  6 +++--
 src/layout/navBars/topBar/module-switch.vue   | 26 +++++++++++++------
 src/router/index.ts                           |  3 +--
 src/views/admin/login/component/account.vue   |  2 +-
 src/views/admin/login/component/email.vue     |  2 +-
 src/views/example/login/component/account.vue |  2 +-
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/layout/navBars/topBar/index.vue b/src/layout/navBars/topBar/index.vue
index 433441d..7ae0130 100644
--- a/src/layout/navBars/topBar/index.vue
+++ b/src/layout/navBars/topBar/index.vue
@@ -4,8 +4,10 @@
       <Logo v-if="setIsShowLogo" />
       <Breadcrumb />
     </div>
+
+    <Horizontal :menuList="state.menuList" />
     <div class="right-section">
-      <ModuleSwitch :menuList="state.menuList" />
+      <!-- <module-switch :menuList="state.menuList" /> -->
       <User />
     </div>
   </div>
@@ -21,7 +23,6 @@ import mittBus from '/@/utils/mitt'
 import ModuleSwitch from './module-switch.vue'
 
 // 引入组件
-const Breadcrumb = defineAsyncComponent(() => import('/@/layout/navBars/topBar/breadcrumb.vue'))
 const User = defineAsyncComponent(() => import('/@/layout/navBars/topBar/user.vue'))
 const Logo = defineAsyncComponent(() => import('/@/layout/logo/index.vue'))
 const Horizontal = defineAsyncComponent(() => import('/@/layout/navMenu/horizontal.vue'))
@@ -138,6 +139,7 @@ onBeforeMount(() => {
     mittBus.emit('setSendClassicChildren', route.path)
   }
 })
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/layout/navBars/topBar/module-switch.vue b/src/layout/navBars/topBar/module-switch.vue
index a173ece..79df44c 100644
--- a/src/layout/navBars/topBar/module-switch.vue
+++ b/src/layout/navBars/topBar/module-switch.vue
@@ -2,7 +2,7 @@
   <el-dropdown :show-timeout="70" :hide-timeout="50" trigger="click" @command="onMenuChange">
     <div class="layout-navbars-breadcrumb-user-icon">
       <i class="iconfont icon-diqiu" :title="$t('message.user.title1')"></i>
-      <span class="current-lang">{{ currentModuleName }}</span>
+      <span class="current-lang">{{ state.currentModuleName }}</span>
     </div>
     <template #dropdown>
       <el-dropdown-menu>
@@ -27,7 +27,6 @@ import { treeToList, listToTree, filterList } from '/@/utils/tree'
 import { cloneDeep } from 'lodash-es'
 import { useI18n } from 'vue-i18n'
 const { t } = useI18n()
-
 const router = useRouter()
 
 // 引入组件
@@ -58,10 +57,6 @@ const menuLists = computed(() => {
   return <RouteItems>props.menuList
 })
 
-const onMenuChange = (path: string) => {
-  console.log('path', path)
-}
-
 // 路由过滤递归函数
 const filterRoutesFun = <T extends RouteItem>(arr: T[]): T[] => {
   return arr
@@ -108,13 +103,11 @@ const setSendClassicChildren = (path: string) => {
 }
 // 设置页面当前路由高亮
 const setCurrentRouterHighlight = (currentRoute: RouteToFrom) => {
-  console.log('currentRoute', currentRoute)
   const { path, meta } = currentRoute
 
   if (themeConfig.value.layout === 'classic') {
     let rootPath = getRootPath(path || '')
     rootPath = rootPath || path || ''
-    setCurrentModuleName(`/${rootPath?.split('/')[1]}` || '')
     state.defaultActive = `/${rootPath?.split('/')[1]}`
     if (!state.defaultActive || state.defaultActive === '/') router.push(routesList.value[0].path)
   } else {
@@ -124,13 +117,30 @@ const setCurrentRouterHighlight = (currentRoute: RouteToFrom) => {
   }
 }
 
+const onMenuChange = (path: string) => {
+  console.log('path', path)
+  let to = menuLists.value.find(item => item.path === path)
+  state.currentModuleName = t(to.meta?.title || '未命名模块')
+  setCurrentRouterHighlight(to)
+  let { layout } = themeConfig.value
+  if (layout === 'classic') {
+    mittBus.emit('setSendClassicChildren', setSendClassicChildren(to.path))
+  }
+}
+
 // 页面加载前
 onBeforeMount(() => {
   setCurrentRouterHighlight(route)
+  state.currentModuleName = t(route.meta?.title || '未命名模块')
+  let { layout } = themeConfig.value
+  if (layout === 'classic') {
+    mittBus.emit('setSendClassicChildren', setSendClassicChildren(route.path))
+  }
 })
 
 // 路由更新时
 onBeforeRouteUpdate((to) => {
+  state.currentModuleName = t(to.meta?.title || '未命名模块')
   // 修复：https://gitee.com/lyt-top/vue-next-admin/issues/I3YX6G
   setCurrentRouterHighlight(to)
   // 修复经典布局开启切割菜单时，点击tagsView后左侧导航菜单数据不变的问题
diff --git a/src/router/index.ts b/src/router/index.ts
index 4a214f5..3e75830 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -112,8 +112,7 @@ router.beforeEach(async (to, from, next) => {
     Session.clear()
     NProgress.done()
   } else if (token && to.path === '/login') {
-    console.log('🔄 [路由守卫] 已登录用户访问登录页面，重定向到系统入口页面')
-    next('/system-entrance')
+    next('/')
     NProgress.done()
   } else {
     const storesRoute = useRoute(pinia)
diff --git a/src/views/admin/login/component/account.vue b/src/views/admin/login/component/account.vue
index c56ea42..124507f 100644
--- a/src/views/admin/login/component/account.vue
+++ b/src/views/admin/login/component/account.vue
@@ -238,7 +238,7 @@ const signInSuccess = (isNoPower: boolean | undefined) => {
       })
     } else {
       console.log('🚀 [登录成功] 无redirect参数或redirect是首页，跳转到系统入口页面: /system-entrance')
-      router.push('/system-entrance')
+      router.push('/')
     }
     // 登录成功提示
     const signInText = t('message.signInText')
diff --git a/src/views/admin/login/component/email.vue b/src/views/admin/login/component/email.vue
index 32a1f17..f41d377 100644
--- a/src/views/admin/login/component/email.vue
+++ b/src/views/admin/login/component/email.vue
@@ -143,7 +143,7 @@ const signInSuccess = (isNoPower: boolean | undefined) => {
         query: Object.keys(<string>route.query?.params).length > 0 ? JSON.parse(<string>route.query?.params) : '',
       })
     } else {
-      router.push('/system-entrance')
+      router.push('/')
     }
     // 登录成功提示
     const signInText = t('message.signInText')
diff --git a/src/views/example/login/component/account.vue b/src/views/example/login/component/account.vue
index 17d8d69..7e3e2b2 100644
--- a/src/views/example/login/component/account.vue
+++ b/src/views/example/login/component/account.vue
@@ -128,7 +128,7 @@ const signInSuccess = (isNoPower: boolean | undefined) => {
         query: Object.keys(<string>route.query?.params).length > 0 ? JSON.parse(<string>route.query?.params) : '',
       })
     } else {
-      router.push('/system-entrance')
+      router.push('/')
     }
     // 登录成功提示
     const signInText = t('message.signInText')