lixuefeng/fengjie-datascreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix：解决冲突

Browse Source
This commit is contained in:
zjc
2024-12-18 17:43:07 +08:00
parent 587c7a85fa
commit 18ba2e86eb
1 changed files with 7 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/router/index.js
View File

@@ -7,34 +7,21 @@ const router = createRouter({
name: 'home', name: 'home',
component: () => import('@/views/home/index.vue') component: () => import('@/views/home/index.vue')
}, },
<<<<<<< HEAD
{ {
path: '/monitor', path: '/monitor',
name: 'monitor', name: 'monitor',
component: () => import('../views/monitor/index.vue') component: () => import('../views/monitor/index.vue')
}, },
{ {
path: '/testing', path: '/sceneTesting',
name: 'testing', name: 'sceneTesting',
component: () => import('../views/testing/index.vue') component: () => import('../views/testing/index.vue')
}, },
======= {
{ path: '/roadTesting',
path: '/monitor', name: 'roadTesting',
name: 'monitor', component: () => import('../views/testing/road.vue')
component: () => import('../views/monitor/index.vue') },
},
{
path: '/sceneTesting',
name: 'sceneTesting',
component: () => import('../views/testing/index.vue')
},
{
path: '/roadTesting',
name: 'roadTesting',
component: () => import('../views/testing/road.vue')
},
>>>>>>> 5f31856ac0b5635af49bbc759a9121742cbe2f23
{ {
path: '/scenic', path: '/scenic',
name: 'scenic', name: 'scenic',