diff --git a/src/request/training_process_management.js b/src/request/training_process_management.js index 00bb569..bc4593f 100644 --- a/src/request/training_process_management.js +++ b/src/request/training_process_management.js @@ -21,6 +21,7 @@ export const getAssociatedCoursewareNameList = (params) => export const getClassManagementList = (params) => post("/class/list", params); // 班级管理列表 export const setClassManagementDelete = (params) => post("/class/delete", params); // 班级管理删除 +export const setClassFinish = (params) => post("/class/finish", params); // 班级管理完成 export const setClassManagementDelay = (params) => post("/class/postpone", params); // 班级管理延期 export const getPersonnelList = (params) => diff --git a/src/views/training_process_management/class_management/components/curriculum.vue b/src/views/training_process_management/class_management/components/curriculum.vue index 5464272..64d0408 100644 --- a/src/views/training_process_management/class_management/components/curriculum.vue +++ b/src/views/training_process_management/class_management/components/curriculum.vue @@ -100,7 +100,7 @@ > 上一步 - 完成 + 完成 { + await ElMessageBox.confirm( + "完成之后将开班,只能新增学员,不能再进行其它更改,确认继续吗?", + { + type: "warning", + } + ); + await setClassFinish({ CLASS_ID, EXAMINATION }); + ElMessage.success("班级添加完成"); + fnResetPagination(); + router.back(); + }, + { atBegin: true } +); diff --git a/src/views/training_process_management/class_management/components/student.vue b/src/views/training_process_management/class_management/components/student.vue index d8bf7a3..c6e7797 100644 --- a/src/views/training_process_management/class_management/components/student.vue +++ b/src/views/training_process_management/class_management/components/student.vue @@ -274,20 +274,16 @@ const fnGetLearningRecords = async () => { }); window.location.href = import.meta.env[import.meta.env.DEV ? "VITE_PROXY" : "VITE_BASE_URL"] + - "/student/exportStudentInfo?CLASS_ID=" + - CLASS_ID + - "&START_TIME=" + - searchForm.value.TIME?.[0] + - "&END_TIME=" + - searchForm.value.TIME?.[1] + - "&DEPARTMENT_ID=" + - searchForm.value.DEPARTMENT_ID + - "&POST_ID=" + - searchForm.value.POST_ID + - "&STUDYSTATE=" + - searchForm.value.STUDYSTATE + - "&STAGEEXAMSTATE=" + - searchForm.value.STAGEEXAMSTATE; + "/student/exportStudentInfo?CLASS_ID=" + + CLASS_ID + + "&START_TIME=" + + searchForm.value.TIME?.[0] || + "" + "&END_TIME=" + searchForm.value.TIME?.[1] || + "" + "&DEPARTMENT_ID=" + searchForm.value.DEPARTMENT_ID || + "" + "&POST_ID=" + searchForm.value.POST_ID || + "" + "&STUDYSTATE=" + searchForm.value.STUDYSTATE || + "" + "&STAGEEXAMSTATE=" + searchForm.value.STAGEEXAMSTATE || + ""; ElMessage.success("导出成功"); }; const fnDelete = debounce( diff --git a/src/views/training_process_management/class_management/components/test_paper_type.vue b/src/views/training_process_management/class_management/components/test_paper_type.vue index 0e2a234..323f020 100644 --- a/src/views/training_process_management/class_management/components/test_paper_type.vue +++ b/src/views/training_process_management/class_management/components/test_paper_type.vue @@ -96,7 +96,7 @@ const data = reactive({ OPTIONALDANYUANTICOUNT: 0, OPTIONALDUOXUANTICOUNT: 0, OPTIONALPANDUITICOUNT: 0, - COURSEWAREIDS: "", + COURSEWAREIDS: [], EXAMNAME: "", EXAMSCORE: 0, PASSSCORE: 0, diff --git a/src/views/training_process_management/class_management/index.vue b/src/views/training_process_management/class_management/index.vue index e6a8155..c329555 100644 --- a/src/views/training_process_management/class_management/index.vue +++ b/src/views/training_process_management/class_management/index.vue @@ -141,12 +141,7 @@ prop="TRAININGTYPE_NAME" width="150" /> - - +