From 5fdfea676b2bc01e7d2066c32fb2453a9284b25e Mon Sep 17 00:00:00 2001
From: 王震 <10952869+daywangzhen@user.noreply.gitee.com>
Date: 星期六, 26 八月 2023 13:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router/index.js | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index b0b448c..25cd92c 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -47,6 +47,11 @@
hidden:true
},
{
+ path: '/testReport',
+ component: () => import('@/views/template_testReport/index'),
+ hidden:true
+ },
+ {
path: '/',
component: Layout,
redirect: '/home',
@@ -58,6 +63,11 @@
meta: { title: '涓婚〉', icon: 'el-icon-s-home' }
}]
},
+ {
+ path: '/addCommision/:viewId',
+ hidden: true,
+ component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
+ },
{
path: '/standardLibrary',
component: Layout,
@@ -169,16 +179,7 @@
path: 'commissionInspection',
name: 'CommissionInspection',
component: () => import('@/views/inspectionManagement/commissionInspection/index'),
- meta: { title: '濮旀墭妫�楠�', icon: 'table' },
- // children: [
- // {
- // path: 'addCommision',
- // name: 'AddCommision',
- // hidden: true,
- // component: () => import('@/views/inspectionManagement/commissionInspection/addCommision'),
- // meta: { title: '妫�娴嬩俊鎭�', icon: 'table' }
- // }
- // ]
+ meta: { title: '濮旀墭妫�楠�', icon: 'table' }
},
{
path: 'reportForInspection',
@@ -423,22 +424,23 @@
{
path: '/message',
component: Layout,
- redirect: '/message/message',
+ redirect: '/message/toDo',
name: 'Message',
meta: { title: '娑堟伅寰呭姙', icon: 'el-icon-s-help' },
children: [
+ {
+ path: 'toDo',
+ name: 'ToDo',
+ component: () => import('@/views/message/toDo/index'),
+ meta: { title: '鎴戠殑寰呭姙', icon: 'tree' }
+ },
{
path: 'message',
name: 'Message',
+ // hidden: true,
component: () => import('@/views/message/message/index'),
- meta: { title: '鎴戠殑娑堟伅', icon: 'table' }
+ // meta: { title: '鎴戠殑娑堟伅', icon: 'table' }
},
- {
- path: 'toDo',
- name: 'ToDo',
- component: () => import('@/views/message/toDo/index'),
- meta: { title: '鎴戠殑寰呭姙', icon: 'tree' }
- }
]
},
{
@@ -481,7 +483,7 @@
]
const createRouter = () => new Router({
- // mode: 'history', // require service support
+ mode: 'history',
scrollBehavior: () => ({ y: 0 }),
routes: constantRoutes
})
--
Gitblit v1.9.3