From c4044fb60e53e5c83da4ee645d5160f914e422a3 Mon Sep 17 00:00:00 2001
From: YANGDL <114714267@qq.com>
Date: 星期五, 05 三月 2021 16:17:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/router/routes.js | 40 +++++++++++++++++-----------------------
1 files changed, 17 insertions(+), 23 deletions(-)
diff --git a/src/router/routes.js b/src/router/routes.js
index 76a1402..2bdac51 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -8,30 +8,24 @@
* access: (null) 鍙闂椤甸潰鐨勬潈闄愭暟缁勶紝褰撳墠璺敱璁剧疆鐨勬潈闄愪細褰卞搷瀛愯矾鐢�
* }
*/
+import { mapRoutes } from '@router/map'
// 榛樿璺宠浆璺敱
-import App from "../App";
-import Index from "../views/baseInfoMgr/pipeline/Index";
-import MapTemplate from "../views/MapTemplate";
+import PipeLineIndex from '../views/baseInfoMgr/pipeline/PipeLineIndex'
+import MapTemplate from '../views/MapTemplate'
// 搴旂敤涓氬姟鐩稿叧璺敱锛屾寕杞絤enu涓婄殑page
-export const routes = [{
- path: '/',
- name: 'Main',
- component: App,
- redirect: '/home',
- children: [{
- path: 'home',
- name: 'Home',
- meta: {
- title: '棣栭〉'
- },
- component: MapTemplate
- }, {
- path: 'baseInfoMgr/pipeLine',
- name: 'baseInfoMgr',
- component: Index,
- meta: {
- title: '鍩虹鏁版嵁缁存姢'
- }
- }]
+const mainRoutes = [{
+ path: '/',
+ name: 'Main',
+ component: MapTemplate,
+ redirect: '/mapTemplate',
+ children: [{
+ path: 'baseInfoMgr/pipeLine',
+ name: 'baseInfoMgr',
+ component: PipeLineIndex,
+ meta: {
+ title: '鍩虹鏁版嵁缁存姢'
+ }
+ }]
}]
+export const routes = [...mainRoutes, ...mapRoutes]
--
Gitblit v1.8.0