From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/router/route.ts | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/router/route.ts b/src/router/route.ts
index 1aa3929..cbfd47e 100644
--- a/src/router/route.ts
+++ b/src/router/route.ts
@@ -72,9 +72,9 @@
}
},
{
- path: '/homeMenu',
- name: 'homeMenu',
- component: () => import('/@/views/homeMenu/homeMenu.vue'),
+ path: '/newMenu',
+ name: 'newMenu',
+ component: () => import('/@/views/newHome/index.vue'),
meta: {
title: '首页',
isKeepAlive: false
@@ -95,5 +95,13 @@
meta: {
title: '巡检路线'
}
+ },
+ {
+ path: '/dpIndex',
+ name: 'dpIndex',
+ component: () => import('/@/views/doublePrevent/dpIndex/index.vue'),
+ meta: {
+ title: '双重预防首页'
+ }
}
];
--
Gitblit v1.9.2