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 | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 5272458..36ed552 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -19,6 +19,8 @@
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) {
@@ -39,16 +41,14 @@
// 遍历完所有路由都没找到，返回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) {
+ if (!menuAll?.length) {
store.dispatch('GetMenu').then(data => {
if (data.length !== 0) {
router.$avueRouter.formatRoutes(data, true)
@@ -93,10 +93,10 @@
} else {
const systemToken = store.getters.token || urlParams?.token
if (systemToken === 0) {
- // store.dispatch('FedLogOut').then(() => {
- // next({ path: '/login' })
- // })
- store.dispatch('FedLogOut').then(() => window.location.replace(`${adminUrl}#/login`));
+ 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 || {}
@@ -121,15 +121,22 @@
if (meta.isAuth === false) {
next()
} else {
- // next('/login')
- window.location.replace(`${adminUrl}#/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