From 2ca94de8ede18ac07ccfd8dec7b6f6a707adde9b Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 01 Sep 2025 11:20:24 +0800
Subject: [PATCH] Merge branch 'refs/heads/feature/v5.0/5.0.5' into patch_management
---
src/permission.js | 85 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 77 insertions(+), 8 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index cb2ef3b..36ed552 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -7,6 +7,8 @@
* @Description:
* Copyright (c) 2024 by GuLiMmo, All Rights Reserved.
*/
+
+import { getStore } from '@/utils/store'
import router from './router/'
import store from './store'
import { getToken } from '@/utils/auth'
@@ -16,12 +18,72 @@
NProgress.configure({ showSpinner: false })
const lockPage = '/lock' //锁屏页
const urlParams = getUrlParams(window.location.href)
+const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
+const env = import.meta.env.VITE_APP_ENV
+function findRouteByPath (routes, targetPath) {
+ // 遍历数组中的每个路由对象
+ for (const route of routes) {
+ // 如果当前路由的path匹配目标路径，直接返回
+ if (route.path === targetPath) {
+ return route
+ }
+
+ // 如果有子路由，递归查找
+ if (route.children && route.children.length > 0) {
+ const foundInChildren = findRouteByPath(route.children, targetPath)
+ if (foundInChildren) {
+ return foundInChildren
+ }
+ }
+ }
+
+ // 遍历完所有路由都没找到，返回null
+ return null
+}
router.beforeEach((to, from, next) => {
const meta = to.meta || {}
const isMenu = meta.menu === undefined ? to.query.menu : meta.menu
store.commit('SET_IS_MENU', isMenu === undefined)
+
+ const menuAll = getStore({ name: 'menuAll' })
if (getToken()) {
+ if (!menuAll?.length) {
+ store.dispatch('GetMenu').then(data => {
+ if (data.length !== 0) {
+ router.$avueRouter.formatRoutes(data, true)
+
+ let newMenu = getStore({ name: 'menuAll' })
+
+ let firstMenu = newMenu[0]
+
+ let toMenu = findRouteByPath(newMenu, to.path)
+
+ store.commit('ADD_TAG', {
+ name: firstMenu.name,
+ path: firstMenu.path,
+ fullPath: firstMenu.path,
+ params: firstMenu.params || {},
+ query: firstMenu.query || {},
+ meta: firstMenu.meta || {},
+ })
+
+ store.commit('ADD_TAG', {
+ name: toMenu.name,
+ path: toMenu.path,
+ fullPath: toMenu.path,
+ params: toMenu.params || {},
+ query: toMenu.query || {},
+ meta: toMenu.meta || {},
+ })
+
+ next(to.fullPath)
+ }
+ })
+
+ return
+ }
+
if (store.getters.isLock && to.path !== lockPage) {
//如果系统激活锁屏，全部跳转到锁屏页
next({ path: lockPage })
@@ -34,6 +96,7 @@
store.dispatch('FedLogOut').then(() => {
next({ path: '/login' })
})
+ // store.dispatch('FedLogOut').then(() => window.location.replace(`${adminUrl}#/login`));
} else {
const meta = to.meta || {}
const query = to.query || {}
@@ -41,8 +104,6 @@
window.open(query.url.replace(/#/g, '&'))
return
} else if (meta.isTab !== false) {
- console.log(meta, 111111)
-
store.commit('ADD_TAG', {
name: query.name || to.name,
path: to.path,
@@ -60,14 +121,22 @@
if (meta.isAuth === false) {
next()
} else {
- next('/login')
+ env === 'development' ? next('/login') : window.location.replace(`${adminUrl}#/login`)
}
}
})
+// router.afterEach(to => {
+// NProgress.done()
+// let title = router.$avueRouter.generateTitle(to, { label: 'name' })
+// router.$avueRouter.setTitle(title)
+// store.commit('SET_IS_SEARCH', false)
+// })
router.afterEach(to => {
- NProgress.done()
- let title = router.$avueRouter.generateTitle(to, { label: 'name' })
- router.$avueRouter.setTitle(title)
- store.commit('SET_IS_SEARCH', false)
-})
+ NProgress.done()
+ const isLoginPage = to.path === '/login'
+ // 根据是否登录页设置标题
+ const pageTitle = isLoginPage ? '中图智飞低空感知网平台' : '综合管理平台'
+ document.title = pageTitle
+ store.commit('SET_IS_SEARCH', false)
+})
\ No newline at end of file
--
Gitblit v1.9.3