From 4a407279f0c9757f0714eaf385fdd5cd68c038c2 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 21 五月 2026 16:55:43 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' of http://114.132.189.42:9002/r/product-inventory-management into dev_NEW_pro
---
src/store/modules/user.js | 133 ++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 66 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index dd31b26..b7714f6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,12 +1,12 @@
-import {login, logout, getInfo, loginCheck, loginCheckFactory,tideLogin} from '@/api/login'
-import { getToken, setToken, removeToken } from '@/utils/auth'
-import { isHttp, isEmpty } from "@/utils/validate"
-import defAva from '@/assets/images/profile.jpg'
-import { defineStore } from 'pinia'
-
-const useUserStore = defineStore(
- 'user',
- {
+import {login, logout, getInfo, loginCheck, loginCheckFactory,tideLogin} from '@/api/login'
+import { getToken, setToken, removeToken } from '@/utils/auth'
+import { isHttp, isEmpty } from "@/utils/validate"
+import defAva from '@/assets/images/profile.jpg'
+import { defineStore } from 'pinia'
+
+const useUserStore = defineStore(
+ 'user',
+ {
state: () => ({
token: getToken(),
id: '',
@@ -15,9 +15,9 @@
roles: [],
permissions: [],
aiEnabled: 0
- }),
- actions: {
- // 鐧诲綍
+ }),
+ actions: {
+ // 鐧诲綍
login(userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
@@ -37,33 +37,34 @@
reject(error)
})
})
- },
- getCurrentTime() {
- const now = new Date();
- const year = now.getFullYear(); // 鑾峰彇骞翠唤
- const month = String(now.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝瑕�+1锛屽苟琛ラ浂
- const day = String(now.getDate()).padStart(2, '0'); // 鏃ユ湡琛ラ浂
- const hours = String(now.getHours()).padStart(2, '0'); // 灏忔椂琛ラ浂
- const minutes = String(now.getMinutes()).padStart(2, '0'); // 鍒嗛挓琛ラ浂
- const seconds = String(now.getSeconds()).padStart(2, '0'); // 绉掓暟琛ラ浂
- return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
- },
- // 鑾峰彇鐢ㄦ埛淇℃伅
- getInfo() {
- return new Promise((resolve, reject) => {
- getInfo().then(res => {
+ },
+ getCurrentTime() {
+ const now = new Date();
+ const year = now.getFullYear(); // 鑾峰彇骞翠唤
+ const month = String(now.getMonth() + 1).padStart(2, '0'); // 鏈堜唤浠�0寮�濮嬶紝瑕�+1锛屽苟琛ラ浂
+ const day = String(now.getDate()).padStart(2, '0'); // 鏃ユ湡琛ラ浂
+ const hours = String(now.getHours()).padStart(2, '0'); // 灏忔椂琛ラ浂
+ const minutes = String(now.getMinutes()).padStart(2, '0'); // 鍒嗛挓琛ラ浂
+ const seconds = String(now.getSeconds()).padStart(2, '0'); // 绉掓暟琛ラ浂
+ return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+ },
+ // 鑾峰彇鐢ㄦ埛淇℃伅
+ getInfo() {
+ return new Promise((resolve, reject) => {
+ getInfo().then(res => {
+ res = res.data
const user = res.user || {}
- let avatar = user.avatar || ""
- avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar
- if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
- this.roles = res.roles
- this.permissions = res.permissions
- } else {
- this.roles = ['ROLE_DEFAULT']
- }
+ let avatar = user.avatar || ""
+ avatar = import.meta.env.VITE_APP_BASE_API + '/profile/' + avatar
+ if (res.roles && res.roles.length > 0) { // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
+ this.roles = res.roles
+ this.permissions = res.permissions
+ } else {
+ this.roles = ['ROLE_DEFAULT']
+ }
this.id = user.userId || ''
this.name = user.userName || ''
- this.avatar = avatar
+ this.avatar = avatar
this.currentFactoryName = user.currentFactoryName || ''
this.nickName = user.nickName || ''
this.roleName = Array.isArray(user.roles) && user.roles.length > 0 ? (user.roles[0].roleName || '') : ''
@@ -75,11 +76,11 @@
reject(error)
})
})
- },
- // 閫�鍑虹郴缁�
- logOut() {
- return new Promise((resolve, reject) => {
- logout(this.token).then(() => {
+ },
+ // 閫�鍑虹郴缁�
+ logOut() {
+ return new Promise((resolve, reject) => {
+ logout(this.token).then(() => {
this.token = ''
this.roles = []
this.permissions = []
@@ -89,21 +90,21 @@
}).catch(error => {
reject(error)
})
- })
- },
- // 鐧诲綍鏍￠獙
- loginCheck(userInfo) {
- const username = userInfo.username.trim()
- const password = userInfo.password
- return new Promise((resolve, reject) => {
- loginCheck(username, password).then(res => {
- resolve(res)
- }).catch(error => {
- reject(error)
- })
- })
- },
- // 閮ㄩ棬鐧诲綍
+ })
+ },
+ // 鐧诲綍鏍￠獙
+ loginCheck(userInfo) {
+ const username = userInfo.username.trim()
+ const password = userInfo.password
+ return new Promise((resolve, reject) => {
+ loginCheck(username, password).then(res => {
+ resolve(res)
+ }).catch(error => {
+ reject(error)
+ })
+ })
+ },
+ // 閮ㄩ棬鐧诲綍
loginCheckFactory(userInfo) {
const username = userInfo.username.trim()
const password = userInfo.password
@@ -121,7 +122,7 @@
reject(error)
})
})
- },
+ },
TideLogin(code) {
return new Promise((resolve, reject) => {
tideLogin(code)
@@ -138,12 +139,12 @@
};
resolve();
})
- .catch((error) => {
- reject(error);
- });
- });
- },
- }
- })
-
-export default useUserStore
+ .catch((error) => {
+ reject(error);
+ });
+ });
+ },
+ }
+ })
+
+export default useUserStore
--
Gitblit v1.9.3