From 1540871d2efbcd6c89680e9d13724b2148ffd0ad Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 28 八月 2026 16:53:10 +0800
Subject: [PATCH] feat(inspection): 添加报告类型选择功能 - 在检测视图、检测任务和检测文档组件中新增报告类型下拉选择框 - 添加检测报告和检验报告两种选项供用户选择 - 在检验报告类型时对注册检测结果进行条件性处理

---
 src/store/modules/user.js |   31 ++++++++++++++++++++++++-------
 1 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 54d35ca..68d8fcb 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -2,6 +2,7 @@
 import { getToken, setToken, removeToken } from "@/utils/auth";
 import { isHttp, isEmpty } from "@/utils/validate";
 import defAva from "@/assets/images/profile.jpg";
+import Vue from "vue";
 
 const user = {
   state: {
@@ -10,6 +11,8 @@
     name: "",
     avatar: "",
     nickName: "",
+    nameEn: "",
+    userName: "",
     roles: [],
     permissions: [],
   },
@@ -29,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;
@@ -50,6 +59,9 @@
           .then((res) => {
             setToken(res.token);
             commit("SET_TOKEN", res.token);
+            Vue.prototype.uploadHeader = {
+              Authorization: "Bearer " + res.token,
+            };
             resolve();
           })
           .catch((error) => {
@@ -57,7 +69,6 @@
           });
       });
     },
-
     // 鑾峰彇鐢ㄦ埛淇℃伅
     GetInfo({ commit, state }) {
       return new Promise((resolve, reject) => {
@@ -81,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) => {
@@ -93,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