Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-VUEUI

qq_41295110

2025-11-20 9215dfa012c3af1b0ea78f3d44fd874baae9e01a

 src/permission.js

@@ -1,65 +1,82 @@
import router from './router'
import store from './store'
import { Message } from 'element-ui'
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
import { isPathMatch } from '@/utils/validate'
import { isRelogin } from '@/utils/request'
import router from "./router";
import store from "./store";
import { Message } from "element-ui";
import NProgress from "nprogress";
import "nprogress/nprogress.css";
import { getToken } from "@/utils/auth";
import { isPathMatch } from "@/utils/validate";
import { isRelogin } from "@/utils/request";

NProgress.configure({ showSpinner: false })
NProgress.configure({ showSpinner: false });

const whiteList = [ '/login', '/register', '/printList',
  '/hBarPlanPrint', '/gySource', '/gyWarehouse', '/gyStockPlace', '/gyEmployee','/GyCustomer','/gyMaterial','/FbStepFoldinBillList','/FbStepFoldOutBillList' ] // no redirect whitelist
const whiteList = [
  "/login",
  "/register",
  "/printList",
  "/hBarPlanPrint",
  "/gySource",
  "/gyWarehouse",
  "/gyStockPlace",
  "/gyEmployee",
  "/GyCustomer",
  "/gyMaterial",
  "/FbStepFoldinBillList",
  "/FbStepFoldOutBillList",
]; // no redirect whitelist

const isWhiteList = (path) => {
  return whiteList.some(pattern => isPathMatch(pattern, path))
}
  return whiteList.some((pattern) => isPathMatch(pattern, path));
};

router.beforeEach((to, from, next) => {
  NProgress.start()
  NProgress.start();
  if (getToken()) {
    to.meta.title && store.dispatch('settings/setTitle', to.meta.title)
    to.meta.title && store.dispatch("settings/setTitle", to.meta.title);
    /* has token*/
    if (to.path === '/login') {
      next({ path: '/' })
      NProgress.done()
    } else if (isWhiteList(to.path)) {
      next()
    // if (to.path === "/login") {
    //   next({ path: "/" });
    //   NProgress.done();
    // } else
    if (isWhiteList(to.path)) {
      next();
    } else {
      if (store.getters.roles.length === 0) {
        isRelogin.show = true
      if (!sessionStorage["HMaker"]) {
        next("/login"); // 否则全部重定向到登录页
      }
      if (store.getters.permission_routes.length === 0) {
        isRelogin.show = true;
        // 判断当前用户是否已拉取完user_info信息
        store.dispatch('GetInfo').then(() => {
          isRelogin.show = false
          store.dispatch('GenerateRoutes').then(accessRoutes => {
            // 根据roles权限生成可访问的路由表
            router.addRoutes(accessRoutes) // 动态添加可访问路由表
            next({ ...to, replace: true }) // hack方法 确保addRoutes已完成
        store .dispatch("GetInfo").then(() => {
            isRelogin.show = false;
            store.dispatch("GenerateRoutes").then((accessRoutes) => {
              // 根据roles权限生成可访问的路由表
              router.addRoutes(accessRoutes); // 动态添加可访问路由表
              next({ ...to, replace: true }); // hack方法 确保addRoutes已完成
            });
          })
        }).catch(err => {
            store.dispatch('LogOut').then(() => {
              Message.error(err)
              next({ path: '/' })
            })
          })
        next()
          .catch((err) => {
            store.dispatch("LogOut").then(() => {
              Message.error(err);
              next({ path: "/" });
            });
          });
        next();
      } else {
        next()
        next();
      }
    }
  } else {
    // 没有token
    if (isWhiteList(to.path)) {
      // 在免登录白名单，直接进入
      next()
      next();
    } else {
      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`) // 否则全部重定向到登录页
      NProgress.done()
      next(`/login?redirect=${encodeURIComponent(to.fullPath)}`); // 否则全部重定向到登录页
      NProgress.done();
    }
  }
})
});

router.afterEach(() => {
  NProgress.done()
})
  NProgress.done();
});