Merge branch 'dev_NEW_pro' into dev_NEW_pro_OA

yyb

9 天以前 1c8c18285e5676df8b5eaabff33bfac9d1f33b13

 src/store/modules/user.ts

@@ -1,70 +1,81 @@
import {logout, getInfo, loginCheckFactory} from "@/api/login";
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'
import config from "@/config.js";

export interface LoginForm {
  username: string;
  userName: string;
  password: string;
  factoryId: string;
}

const useUserStore = defineStore("user", {
  state: () => ({
    token: getToken(),
      id: "",
    id: "",
    name: "",
    avatar: "",
      currentFactoryName: "",
      nickName: "",
      roleName: "",
      currentDeptId: "",
      currentLoginTime: "",
    currentFactoryName: "",
    nickName: "",
    roleName: "",
    currentDeptId: "",
    currentLoginTime: "",
    roles: Array(),
    permissions: [],
    routers: [], // 路由权限数据
  }),
  actions: {
      // 部门登录
      loginCheckFactory(userInfo: any) {
          const username = userInfo.username.trim()
          const password = userInfo.password
          const factoryId = userInfo.factoryId
          return new Promise((resolve, reject) => {
              loginCheckFactory(username, password, factoryId).then((res: any) => {
                  setToken(res.token)
                  this.token = res.token
                  resolve(null)
              }).catch((error: any) => {
                  reject(error)
              })
    // 部门登录
    loginCheckFactory(userInfo: any) {
      const userName = userInfo.userName.trim();
      const password = userInfo.password;
      const factoryId = userInfo.factoryId;
      return new Promise((resolve, reject) => {
        loginCheckFactory(userName, password, factoryId)
          .then((res: any) => {
            const token = res.token || res.data?.token;
            if (token) {
              setToken(token);
              this.token = token;
              resolve(null);
            } else {
              reject("未获取到登录令牌");
            }
          })
      },
          .catch((error: any) => {
            reject(error);
          });
      });
    },
    // 获取用户信息
    getInfo() {
      return new Promise((resolve, reject) => {
        getInfo()
          .then((res: any) => {
              const user = res.user
              let avatar = user.avatar || ""
              avatar = config.baseUrl + '/profile/' + avatar
              if (res.roles && res.roles.length > 0) { // 验证返回的roles是否是一个非空数组
                  this.roles = res.roles
                  this.permissions = res.permissions
              } else {
                  this.roles = ['ROLE_DEFAULT']
              }
              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.currentLoginTime = this.getCurrentTime()
            resolve(res);
            // 兼容 res.data 结构
            const data = res.data || res;
            const user = data.user || {};
            let avatar = user.avatar || "";
            avatar = config.baseUrl + "/profile/" + avatar;
            if (data.roles && data.roles.length > 0) {
              // 验证返回的roles是否是一个非空数组
              this.roles = data.roles;
              this.permissions = data.permissions;
            } else {
              this.roles = ["ROLE_DEFAULT"];
            }
            this.id = user.userId || "";
            this.name = user.userName || "";
            this.avatar = avatar;
            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(data);
          })
          .catch((error) => {
          .catch(error => {
            reject(error);
          });
      });
@@ -77,26 +88,41 @@
            this.token = "";
            this.roles = [];
            this.permissions = [];
            this.routers = [];
            this.name = "";
            this.avatar = "";
            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');  // 月份从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}`;
      },
    getCurrentTime() {
      const now = new Date();
      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, reject) => {
        getRoutersApi()
          .then((res: any) => {
            // 存储路由权限数据
            this.routers = res.data || [];
            resolve(res);
          })
          .catch(error => {
            reject(error);
          });
      });
    },
  },
});