From e54950b9bcff03853dca9ba5989c3c45f91cc444 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Tue, 31 Mar 2026 16:43:35 +0800
Subject: [PATCH] feat: 登录调整
---
applications/drone-command/src/utils/util.js | 15 ++++++++++++---
applications/drone-command/env/.env.development | 1 -
applications/drone-command/src/permission.js | 4 +---
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/applications/drone-command/env/.env.development b/applications/drone-command/env/.env.development
index 8d04407..1575488 100644
--- a/applications/drone-command/env/.env.development
+++ b/applications/drone-command/env/.env.development
@@ -3,7 +3,6 @@
#开发环境配置
VITE_APP_ENV='development'
-
#开发环境代理地址（推荐本地新建文件 .env.development.local 来进行覆盖）
# VITE_APP_URL=https://wrj.shuixiongit.com/api
VITE_APP_URL=http://192.168.1.168
diff --git a/applications/drone-command/src/permission.js b/applications/drone-command/src/permission.js
index 55b9bf2..74b64b0 100644
--- a/applications/drone-command/src/permission.js
+++ b/applications/drone-command/src/permission.js
@@ -118,9 +118,7 @@
if (meta.isAuth === false) {
next()
} else {
- 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`)
+ logOutFun()
}
}
})
diff --git a/applications/drone-command/src/utils/util.js b/applications/drone-command/src/utils/util.js
index 4ff3644..e08a79b 100644
--- a/applications/drone-command/src/utils/util.js
+++ b/applications/drone-command/src/utils/util.js
@@ -1,6 +1,8 @@
import { validatenull } from './validate'
import sha256 from 'crypto-js/sha256'
import Base64 from 'crypto-js/enc-base64'
+import { useRoute } from 'vue-router'
+
//表单序列化
export const serialize = data => {
let list = []
@@ -506,13 +508,20 @@
const { default: store } = await import('@/store')
const { default: router } = await import('@/router')
const { VITE_APP_PARENT_SYSTEM, VITE_APP_ENV } = import.meta.env
- store.dispatch('LogOut').then(() => {
+
+ const jumpFun = () => {
+ const urlParams = new URLSearchParams(window.location.search);
+ const devLogin = urlParams.get('devLogin');
const isDev = VITE_APP_ENV === 'development'
- if (isDev) {
+ if (isDev || devLogin) {
router.push({ path: '/login' })
- setTimeout(() => location.reload())
+ // setTimeout(() => location.reload())
} else {
window.location.replace(`${VITE_APP_PARENT_SYSTEM}/#/login`)
}
+ }
+
+ store.dispatch('LogOut').then(() => {
+ jumpFun()
})
}
--
Gitblit v1.9.3