From b580f0402ff66d0c5b74460edcb920a516b1ce6e Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 07 九月 2023 18:00:54 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.218.113:9001/r/lims-before
---
src/router/index.js | 79 +++++++++++++++++++--------------------
1 files changed, 38 insertions(+), 41 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index 54332c1..da62bb5 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -42,21 +42,21 @@
path: '/standardLibrary',
component: Layout,
redirect: '/standardLibrary/index',
- meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' },
+ // meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-help' },
children: [
{
path: 'index',
name: 'StandardLibrary',
component: () => import('@/views/standardLibrary/index'),
- meta: { title: '鏍囧噯搴�', icon: 'form' }
+ meta: { title: '鏍囧噯搴�', icon: 'el-icon-s-management' }
},
- {
- path: 'specificationDetails/:id',
- name: 'SpecificationDetails',
- // hidden: true,
- component: () => import('@/views/standardLibrary/SpecificationDetails'),
- meta: { title: '浜у搧瑙勬牸璇︽儏', icon: 'form', show: false }
- }
+ // {
+ // path: 'specificationDetails/:id',
+ // name: 'SpecificationDetails',
+ // // hidden: true,
+ // component: () => import('@/views/standardLibrary/SpecificationDetails'),
+ // meta: { title: '浜у搧瑙勬牸璇︽儏', icon: 'form', show: false }
+ // }
]
},
{
@@ -64,7 +64,7 @@
component: Layout,
redirect: '/inspectionManagement/commissionInspection',
name: 'InspectionManagement',
- meta: { title: '鎶ユ绠＄悊', icon: 'el-icon-s-help' },
+ meta: { title: '鎶ユ绠＄悊', icon: 'el-icon-s-order' },
children: [
{
path: 'commissionInspection',
@@ -85,7 +85,7 @@
component: Layout,
redirect: '/experiment/inspectionApplication',
name: 'Experiment',
- meta: { title: '璇曢獙绠＄悊', icon: 'el-icon-s-help' },
+ meta: { title: '璇曢獙绠＄悊', icon: 'el-icon-s-marketing' },
children: [
{
path: 'inspectionApplication',
@@ -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',
@@ -143,7 +143,7 @@
component: Layout,
redirect: '/laboratory/ledger',
name: 'Laboratory',
- meta: { title: '瀹為獙瀹ょ鐞�', icon: 'el-icon-s-help' },
+ meta: { title: '瀹為獙瀹ょ鐞�', icon: 'el-icon-cpu' },
children: [
{
path: 'ledger',
@@ -221,7 +221,7 @@
component: Layout,
redirect: '/chart/center',
name: 'Chart',
- meta: { title: '鏅鸿兘鍥捐〃', icon: 'el-icon-s-help' },
+ meta: { title: '鏅鸿兘鍥捐〃', icon: 'el-icon-s-data' },
children: [
{
path: 'center',
@@ -254,19 +254,20 @@
component: Layout,
redirect: '/message/toDo',
name: 'Message',
- meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
+ // meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
children: [
{
path: 'toDo',
name: 'ToDo',
component: () => import('@/views/message/toDo/index'),
- meta: { title: '鎴戠殑寰呭姙', icon: 'tree' }
+ // meta: { title: '娑堟伅寰呭姙', icon: 'tree' }
+ meta: { title: '鎴戠殑寰呭姙', icon: 'el-icon-s-promotion' },
},
- {
- path: 'message',
- name: 'Message',
- component: () => import('@/views/message/message/index'),
- },
+ // {
+ // path: 'message',
+ // name: 'Message',
+ // component: () => import('@/views/message/message/index'),
+ // },
]
},
{
@@ -274,20 +275,21 @@
component: Layout,
redirect: '/personal/myInformation',
name: 'Personal',
- meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' },
+ // meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' },
children: [
{
path: 'myInformation',
name: 'MyInformation',
component: () => import('@/views/personal/myInformation/index'),
- meta: { title: '鎴戠殑淇℃伅', icon: 'table' }
+ // meta: { title: '涓汉绠＄悊', icon: 'el-icon-s-help' }
+ meta: { title: '鎴戠殑淇℃伅', icon: 'el-icon-user-solid' }
},
- {
- path: 'myBusiness',
- name: 'MyBusiness',
- component: () => import('@/views/personal/myBusiness/index'),
- meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
- }
+ // {
+ // path: 'myBusiness',
+ // name: 'MyBusiness',
+ // component: () => import('@/views/personal/myBusiness/index'),
+ // meta: { title: '鎴戠殑浼佷笟', icon: 'tree', show: false }
+ // }
]
},
{
@@ -318,11 +320,6 @@
{
path: '/404',
component: () => import('@/views/404'),
- hidden: true
-},
-{
- path: '/addCommision',
- component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
hidden: true
},
{
@@ -357,7 +354,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 +418,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