From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/permission.js | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/permission.js b/src/permission.js
index 1db065d..8a7e72c 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -13,6 +13,16 @@
whiteList.push(OAUTH2_LOGIN_PAGE_PATH)
router.beforeEach((to, from, next) => {
+ //update-begin---author:scott ---date:2022-10-13 for锛歔jeecg-boot/issues/4091]澶氱骇璺敱缂撳瓨闂 #4091-----------
+ //瑙ｅ喅涓夌骇鑿滃崟鏃犳硶缂撳瓨闂
+ //鍙傝�冿細 https://blog.csdn.net/qq_37322135/article/details/126013301
+ //鍙傝�冿細 https://blog.csdn.net/cwin8951/article/details/106644118
+ if (to.matched && to.matched.length>3) {
+ to.matched.splice(2, to.matched.length - 3)
+ }
+ //update-end---author:scott ---date::2022-10-13 for锛歔jeecg-boot/issues/4091]澶氱骇璺敱缂撳瓨闂 #4091--------------
+
+
NProgress.start() // start progress bar
if (Vue.ls.get(ACCESS_TOKEN)) {
--
Gitblit v1.9.3