diff --git a/electron.vite.config.mjs b/electron.vite.config.mjs index c48cc00..9b9c503 100644 --- a/electron.vite.config.mjs +++ b/electron.vite.config.mjs @@ -24,8 +24,8 @@ export default defineConfig({ server: { proxy: { '/dev-api': { - target: 'http://27.128.240.72:7865', - // target: 'http://192.168.2.52:7863', + // target: 'http://27.128.240.72:7865', + target: 'http://192.168.2.52:7863', changeOrigin: true, rewrite: (p) => p.replace(/^\/dev-api/, '') } diff --git a/src/renderer/src/api/classManage/index.js b/src/renderer/src/api/classManage/index.js index 14a8314..e783daf 100644 --- a/src/renderer/src/api/classManage/index.js +++ b/src/renderer/src/api/classManage/index.js @@ -130,3 +130,19 @@ export function addStudentmainByNameArray(data) { data: data }) } +//新增课程预约 +export function addSmartClassReserv(data) { + return request({ + url: '/smarttalk/classReserv/addSmartClassReserv', + method: 'post', + data: data + }) +} +//查询课程预约 +export function getSelfReserv() { + return request({ + url: '/smarttalk/classReserv/getSelfReserv', + method: 'get' + }) +} + diff --git a/src/renderer/src/layout/components/Header.vue b/src/renderer/src/layout/components/Header.vue index 00deb25..799bf33 100644 --- a/src/renderer/src/layout/components/Header.vue +++ b/src/renderer/src/layout/components/Header.vue @@ -35,6 +35,7 @@ 个人中心 + 课程预约 班级中心 退出登录 diff --git a/src/renderer/src/router/index.js b/src/renderer/src/router/index.js index b4c3a54..eab5de5 100644 --- a/src/renderer/src/router/index.js +++ b/src/renderer/src/router/index.js @@ -45,6 +45,12 @@ export const constantRoutes = [ name: 'profile', meta: {title: '个人中心'} }, + { + path: '/classReserv', + component: () => import('@/views/classManage/classReserv.vue'), + name: 'classReserv', + meta: {title: '课程预约'} + }, { path: '/class', component: () => import('@/views/classManage/index.vue'), diff --git a/src/renderer/src/views/classManage/classReserv.vue b/src/renderer/src/views/classManage/classReserv.vue new file mode 100644 index 0000000..f47373b --- /dev/null +++ b/src/renderer/src/views/classManage/classReserv.vue @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + diff --git a/src/renderer/src/views/classManage/reserv-item.vue b/src/renderer/src/views/classManage/reserv-item.vue new file mode 100644 index 0000000..ab720ca --- /dev/null +++ b/src/renderer/src/views/classManage/reserv-item.vue @@ -0,0 +1,72 @@ + + + + + + + + {{item.className}} + {{ item.classType }} + {{ item.classSubject }} + + + {{item.classDay}} {{item.startTime}} ~ {{item.classDay}} {{item.endTime}} {{item.createUserName}}老师 + + + {{ index===0? tag.name:'、'+tag.name }} + + + + 上课 + 编辑 + 下课 + 删除 + + + + + diff --git a/src/renderer/src/views/prepare/container/reserv.vue b/src/renderer/src/views/prepare/container/reserv.vue index 4288303..469836d 100644 --- a/src/renderer/src/views/prepare/container/reserv.vue +++ b/src/renderer/src/views/prepare/container/reserv.vue @@ -78,8 +78,19 @@