From 9f8a5d846939d51a275b39a792726b118dffe3d0 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Sat, 11 Apr 2026 14:21:08 +0800
Subject: [PATCH] feat: 令牌失效退出登录
---
applications/drone-command/src/page/login/loginByUser.vue | 41 ++++++++++++--------
applications/task-work-order/src/page/login/loginByUser.vue | 41 ++++++++++++--------
2 files changed, 49 insertions(+), 33 deletions(-)
diff --git a/applications/drone-command/src/page/login/loginByUser.vue b/applications/drone-command/src/page/login/loginByUser.vue
index 023fd4f..6bc48d6 100644
--- a/applications/drone-command/src/page/login/loginByUser.vue
+++ b/applications/drone-command/src/page/login/loginByUser.vue
@@ -4,6 +4,7 @@
<script setup>
import { useStore } from 'vuex'
import { ElLoading } from 'element-plus'
+import { logOutFun } from '@/utils/util'
const store = useStore()
const router = useRouter()
@@ -12,22 +13,30 @@
let loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.3)', text: '加载中...' })
const tagWel = computed(() => store.state.tags.tagWel)
const redirect = route.query.redirect
-store
- .dispatch('LoginByUsername', {
- username: userName,
- password: userName === 'admin' ? 'admin' :'jadk@2026',
- tenantId: '000000',
- type: 'account',
- })
- .then(() => {
- loading.close()
- router.push(redirect || tagWel.value)
- })
- .catch(err => {
- loading.close()
- // 返回上一个路由
- window.history.go(-1)
- })
+
+if (userName) {
+ store
+ .dispatch('LoginByUsername', {
+ username: userName,
+ password: userName === 'admin' ? 'admin' :'jadk@2026',
+ tenantId: '000000',
+ type: 'account',
+ })
+ .then(() => {
+ loading.close()
+ router.push(redirect || tagWel.value)
+ })
+ .catch(err => {
+ loading.close()
+ // 返回上一个路由
+ window.history.go(-1)
+ })
+}else{
+ loading.close()
+ logOutFun()
+}
+
+
</script>
<style scoped lang="scss"></style>
diff --git a/applications/task-work-order/src/page/login/loginByUser.vue b/applications/task-work-order/src/page/login/loginByUser.vue
index daa0c70..a4ad6ce 100644
--- a/applications/task-work-order/src/page/login/loginByUser.vue
+++ b/applications/task-work-order/src/page/login/loginByUser.vue
@@ -1,9 +1,10 @@
<template>
- <div style="width: 100%; height: 100%; background: #FFFFFF"></div>
+ <div style="width: 100%; height: 100%; background: #ffffff"></div>
</template>
<script setup>
import { useStore } from 'vuex'
import { ElLoading } from 'element-plus'
+import { logOutFun } from '@/utils/util'
const store = useStore()
const router = useRouter()
@@ -12,22 +13,28 @@
let loading = ElLoading.service({ background: 'rgba(0, 0, 0, 0.3)', text: '加载中...' })
const tagWel = computed(() => store.state.tags.tagWel)
const redirect = route.query.redirect
-store
- .dispatch('LoginByUsername', {
- username: userName,
- password: userName === 'admin' ? 'admin' :'jadk@2026',
- tenantId: '000000',
- type: 'account',
- })
- .then(() => {
- loading.close()
- router.push(redirect || tagWel.value)
- })
- .catch(err => {
- loading.close()
- // 返回上一个路由
- window.history.go(-1)
- })
+
+if (userName) {
+ store
+ .dispatch('LoginByUsername', {
+ username: userName,
+ password: userName === 'admin' ? 'admin' : 'jadk@2026',
+ tenantId: '000000',
+ type: 'account',
+ })
+ .then(() => {
+ loading.close()
+ router.push(redirect || tagWel.value)
+ })
+ .catch(err => {
+ loading.close()
+ // 返回上一个路由
+ window.history.go(-1)
+ })
+} else {
+ loading.close()
+ logOutFun()
+}
</script>
<style scoped lang="scss"></style>
--
Gitblit v1.9.3