diff --git a/package.json b/package.json index a7e76984..6259f142 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "@wangeditor/editor-for-vue": "^5.1.10", "@zxcvbn-ts/core": "^3.0.4", "animate.css": "^4.1.1", - "axios": "^1.6.8", + "axios": "1.9.0", "benz-amr-recorder": "^1.1.5", "bpmn-js-token-simulation": "^0.36.0", "camunda-bpmn-moddle": "^7.0.1", diff --git a/src/api/infra/demo/demo01/index.ts b/src/api/infra/demo/demo01/index.ts index e34a05d1..982049c5 100644 --- a/src/api/infra/demo/demo01/index.ts +++ b/src/api/infra/demo/demo01/index.ts @@ -1,40 +1,50 @@ import request from '@/config/axios' +import type { Dayjs } from 'dayjs' -export interface Demo01ContactVO { - id: number - name: string - sex: number - birthday: Date - description: string - avatar: string +/** 示例联系人信息 */ +export interface Demo01Contact { + id: number // 编号 + name?: string // 名字 + sex?: number // 性别 + birthday?: string | Dayjs // 出生年 + description?: string // 简介 + avatar: string // 头像 } -// 查询示例联系人分页 -export const getDemo01ContactPage = async (params) => { - return await request.get({ url: `/infra/demo01-contact/page`, params }) -} +// 示例联系人 API +export const Demo01ContactApi = { + // 查询示例联系人分页 + getDemo01ContactPage: async (params: any) => { + return await request.get({ url: `/infra/demo01-contact/page`, params }) + }, -// 查询示例联系人详情 -export const getDemo01Contact = async (id: number) => { - return await request.get({ url: `/infra/demo01-contact/get?id=` + id }) -} + // 查询示例联系人详情 + getDemo01Contact: async (id: number) => { + return await request.get({ url: `/infra/demo01-contact/get?id=` + id }) + }, -// 新增示例联系人 -export const createDemo01Contact = async (data: Demo01ContactVO) => { - return await request.post({ url: `/infra/demo01-contact/create`, data }) -} + // 新增示例联系人 + createDemo01Contact: async (data: Demo01Contact) => { + return await request.post({ url: `/infra/demo01-contact/create`, data }) + }, -// 修改示例联系人 -export const updateDemo01Contact = async (data: Demo01ContactVO) => { - return await request.put({ url: `/infra/demo01-contact/update`, data }) -} + // 修改示例联系人 + updateDemo01Contact: async (data: Demo01Contact) => { + return await request.put({ url: `/infra/demo01-contact/update`, data }) + }, -// 删除示例联系人 -export const deleteDemo01Contact = async (id: number) => { - return await request.delete({ url: `/infra/demo01-contact/delete?id=` + id }) -} + // 删除示例联系人 + deleteDemo01Contact: async (id: number) => { + return await request.delete({ url: `/infra/demo01-contact/delete?id=` + id }) + }, -// 导出示例联系人 Excel -export const exportDemo01Contact = async (params) => { - return await request.download({ url: `/infra/demo01-contact/export-excel`, params }) + /** 批量删除示例联系人 */ + deleteDemo01ContactList: async (ids: number[]) => { + return await request.delete({ url: `/infra/demo01-contact/delete-list?ids=${ids.join(',')}` }) + }, + + // 导出示例联系人 Excel + exportDemo01Contact: async (params) => { + return await request.download({ url: `/infra/demo01-contact/export-excel`, params }) + } } diff --git a/src/api/infra/demo/demo03/erp/index.ts b/src/api/infra/demo/demo03/erp/index.ts index a2ab5398..c641ed07 100644 --- a/src/api/infra/demo/demo03/erp/index.ts +++ b/src/api/infra/demo/demo03/erp/index.ts @@ -1,91 +1,127 @@ import request from '@/config/axios' +import type { Dayjs } from 'dayjs'; -export interface Demo03StudentVO { - id: number - name: string - sex: number - birthday: Date - description: string +/** 学生课程信息 */ +export interface Demo03Course { + id: number; // 编号 + studentId?: number; // 学生编号 + name?: string; // 名字 + score?: number; // 分数 } -// 查询学生分页 -export const getDemo03StudentPage = async (params) => { - return await request.get({ url: `/infra/demo03-student/page`, params }) +/** 学生班级信息 */ +export interface Demo03Grade { + id: number; // 编号 + studentId?: number; // 学生编号 + name?: string; // 名字 + teacher?: string; // 班主任 } -// 查询学生详情 -export const getDemo03Student = async (id: number) => { - return await request.get({ url: `/infra/demo03-student/get?id=` + id }) +/** 学生信息 */ +export interface Demo03Student { + id: number; // 编号 + name?: string; // 名字 + sex?: number; // 性别 + birthday?: string | Dayjs; // 出生日期 + description?: string; // 简介 } -// 新增学生 -export const createDemo03Student = async (data: Demo03StudentVO) => { - return await request.post({ url: `/infra/demo03-student/create`, data }) -} +// 学生 API +export const Demo03StudentApi = { + // 查询学生分页 + getDemo03StudentPage: async (params: any) => { + return await request.get({ url: `/infra/demo03-student-erp/page`, params }) + }, -// 修改学生 -export const updateDemo03Student = async (data: Demo03StudentVO) => { - return await request.put({ url: `/infra/demo03-student/update`, data }) -} + // 查询学生详情 + getDemo03Student: async (id: number) => { + return await request.get({ url: `/infra/demo03-student-erp/get?id=` + id }) + }, -// 删除学生 -export const deleteDemo03Student = async (id: number) => { - return await request.delete({ url: `/infra/demo03-student/delete?id=` + id }) -} + // 新增学生 + createDemo03Student: async (data: Demo03Student) => { + return await request.post({ url: `/infra/demo03-student-erp/create`, data }) + }, -// 导出学生 Excel -export const exportDemo03Student = async (params) => { - return await request.download({ url: `/infra/demo03-student/export-excel`, params }) -} + // 修改学生 + updateDemo03Student: async (data: Demo03Student) => { + return await request.put({ url: `/infra/demo03-student-erp/update`, data }) + }, + + // 删除学生 + deleteDemo03Student: async (id: number) => { + return await request.delete({ url: `/infra/demo03-student-erp/delete?id=` + id }) + }, + + /** 批量删除学生 */ + deleteDemo03StudentList: async (ids: number[]) => { + return await request.delete({ url: `/infra/demo03-student-erp/delete-list?ids=${ids.join(',')}` }) + }, + + // 导出学生 Excel + exportDemo03Student: async (params) => { + return await request.download({ url: `/infra/demo03-student-erp/export-excel`, params }) + }, // ==================== 子表(学生课程) ==================== -// 获得学生课程分页 -export const getDemo03CoursePage = async (params) => { - return await request.get({ url: `/infra/demo03-student/demo03-course/page`, params }) -} -// 新增学生课程 -export const createDemo03Course = async (data) => { - return await request.post({ url: `/infra/demo03-student/demo03-course/create`, data }) -} + // 获得学生课程分页 + getDemo03CoursePage: async (params) => { + return await request.get({ url: `/infra/demo03-student-erp/demo03-course/page`, params }) + }, + // 新增学生课程 + createDemo03Course: async (data: Demo03Course) => { + return await request.post({ url: `/infra/demo03-student-erp/demo03-course/create`, data }) + }, -// 修改学生课程 -export const updateDemo03Course = async (data) => { - return await request.put({ url: `/infra/demo03-student/demo03-course/update`, data }) -} + // 修改学生课程 + updateDemo03Course: async (data: Demo03Course) => { + return await request.put({ url: `/infra/demo03-student-erp/demo03-course/update`, data }) + }, -// 删除学生课程 -export const deleteDemo03Course = async (id: number) => { - return await request.delete({ url: `/infra/demo03-student/demo03-course/delete?id=` + id }) -} + // 删除学生课程 + deleteDemo03Course: async (id: number) => { + return await request.delete({ url: `/infra/demo03-student-erp/demo03-course/delete?id=` + id }) + }, -// 获得学生课程 -export const getDemo03Course = async (id: number) => { - return await request.get({ url: `/infra/demo03-student/demo03-course/get?id=` + id }) -} + /** 批量删除学生课程 */ + deleteDemo03CourseList: async (ids: number[]) => { + return await request.delete({ url: `/infra/demo03-student-erp/demo03-course/delete-list?ids=${ids.join(',')}` }) + }, + + // 获得学生课程 + getDemo03Course: async (id: number) => { + return await request.get({ url: `/infra/demo03-student-erp/demo03-course/get?id=` + id }) + }, // ==================== 子表(学生班级) ==================== -// 获得学生班级分页 -export const getDemo03GradePage = async (params) => { - return await request.get({ url: `/infra/demo03-student/demo03-grade/page`, params }) -} -// 新增学生班级 -export const createDemo03Grade = async (data) => { - return await request.post({ url: `/infra/demo03-student/demo03-grade/create`, data }) -} + // 获得学生班级分页 + getDemo03GradePage: async (params) => { + return await request.get({ url: `/infra/demo03-student-erp/demo03-grade/page`, params }) + }, + // 新增学生班级 + createDemo03Grade: async (data: Demo03Grade) => { + return await request.post({ url: `/infra/demo03-student-erp/demo03-grade/create`, data }) + }, -// 修改学生班级 -export const updateDemo03Grade = async (data) => { - return await request.put({ url: `/infra/demo03-student/demo03-grade/update`, data }) -} + // 修改学生班级 + updateDemo03Grade: async (data: Demo03Grade) => { + return await request.put({ url: `/infra/demo03-student-erp/demo03-grade/update`, data }) + }, -// 删除学生班级 -export const deleteDemo03Grade = async (id: number) => { - return await request.delete({ url: `/infra/demo03-student/demo03-grade/delete?id=` + id }) -} + // 删除学生班级 + deleteDemo03Grade: async (id: number) => { + return await request.delete({ url: `/infra/demo03-student-erp/demo03-grade/delete?id=` + id }) + }, -// 获得学生班级 -export const getDemo03Grade = async (id: number) => { - return await request.get({ url: `/infra/demo03-student/demo03-grade/get?id=` + id }) + /** 批量删除学生班级 */ + deleteDemo03GradeList: async (ids: number[]) => { + return await request.delete({ url: `/infra/demo03-student-erp/demo03-grade/delete-list?ids=${ids.join(',')}` }) + }, + + // 获得学生班级 + getDemo03Grade: async (id: number) => { + return await request.get({ url: `/infra/demo03-student-erp/demo03-grade/get?id=` + id }) + }, } diff --git a/src/api/infra/demo/demo03/inner/index.ts b/src/api/infra/demo/demo03/inner/index.ts index e3663078..1000d9cc 100644 --- a/src/api/infra/demo/demo03/inner/index.ts +++ b/src/api/infra/demo/demo03/inner/index.ts @@ -1,57 +1,81 @@ import request from '@/config/axios' +import type { Dayjs } from 'dayjs'; -export interface Demo03StudentVO { - id: number - name: string - sex: number - birthday: Date - description: string +/** 学生课程信息 */ +export interface Demo03Course { + id: number; // 编号 + studentId?: number; // 学生编号 + name?: string; // 名字 + score?: number; // 分数 } -// 查询学生分页 -export const getDemo03StudentPage = async (params) => { - return await request.get({ url: `/infra/demo03-student/page`, params }) +/** 学生班级信息 */ +export interface Demo03Grade { + id: number; // 编号 + studentId?: number; // 学生编号 + name?: string; // 名字 + teacher?: string; // 班主任 } -// 查询学生详情 -export const getDemo03Student = async (id: number) => { - return await request.get({ url: `/infra/demo03-student/get?id=` + id }) +/** 学生信息 */ +export interface Demo03Student { + id: number; // 编号 + name?: string; // 名字 + sex?: number; // 性别 + birthday?: string | Dayjs; // 出生日期 + description?: string; // 简介 + demo03courses?: Demo03Course[] + demo03grade?: Demo03Grade } -// 新增学生 -export const createDemo03Student = async (data: Demo03StudentVO) => { - return await request.post({ url: `/infra/demo03-student/create`, data }) -} +// 学生 API +export const Demo03StudentApi = { + // 查询学生分页 + getDemo03StudentPage: async (params: any) => { + return await request.get({ url: `/infra/demo03-student-inner/page`, params }) + }, -// 修改学生 -export const updateDemo03Student = async (data: Demo03StudentVO) => { - return await request.put({ url: `/infra/demo03-student/update`, data }) -} + // 查询学生详情 + getDemo03Student: async (id: number) => { + return await request.get({ url: `/infra/demo03-student-inner/get?id=` + id }) + }, -// 删除学生 -export const deleteDemo03Student = async (id: number) => { - return await request.delete({ url: `/infra/demo03-student/delete?id=` + id }) -} + // 新增学生 + createDemo03Student: async (data: Demo03Student) => { + return await request.post({ url: `/infra/demo03-student-inner/create`, data }) + }, -// 导出学生 Excel -export const exportDemo03Student = async (params) => { - return await request.download({ url: `/infra/demo03-student/export-excel`, params }) -} + // 修改学生 + updateDemo03Student: async (data: Demo03Student) => { + return await request.put({ url: `/infra/demo03-student-inner/update`, data }) + }, + + // 删除学生 + deleteDemo03Student: async (id: number) => { + return await request.delete({ url: `/infra/demo03-student-inner/delete?id=` + id }) + }, + + /** 批量删除学生 */ + deleteDemo03StudentList: async (ids: number[]) => { + return await request.delete({ url: `/infra/demo03-student-inner/delete-list?ids=${ids.join(',')}` }) + }, + + // 导出学生 Excel + exportDemo03Student: async (params) => { + return await request.download({ url: `/infra/demo03-student-inner/export-excel`, params }) + }, // ==================== 子表(学生课程) ==================== -// 获得学生课程列表 -export const getDemo03CourseListByStudentId = async (studentId) => { - return await request.get({ - url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId - }) -} + // 获得学生课程列表 + getDemo03CourseListByStudentId: async (studentId) => { + return await request.get({ url: `/infra/demo03-student-inner/demo03-course/list-by-student-id?studentId=` + studentId }) + }, // ==================== 子表(学生班级) ==================== -// 获得学生班级 -export const getDemo03GradeByStudentId = async (studentId) => { - return await request.get({ - url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId - }) + // 获得学生班级 + getDemo03GradeByStudentId: async (studentId) => { + return await request.get({ url: `/infra/demo03-student-inner/demo03-grade/get-by-student-id?studentId=` + studentId }) + }, } diff --git a/src/api/infra/demo/demo03/normal/index.ts b/src/api/infra/demo/demo03/normal/index.ts index e3663078..56a824dd 100644 --- a/src/api/infra/demo/demo03/normal/index.ts +++ b/src/api/infra/demo/demo03/normal/index.ts @@ -1,57 +1,81 @@ import request from '@/config/axios' +import type { Dayjs } from 'dayjs'; -export interface Demo03StudentVO { - id: number - name: string - sex: number - birthday: Date - description: string +/** 学生课程信息 */ +export interface Demo03Course { + id: number; // 编号 + studentId?: number; // 学生编号 + name?: string; // 名字 + score?: number; // 分数 } -// 查询学生分页 -export const getDemo03StudentPage = async (params) => { - return await request.get({ url: `/infra/demo03-student/page`, params }) +/** 学生班级信息 */ +export interface Demo03Grade { + id: number; // 编号 + studentId?: number; // 学生编号 + name?: string; // 名字 + teacher?: string; // 班主任 } -// 查询学生详情 -export const getDemo03Student = async (id: number) => { - return await request.get({ url: `/infra/demo03-student/get?id=` + id }) +/** 学生信息 */ +export interface Demo03Student { + id: number; // 编号 + name?: string; // 名字 + sex?: number; // 性别 + birthday?: string | Dayjs; // 出生日期 + description?: string; // 简介 + demo03courses?: Demo03Course[] + demo03grade?: Demo03Grade } -// 新增学生 -export const createDemo03Student = async (data: Demo03StudentVO) => { - return await request.post({ url: `/infra/demo03-student/create`, data }) -} +// 学生 API +export const Demo03StudentApi = { + // 查询学生分页 + getDemo03StudentPage: async (params: any) => { + return await request.get({ url: `/infra/demo03-student-normal/page`, params }) + }, -// 修改学生 -export const updateDemo03Student = async (data: Demo03StudentVO) => { - return await request.put({ url: `/infra/demo03-student/update`, data }) -} + // 查询学生详情 + getDemo03Student: async (id: number) => { + return await request.get({ url: `/infra/demo03-student-normal/get?id=` + id }) + }, -// 删除学生 -export const deleteDemo03Student = async (id: number) => { - return await request.delete({ url: `/infra/demo03-student/delete?id=` + id }) -} + // 新增学生 + createDemo03Student: async (data: Demo03Student) => { + return await request.post({ url: `/infra/demo03-student-normal/create`, data }) + }, -// 导出学生 Excel -export const exportDemo03Student = async (params) => { - return await request.download({ url: `/infra/demo03-student/export-excel`, params }) -} + // 修改学生 + updateDemo03Student: async (data: Demo03Student) => { + return await request.put({ url: `/infra/demo03-student-normal/update`, data }) + }, + + // 删除学生 + deleteDemo03Student: async (id: number) => { + return await request.delete({ url: `/infra/demo03-student-normal/delete?id=` + id }) + }, + + /** 批量删除学生 */ + deleteDemo03StudentList: async (ids: number[]) => { + return await request.delete({ url: `/infra/demo03-student-normal/delete-list?ids=${ids.join(',')}` }) + }, + + // 导出学生 Excel + exportDemo03Student: async (params) => { + return await request.download({ url: `/infra/demo03-student-normal/export-excel`, params }) + }, // ==================== 子表(学生课程) ==================== -// 获得学生课程列表 -export const getDemo03CourseListByStudentId = async (studentId) => { - return await request.get({ - url: `/infra/demo03-student/demo03-course/list-by-student-id?studentId=` + studentId - }) -} + // 获得学生课程列表 + getDemo03CourseListByStudentId: async (studentId) => { + return await request.get({ url: `/infra/demo03-student-normal/demo03-course/list-by-student-id?studentId=` + studentId }) + }, // ==================== 子表(学生班级) ==================== -// 获得学生班级 -export const getDemo03GradeByStudentId = async (studentId) => { - return await request.get({ - url: `/infra/demo03-student/demo03-grade/get-by-student-id?studentId=` + studentId - }) + // 获得学生班级 + getDemo03GradeByStudentId: async (studentId) => { + return await request.get({ url: `/infra/demo03-student-normal/demo03-grade/get-by-student-id?studentId=` + studentId }) + }, } diff --git a/src/views/infra/demo/demo01/Demo01ContactForm.vue b/src/views/infra/demo/demo01/Demo01ContactForm.vue index f317fe76..d32a702a 100644 --- a/src/views/infra/demo/demo01/Demo01ContactForm.vue +++ b/src/views/infra/demo/demo01/Demo01ContactForm.vue @@ -15,7 +15,7 @@ {{ dict.label }} @@ -44,7 +44,10 @@ diff --git a/src/views/infra/demo/demo03/erp/components/Demo03GradeForm.vue b/src/views/infra/demo/demo03/erp/components/Demo03GradeForm.vue index 56872949..49bb490f 100644 --- a/src/views/infra/demo/demo03/erp/components/Demo03GradeForm.vue +++ b/src/views/infra/demo/demo03/erp/components/Demo03GradeForm.vue @@ -7,7 +7,7 @@ label-width="100px" v-loading="formLoading" > - + @@ -21,7 +21,7 @@ diff --git a/src/views/infra/demo/demo03/erp/index.vue b/src/views/infra/demo/demo03/erp/index.vue index e0f1cf48..77dff092 100644 --- a/src/views/infra/demo/demo03/erp/index.vue +++ b/src/views/infra/demo/demo03/erp/index.vue @@ -1,26 +1,29 @@