|
@ -2,11 +2,8 @@ import { createRouter, createWebHistory } from 'vue-router' |
|
|
import HomeView from '../views/HomeView.vue' |
|
|
import HomeView from '../views/HomeView.vue' |
|
|
import LoginView from '../views/LoginView.vue' |
|
|
import LoginView from '../views/LoginView.vue' |
|
|
import AddWorkView from '../views/AddWorkView.vue' |
|
|
import AddWorkView from '../views/AddWorkView.vue' |
|
|
<<<<<<< HEAD |
|
|
|
|
|
import WorksShowView from '../views/WorksShowView.vue' |
|
|
import WorksShowView from '../views/WorksShowView.vue' |
|
|
======= |
|
|
|
|
|
import DoHomeworkView from "@/views/DoHomeworkView.vue"; |
|
|
import DoHomeworkView from "@/views/DoHomeworkView.vue"; |
|
|
>>>>>>> 6bb4fa11ad521daab009a817457da00ebd73d42d |
|
|
|
|
|
|
|
|
|
|
|
const router = createRouter({ |
|
|
const router = createRouter({ |
|
|
history: createWebHistory(import.meta.env.BASE_URL), |
|
|
history: createWebHistory(import.meta.env.BASE_URL), |
|
@ -26,17 +23,15 @@ const router = createRouter({ |
|
|
name:'addwork', |
|
|
name:'addwork', |
|
|
component: AddWorkView |
|
|
component: AddWorkView |
|
|
}, |
|
|
}, |
|
|
<<<<<<< HEAD |
|
|
|
|
|
,{ |
|
|
|
|
|
path:'/show', |
|
|
|
|
|
name:'workshow', |
|
|
|
|
|
|
|
|
{ |
|
|
|
|
|
path: '/show', |
|
|
|
|
|
name: 'workshow', |
|
|
component: WorksShowView |
|
|
component: WorksShowView |
|
|
======= |
|
|
|
|
|
|
|
|
}, |
|
|
{ |
|
|
{ |
|
|
path:'/doWork', |
|
|
path:'/doWork', |
|
|
name:'doWork', |
|
|
name:'doWork', |
|
|
component: DoHomeworkView |
|
|
component: DoHomeworkView |
|
|
>>>>>>> 6bb4fa11ad521daab009a817457da00ebd73d42d |
|
|
|
|
|
} |
|
|
} |
|
|
] |
|
|
] |
|
|
}) |
|
|
}) |
|
|