From 5fd9ab0d9b04fd7c29d2a147e3717ab7eff431be Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 13 Jul 2021 20:52:33 +0800
Subject: [PATCH] 整合冲突
---
src/router/views/index.js | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 15e0374..26fc96d 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -156,17 +156,30 @@
import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuard')
}]
}, {
- path: '/securityGuard',
+ path: '/securityGuardDetail',
component: Layout,
- redirect: '/securityGuard/securityGuardDetail',
+ redirect: '/securityGuardDetail/index',
children: [{
- path: 'securityGuardDetail',
+ path: 'index',
name: '保安员详情',
meta: {
i18n: 'dict'
},
component: () =>
import( /* webpackChunkName: "views" */ '@/views/securityGuard/securityGuardDetail')
+ }]
+}, {
+ path: '/resource',
+ component: Layout,
+ redirect: '/resource/attach',
+ children: [{
+ path: 'attach',
+ name: '附件上传',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/resource/attach')
}]
}, {
path: '/securityUnitChild',
@@ -210,6 +223,19 @@
// }]
// },
{
+ path: '/desk',
+ component: Layout,
+ redirect: '/desk/notice',
+ children: [{
+ path: 'index',
+ name: '通知公告',
+ meta: {
+ i18n: 'dict'
+ },
+ component: () =>
+ import( /* webpackChunkName: "views" */ '@/views/desk/notice')
+ }]
+}, {
path: '/dispatch',
component: Layout,
redirect: '/dispatch/dispatch',
--
Gitblit v1.9.3