diff --git a/src/api/index1.js b/src/api/index1.js index b2fdae52..d4bec231 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-01-09 15:16:47 + * @LastEditTime: 2023-01-09 16:29:37 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -162,7 +162,7 @@ export const AssessmentManagementMessage = (obj) => http.get(`/admin/student/get // 导出任务学员信息 export const exportTaskStudent = (obj) => http.post('/admin/student/exportTaskStudent', obj) //导出任务作业 -export const exportHomeWork = (obj) => http.post('/admin/student/exportHomeWork', obj) +export const exportHomeWork = (obj) => http.get('/admin/student/exportHomeWork', { params: obj }) //签到 export const attendanceSign = (obj) => http.post('/stu/task/attendance/sign', obj) //请假 @@ -178,4 +178,7 @@ export const batchImportScore = (obj) => headers: { "Content-Type": "multipart/form-data" }, }); //数据导入状态 -export const getImportStatus = (uuid) => http.get('/admin/student/getImportStatus', { params: { uuid: uuid } }) \ No newline at end of file +export const getImportStatus = (uuid) => http.get('/admin/student/getImportStatus', { params: { uuid: uuid } }) + +//导出作业 +// export const exportHomeWork=(obj)=>http.get('admin/student/exportHomeWork',{params:obj}) \ No newline at end of file diff --git a/src/components/Modals/ExportHomeWork.vue b/src/components/Modals/ExportHomeWork.vue index 5680e092..7c2d7d15 100644 --- a/src/components/Modals/ExportHomeWork.vue +++ b/src/components/Modals/ExportHomeWork.vue @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2023-01-07 17:25:14 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-01-09 16:19:37 + * @LastEditTime: 2023-01-09 16:35:38 * @FilePath: /fe-manage/src/components/Modals/ExportHomeWork.vue * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE --> @@ -50,6 +50,10 @@ export default { type: Boolean, default: false, }, + downloadUrl: { + type: String, + default: null, + }, }, setup(props, ctx) { const state = reactive({}); @@ -57,14 +61,18 @@ export default { const clostModal = () => { ctx.emit("update:exportHomeWorkV", false); }; - // //下载作业 - // const downloadHomeWork=()=>{ - // // props.url - // } + //下载作业 + const downloadHomeWork = () => { + // props.url + if (props.downloadUrl) { + window.open(props.downloadUrl); + } + }; console.log("props", props); return { ...toRefs(state), clostModal, + downloadHomeWork, }; }, }; diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 5c8ef367..518f1f12 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -567,7 +567,7 @@ export default { courseId: Number(props.projectTaskInfo.courseId), projectId: Number(props.projectTaskInfo.projectId), // routerId: Number(props.projectTaskInfo.projectId), - studentId: Number(text.record.studentId), + ids: [Number(text.record.studentId)], studentName: text.record.studentName, taskId: Number(props.projectTaskInfo.projectTaskId), taskType: Number(props.projectTaskInfo.type), diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index db53afd2..be98cb05 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -167,7 +167,10 @@ - +