From 9620ca5caed59bd206dce701a04a5a4e4cfb9dc5 Mon Sep 17 00:00:00 2001
From: dytyqx <1342948614@qq.com>
Date: 星期二, 31 三月 2026 13:46:57 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI
---
src/store/modules/user.js | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 019798c..0f290af 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -48,9 +48,13 @@
// const code = userInfo.code
// const uuid = userInfo.uuid
const HOrgName = userInfo.HOrgName;
+ const loginPage = userInfo.loginPage || 'login'; // 娣诲姞鐧诲綍椤甸潰鏉ユ簮鏍囪
return new Promise((resolve, reject) => {
login(username, password, HOrgName)
.then((res) => {
+ // 瀛樺偍鐧诲綍椤甸潰鏉ユ簮
+ sessionStorage["loginPage"] = loginPage;
+
sessionStorage["OrganizationID"] = userInfo.HOrgName;
sessionStorage["Organization"] = userInfo.Organization;
sessionStorage["HTranSlate"] = userInfo.HTranSlate;
@@ -96,7 +100,13 @@
sessionStorage["HCheckEmpName"] = res.data[0].HCheckEmpName;
sessionStorage["login"] = "login";
sessionStorage["HType"] = "PC";
-
+ commit("SET_NICK_NAME", sessionStorage["HUserName"]);
+ getOrganizations().then((res) => {
+ if (res.count == 1) {
+ const stringifiedItems = JSON.stringify(res.data);
+ sessionStorage.setItem("organizationList", stringifiedItems);
+ }
+ });
setToken(res.token);
commit("SET_TOKEN", res.token);
resolve();
@@ -111,12 +121,6 @@
GetInfo({ commit, state }) {
return new Promise((resolve, reject) => {
commit("SET_NICK_NAME", sessionStorage["HUserName"]);
- getOrganizations().then((res) => {
- if (res.count == 1) {
- const stringifiedItems = JSON.stringify(res.data);
- sessionStorage.setItem("organizationList", stringifiedItems);
- }
- });
resolve();
});
},
--
Gitblit v1.9.1