From 49be3d0b1921172dcbf5aa59749243b9af8a8773 Mon Sep 17 00:00:00 2001
From: odc.xiaohui <xiaohui@Q1>
Date: 星期三, 24 五月 2023 11:59:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router/index.js | 32 +++++++++++++++++++++-----------
1 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/src/router/index.js b/src/router/index.js
index de56f0b..5eeac31 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,15 +24,20 @@
name: 'workbench',
component: () => import('../views/workbench/Workbench.vue')
},
- {
- path: '/people',
- name: 'people',
- component: () => import('../views/manager/People.vue')
- },
+ // {
+ // path: '/people',
+ // name: 'people',
+ // component: () => import('../views/manager/People.vue')
+ // },
{
path: '/user',
name: 'user',
component: () => import('../views/manager/User.vue')
+ },
+ {
+ path: '/police',
+ name: 'police',
+ component: () => import('../views/manager/Police.vue')
},
{
path: '/entry',
@@ -44,11 +49,11 @@
name: 'group',
component: () => import('../views/cause/Group.vue')
},
- {
- path: '/search',
- name: 'search',
- component: () => import('../views/cause/Search.vue')
- },
+ // {
+ // path: '/search',
+ // name: 'search',
+ // component: () => import('../views/cause/Search.vue')
+ // },
{
path: '/audit',
name: 'audit',
@@ -58,6 +63,11 @@
path: '/publicity',
name: 'publicity',
component: () => import('../views/common/Publicity.vue')
+ },
+ {
+ path: '/announcement',
+ name: 'announcement',
+ component: () => import('../views/common/announcement.vue')
},
{
path: '/question',
@@ -78,7 +88,7 @@
})
// 鎸傝浇璺敱瀵艰埅瀹堝崼
-router.beforeEach((to, drom, next) => {
+router.beforeEach((to, from, next) => {
// to 灏嗚璁块棶鐨勮矾寰�
// from 浠ｈ〃浠庡摢涓矾寰勮烦杞�
// next 鏄竴涓嚱鏁帮紝琛ㄧず鏀捐
--
Gitblit v1.8.0