From 0c92fd00fae033a2aa04bb65b2d32bd2c8f9fd4a Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 04 Feb 2026 15:48:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/store/modules/user.js | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/applications/drone-command/src/store/modules/user.js b/applications/drone-command/src/store/modules/user.js
index 181b52d..4dbd240 100644
--- a/applications/drone-command/src/store/modules/user.js
+++ b/applications/drone-command/src/store/modules/user.js
@@ -272,15 +272,14 @@
GetMenu({ commit, dispatch }, tenantId) {
const errLogOut = () => {
dispatch('LogOut').then(()=>{
- const env = import.meta.env.VITE_APP_ENV
- const adminUrl = import.meta.env.VITE_APP_DASHBOARD_URL
- env === 'development'
- ? window.location.href = "/manage/login"
- : window.location.replace(`${adminUrl}#/login`)
+ window.location.href = "/drone-command/login"
+ // env === 'development'
+ // ? window.location.href = "/drone-command/login"
+ // : window.location.replace(`${adminUrl}#/login`)
})
}
return new Promise(resolve => {
- getRoutes({tenantId,sysType: 1}).then(res => {
+ getRoutes({tenantId,sysType: 5}).then(res => {
const data = res.data.data;
let menu = deepClone(data);
if (!res.data?.data?.length){
@@ -299,7 +298,7 @@
},
GetButtons({ commit }) {
return new Promise(resolve => {
- getButtons({sysType: 1}).then(res => {
+ getButtons({sysType: 5}).then(res => {
const data = res.data.data;
commit('SET_PERMISSION', data);
resolve();
--
Gitblit v1.9.3