From 61282c106068d9a792e1b084746e2d6b9a997b99 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 15 九月 2026 15:29:52 +0800
Subject: [PATCH] 新疆——新聚lims 1.不需要判定要求、检测方法、检验结果、结论 2.设备不需要绑定每个检验子项，只需要绑定当前的的检验委托单 3.判定结果检测的时候不要出现，复核的时候才判断选择最终结果是否合格
---
src/store/modules/user.js | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index e5d40e4..68d8fcb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -11,6 +11,8 @@
name: "",
avatar: "",
nickName: "",
+ nameEn: "",
+ userName: "",
roles: [],
permissions: [],
},
@@ -30,6 +32,12 @@
},
SET_NICKNAME: (state, nickName) => {
state.nickName = nickName;
+ },
+ SET_NAMEEN: (state, nameEn) => {
+ state.nameEn = nameEn;
+ },
+ SET_USERNAME: (state, userName) => {
+ state.userName = userName;
},
SET_ROLES: (state, roles) => {
state.roles = roles;
@@ -61,7 +69,6 @@
});
});
},
-
// 鑾峰彇鐢ㄦ埛淇℃伅
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
@@ -85,6 +92,8 @@
commit("SET_NAME", user.userName);
commit("SET_AVATAR", avatar);
commit("SET_NICKNAME", user.nickName);
+ commit("SET_NAMEEN", user.nameEn);
+ commit("SET_USERNAME", user.userName);
resolve(res);
})
.catch((error) => {
@@ -97,12 +106,16 @@
LogOut({ commit, state }) {
return new Promise((resolve, reject) => {
logout(state.token)
- .then(() => {
- commit("SET_TOKEN", "");
- commit("SET_ROLES", []);
- commit("SET_PERMISSIONS", []);
- removeToken();
- resolve();
+ .then((res) => {
+ if (res.data) {
+ window.location.href = res.data
+ } else {
+ commit("SET_TOKEN", "");
+ commit("SET_ROLES", []);
+ commit("SET_PERMISSIONS", []);
+ removeToken();
+ resolve();
+ }
})
.catch((error) => {
reject(error);
--
Gitblit v1.9.3