Merge branch 'dev' of http://114.132.189.42:9002/r/center-lims-before-ruoyi...

lxp

2025-03-12 952a20f1c005d80e9bf881287c40e6f4e4266a0b

 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: "",
    companyName: "",
    loginUserInfo: {},
    roles: [],
    permissions: [],
  },
@@ -29,6 +32,12 @@
    },
    SET_NICKNAME: (state, nickName) => {
      state.nickName = nickName;
    },
    SET_COMPANYNAME: (state, companyName) => {
      state.companyName = companyName;
    },
    SET_LOGINUSERINFO: (state, loginUserInfo) => {
      state.loginUserInfo = loginUserInfo;
    },
    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) => {
@@ -77,10 +89,12 @@
            } else {
              commit("SET_ROLES", ["ROLE_DEFAULT"]);
            }
            commit("SET_LOGINUSERINFO", user);
            commit("SET_ID", user.userId);
            commit("SET_NAME", user.userName);
            commit("SET_AVATAR", avatar);
            commit("SET_NICKNAME", user.nickName);
            commit("SET_COMPANYNAME", user.companyName);
            resolve(res);
          })
          .catch((error) => {