From 523d7a54fb07fdf756fbc4faa5eb7fef7263a556 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 07 九月 2023 09:46:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router/index.js | 21 ++++++++-------------
1 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 54332c1..8bc2979 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -118,12 +118,12 @@
component: () => import('@/views/experiment/reportAuditing/index'),
meta: { title: '鎶ュ憡瀹℃牳', icon: 'tree' }
},
- {
- path: 'nonConformanceReview',
- name: 'NonConformanceReview',
- component: () => import('@/views/experiment/nonConformanceReview/index'),
- meta: { title: '涓嶅悎鏍煎搧鍙嶉', icon: 'tree' }
- },
+ // {
+ // path: 'nonConformanceReview',
+ // name: 'NonConformanceReview',
+ // component: () => import('@/views/experiment/nonConformanceReview/index'),
+ // meta: { title: '涓嶅悎鏍煎搧鍙嶉', icon: 'tree' }
+ // },
{
path: 'nonConformingFeedback',
name: 'NonConformingFeedback',
@@ -321,11 +321,6 @@
hidden: true
},
{
- path: '/addCommision',
- component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
- hidden: true
-},
-{
path: '/',
component: Layout,
redirect: '/home',
@@ -357,7 +352,7 @@
function createRouter(Routees) {
if (JSON.parse(sessionStorage.getItem("user")) != undefined && JSON.parse(sessionStorage.getItem("user")) != null) {
let sessionLayerId = JSON.parse(sessionStorage.getItem("user")).sessionLayerId
- if (sessionLayerId != 'f5c8bcb7d5a0fd27e2323280f7e98cad') {
+ if (sessionLayerId != 'c3284d0f94606de1fd2af172aba15bf3') {
let role = JSON.parse(sessionStorage.getItem("user")).role
let menuFather = baseRouter
const dataMenuFather = fn3(menuFather)
@@ -421,7 +416,7 @@
Routees = baseRouter
}
return new Router({
- mode: 'history', // require service support
+ // mode: 'history', // require service support
scrollBehavior: () => ({ y: 0 }),
routes: Routees
})
--
Gitblit v1.9.3