Zimo пре 3 дана
родитељ
комит
ab31129412

+ 9 - 1
src/layout/components/Menu/src/components/useRenderMenuItem.tsx

@@ -39,7 +39,15 @@ export const useRenderMenuItem = () =>
           } else if (currentSource === 'qhse') {
             return (
               !v.meta?.hidden &&
-              ['QHSE', '台账管理', '证书管理', '仪器检测', '使用记录'].includes(v.meta?.title)
+              [
+                'QHSE',
+                '计量器具',
+                '仪器检测',
+                '台账管理',
+                '证书管理',
+                '仪器检测',
+                '使用记录'
+              ].includes(v.meta?.title)
             )
           } else {
             return !v.meta?.hidden

+ 1 - 1
src/layout/components/TagsView/src/helper.ts

@@ -13,7 +13,7 @@ export const filterAffixTags = (routes: AppRouteRecordRaw[], parentPath = '') =>
       route.meta.affix = true
     } else if (currentSource === 'spzx' && tagPath === '/video_center/protocol') {
       route.meta.affix = true
-    } else if (currentSource === 'qhse' && tagPath === '/qhse/ledger') {
+    } else if (currentSource === 'qhse' && tagPath === '/qhse/measure/ledger') {
       route.meta.affix = true
     }
     if (meta?.affix) {

+ 3 - 3
src/permission.ts

@@ -115,7 +115,7 @@ router.beforeEach(async (to, from, next) => {
 
       if (source && source === 'qhse') {
         sessionStorage.setItem('LOGIN_SOURCE', source as string)
-        next({ path: '/qhse/ledger' })
+        next({ path: '/qhse/measure/ledger' })
       }
 
       next({ path: '/' })
@@ -175,7 +175,7 @@ router.beforeEach(async (to, from, next) => {
 
       if (source && source === 'qhse') {
         sessionStorage.setItem('LOGIN_SOURCE', source as string)
-        next({ path: '/qhse/ledger' })
+        next({ path: '/qhse/measure/ledger' })
       }
 
       next({ path: '/index' })
@@ -203,7 +203,7 @@ router.beforeEach(async (to, from, next) => {
       } else if (source && source === 'spzx') {
         next(`/login?redirect=/video_center/protocol`)
       } else if (source && source === 'qhse') {
-        next(`/login?redirect=/qhse/ledger`)
+        next(`/login?redirect=/qhse/measure/ledger`)
       } else next(`/login?redirect=${to.fullPath}`) // 否则全部重定向到登录页
     }
   }