From c1e0c945ec7c6d14873faa707cdde41f0599ee98 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 16 Mar 2026 11:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web
---
applications/drone-command/src/permission.js | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/permission.js b/applications/drone-command/src/permission.js
index 6e17a22..55b9bf2 100644
--- a/applications/drone-command/src/permission.js
+++ b/applications/drone-command/src/permission.js
@@ -14,7 +14,9 @@
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)
@@ -91,13 +93,7 @@
} else {
const systemToken = store.getters.token || urlParams?.token
if (systemToken === 0) {
- store.dispatch('FedLogOut').then(() =>{
- const {VITE_APP_PARENT_SYSTEM,VITE_APP_ENV} = import.meta.env
- const isDev = VITE_APP_ENV === 'development'
- isDev
- ? router.push({ path: '/login' })
- : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
- })
+ logOutFun()
} else {
const meta = to.meta || {}
const query = to.query || {}
@@ -122,7 +118,9 @@
if (meta.isAuth === false) {
next()
} else {
- next('/login')
+ const { VITE_APP_PARENT_SYSTEM, VITE_APP_ENV } = import.meta.env
+ const isDev = VITE_APP_ENV === 'development'
+ isDev ? next('/login') : window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
}
}
})
--
Gitblit v1.9.3