Browse Source

合并

test
lenghui 5 months ago
parent
commit
0d29d9cff3
  1. 3655
      work/package-lock.json
  2. 2
      work/src/api/ShowApi.js
  3. 9
      work/src/api/index.js
  4. 9
      work/src/router/index.js
  5. 13
      work/src/views/WorksShowView.vue
  6. 25
      work/vite.config.js

3655
work/package-lock.json
File diff suppressed because it is too large
View File

2
work/src/api/ShowApi.js

@ -3,7 +3,7 @@ import service from "."
const ShowApi = { const ShowApi = {
//获取作业列表 //获取作业列表
getWorks(){ getWorks(){
return service.post('/homework_client/gethomeworklist')
return service.post('/api/homework_client/gethomeworklist')
}, },
} }
export default ShowApi; export default ShowApi;

9
work/src/api/index.js

@ -1,18 +1,9 @@
import axios from "axios"; import axios from "axios";
const service = axios.create({ const service = axios.create({
<<<<<<< HEAD
baseURL: '/api', baseURL: '/api',
}); });
=======
// baseURL: 'http://192.168.8.191:8080',
// baseURL: 'http://localhost:8080',
baseURL: '/api',
});
// http://192.168.8.191:8080
>>>>>>> 6bb4fa11ad521daab009a817457da00ebd73d42d
//Axios的响应拦截器.. //Axios的响应拦截器..
service.interceptors.response.use(resp => { service.interceptors.response.use(resp => {
return resp.data; return resp.data;

9
work/src/router/index.js

@ -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', path: '/show',
name: 'workshow', name: 'workshow',
component: WorksShowView component: WorksShowView
=======
},
{ {
path:'/doWork', path:'/doWork',
name:'doWork', name:'doWork',
component: DoHomeworkView component: DoHomeworkView
>>>>>>> 6bb4fa11ad521daab009a817457da00ebd73d42d
} }
] ]
}) })

13
work/src/views/WorksShowView.vue

@ -2,6 +2,7 @@
import { ref } from 'vue'; import { ref } from 'vue';
import ShowApi from '../api/ShowApi'; import ShowApi from '../api/ShowApi';
import { format } from 'date-fns'; import { format } from 'date-fns';
import router from "@/router/index.js";
// //
@ -19,18 +20,6 @@ function loadWorks() {
console.log("后", works.value); console.log("后", works.value);
}) })
// works.value = [
// {
// id:1,
// name:"",
// endData:"2024-09-10"
// },
// {
// id:2,
// name:"",
// endData:"2024-09-10"
// }
// ]
} }
loadWorks(); loadWorks();
// //

25
work/vite.config.js

@ -0,0 +1,25 @@
import { fileURLToPath, URL } from 'node:url'
import { defineConfig } from 'vite'
import vue from '@vitejs/plugin-vue'
// https://vite.dev/config/
export default defineConfig({
plugins: [
vue(),
],
resolve: {
alias: {
'@': fileURLToPath(new URL('./src', import.meta.url))
},
},
server: {
proxy: {
'/api': {
target: 'http://192.168.9.19:8080',
changeOrigin: true,
rewrite: (path) => path.replace(/^\/api/, '')
}
}
}
})
Loading…
Cancel
Save