Merge branch 'main' of http://47.109.205.240:3000/Web/digital-agriculture-screen
This commit is contained in:
		
						commit
						1fb5b814d8
					
				@ -1,3 +1,3 @@
 | 
				
			|||||||
<template>
 | 
					<template>
 | 
				
			||||||
  <div></div>
 | 
					  <router-view />
 | 
				
			||||||
</template>
 | 
					</template>
 | 
				
			||||||
 | 
				
			|||||||
@ -1,5 +1,5 @@
 | 
				
			|||||||
import { createRouter, createWebHistory } from 'vue-router';
 | 
					import { createRouter, createWebHistory } from 'vue-router';
 | 
				
			||||||
// import Layout from '@/layouts/index.vue';
 | 
					import Layout from '@/layouts/index.vue';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
import demoRouters from './modules/demo';
 | 
					import demoRouters from './modules/demo';
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -16,21 +16,21 @@ export const constantRoutes = [
 | 
				
			|||||||
  //   component: () => import('@/views/error/403.vue'),
 | 
					  //   component: () => import('@/views/error/403.vue'),
 | 
				
			||||||
  //   hidden: true,
 | 
					  //   hidden: true,
 | 
				
			||||||
  // },
 | 
					  // },
 | 
				
			||||||
  // {
 | 
					  {
 | 
				
			||||||
  //   path: '/',
 | 
					    path: '/',
 | 
				
			||||||
  //   name: 'layout',
 | 
					    name: 'layout',
 | 
				
			||||||
  //   component: Layout,
 | 
					    component: Layout,
 | 
				
			||||||
  //   redirect: '/home',
 | 
					    redirect: '/home',
 | 
				
			||||||
  //   meta: { title: '首页', icon: 'House' },
 | 
					    meta: { title: '首页', icon: 'House' },
 | 
				
			||||||
  //   children: [
 | 
					    children: [
 | 
				
			||||||
  //     {
 | 
					      {
 | 
				
			||||||
  //       path: '/home',
 | 
					        path: '/home',
 | 
				
			||||||
  //       component: () => import('@/views/home/index.vue'),
 | 
					        component: () => import('@/views/home/index.vue'),
 | 
				
			||||||
  //       name: 'home',
 | 
					        name: 'home',
 | 
				
			||||||
  //       meta: { title: '首页', icon: 'House' },
 | 
					        meta: { title: '首页', icon: 'House' },
 | 
				
			||||||
  //     },
 | 
					      },
 | 
				
			||||||
  //   ],
 | 
					    ],
 | 
				
			||||||
  // },
 | 
					  },
 | 
				
			||||||
  ...demoRouters,
 | 
					  ...demoRouters,
 | 
				
			||||||
];
 | 
					];
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user