From 0bdbb3fce49bb4e8266a9e5cb4cf6a903e88223d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 08 Apr 2026 19:43:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/task-work-order/src/permission.js | 17 +++++++----------
1 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/applications/task-work-order/src/permission.js b/applications/task-work-order/src/permission.js
index 8bbca05..18a27a0 100644
--- a/applications/task-work-order/src/permission.js
+++ b/applications/task-work-order/src/permission.js
@@ -14,11 +14,11 @@
import { getToken } from '@/utils/auth'
import { getUrlParams } from './utils/validate'
import NProgress from 'nprogress' // progress bar
-import 'nprogress/nprogress.css' // progress bar style
+import 'nprogress/nprogress.css'
+import { logOutFun } from '@/utils/util' // progress bar style
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) {
@@ -92,10 +92,7 @@
} 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`));
+ logOutFun()
} else {
const meta = to.meta || {}
const query = to.query || {}
@@ -120,8 +117,8 @@
if (meta.isAuth === false) {
next()
} else {
- env === 'development' ? next('/login') : window.location.replace(`${adminUrl}#/login`)
- }
+ logOutFun()
+ }
}
})
@@ -135,7 +132,7 @@
NProgress.done()
const isLoginPage = to.path === '/login'
// 根据是否登录页设置标题
- const pageTitle = isLoginPage ? '任务工单平台' : '综合管理平台'
- document.title = pageTitle
+
+ document.title = isLoginPage ? '吉安市低空经济服务一体化平台' : '吉安市低空经济服务一体化平台'
store.commit('SET_IS_SEARCH', false)
})
--
Gitblit v1.9.3