From 0333d66e4b397c161c6a44ce1e2a121c2cc41082 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 28 五月 2026 09:20:20 +0800
Subject: [PATCH] Merge branch 'dev_NEW_pro' into dev_天津_中兴实强
---
src/store/modules/user.ts | 72 ++++++++++++++++++++++-------------
1 files changed, 45 insertions(+), 27 deletions(-)
diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts
index 64ada0b..0813795 100644
--- a/src/store/modules/user.ts
+++ b/src/store/modules/user.ts
@@ -1,5 +1,7 @@
import { logout, getInfo, loginCheckFactory } from "@/api/login";
+import { getRouters as getRoutersApi } from "@/api/menu";
import { getToken, setToken, removeToken } from "@/utils/auth";
+import defAva from "@/static/images/profile.jpg";
import { defineStore } from "pinia";
import config from "@/config.js";
@@ -25,14 +27,20 @@
}),
actions: {
loginCheckFactory(userInfo: any) {
- const userName = userInfo.userName;
+ const userName = userInfo.userName.trim();
const password = userInfo.password;
+ const factoryId = userInfo.factoryId;
return new Promise((resolve, reject) => {
- loginCheckFactory(userName, password)
+ loginCheckFactory(userName, password, factoryId)
.then((res: any) => {
- setToken(res.token);
- this.token = res.token;
- resolve(null);
+ const token = res.token || res.data?.token;
+ if (token) {
+ setToken(token);
+ this.token = token;
+ resolve(null);
+ } else {
+ reject("鏈幏鍙栧埌鐧诲綍浠ょ墝");
+ }
})
.catch((error: any) => {
reject(error);
@@ -43,26 +51,29 @@
return new Promise((resolve, reject) => {
getInfo()
.then((res: any) => {
- const user = res.user;
+ // 鍏煎 res.data 缁撴瀯
+ const data = res.data || res;
+ const user = data.user || {};
let avatar = user.avatar || "";
avatar = config.baseUrl + "/profile/" + avatar;
- if (res.roles && res.roles.length > 0) {
- this.roles = res.roles;
- this.permissions = res.permissions;
+ if (data.roles && data.roles.length > 0) {
+ // 楠岃瘉杩斿洖鐨剅oles鏄惁鏄竴涓潪绌烘暟缁�
+ this.roles = data.roles;
+ this.permissions = data.permissions;
} else {
this.roles = ["ROLE_DEFAULT"];
}
- this.id = user.userId;
- this.name = user.userName;
+ this.id = user.userId || "";
+ this.name = user.userName || "";
this.avatar = avatar;
- this.currentFactoryName = user.currentFactoryName;
- this.nickName = user.nickName;
- this.roleName = user.roles[0].roleName;
- this.currentDeptId = user.tenantId;
+ this.currentFactoryName = user.currentFactoryName || "";
+ this.nickName = user.nickName || "";
+ this.roleName = Array.isArray(user.roles) && user.roles.length > 0 ? user.roles[0].roleName || "" : "";
+ this.currentDeptId = user.tenantId || "";
this.currentLoginTime = this.getCurrentTime();
- resolve(res);
+ resolve(data);
})
- .catch((error) => {
+ .catch(error => {
reject(error);
});
});
@@ -80,25 +91,32 @@
removeToken();
resolve(null);
})
- .catch((error) => {
+ .catch(error => {
reject(error);
});
});
},
getCurrentTime() {
const now = new Date();
- const year = now.getFullYear();
- const month = String(now.getMonth() + 1).padStart(2, "0");
- 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");
+ 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}`;
},
getRouters() {
- return new Promise((resolve) => {
- this.routers = [];
- resolve({ data: [] });
+ return new Promise((resolve, reject) => {
+ getRoutersApi()
+ .then((res: any) => {
+ // 瀛樺偍璺敱鏉冮檺鏁版嵁
+ this.routers = res.data || [];
+ resolve(res);
+ })
+ .catch(error => {
+ reject(error);
+ });
});
},
},
--
Gitblit v1.9.3