From 5131abc9cc51aa5e6c57b8f6ee897f6778637814 Mon Sep 17 00:00:00 2001
From: spring <2396852758@qq.com>
Date: 星期三, 14 一月 2026 15:32:45 +0800
Subject: [PATCH] fix: 参考中天的[检测标准绑定]页面,再新增一个分表,表示检测标准汇总表应用于哪些产品,是一对多的关系,这个维护好以后,后面的来料检,过程检,出厂检可以根据对应检验类型和产品id去获取具体的检测参数信息
---
src/permission.js | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 1afe9cd..9bf4a91 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -3,15 +3,19 @@
import NProgress from 'nprogress'
import 'nprogress/nprogress.css'
import { getToken } from '@/utils/auth'
-import { isHttp } from '@/utils/validate'
+import { isHttp, isPathMatch } from '@/utils/validate'
import { isRelogin } from '@/utils/request'
import useUserStore from '@/store/modules/user'
import useSettingsStore from '@/store/modules/settings'
import usePermissionStore from '@/store/modules/permission'
-NProgress.configure({ showSpinner: false });
+NProgress.configure({ showSpinner: false })
-const whiteList = ['/login', '/register'];
+const whiteList = ['/login', '/register', '/callbacklccpn','/device-info']
+
+const isWhiteList = (path) => {
+ return whiteList.some(pattern => isPathMatch(pattern, path))
+}
router.beforeEach((to, from, next) => {
NProgress.start()
@@ -21,7 +25,7 @@
if (to.path === '/login') {
next({ path: '/' })
NProgress.done()
- } else if (whiteList.indexOf(to.path) !== -1) {
+ } else if (isWhiteList(to.path)) {
next()
} else {
if (useUserStore().roles.length === 0) {
@@ -50,7 +54,7 @@
}
} else {
// 娌℃湁token
- if (whiteList.indexOf(to.path) !== -1) {
+ if (isWhiteList(to.path)) {
// 鍦ㄥ厤鐧诲綍鐧藉悕鍗曪紝鐩存帴杩涘叆
next()
} else {
--
Gitblit v1.9.3