diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index e1ee545c..cbde5a74 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -689,7 +689,7 @@ export default { } // 新建外部考试 CreateExternalExam(state.test1).then( async res=>{ - console.log(res) + console.log('新建外部考试返回的参数',res) // 添加更新到任务 await updateTask1(res); }).catch(err=>{ @@ -711,6 +711,7 @@ export default { return message.warning("请先选中关卡"); } let editObj1 = { + examType: 1, chapterId: props.isactive, duration: res.data.data.examinationDuration, courseId: res.data.data.examinationId, @@ -732,6 +733,7 @@ export default { }); } else if (props.isLevel == 2) { let editObj = { + examType: 1, courseId: res.data.data.examinationId, duration: res.data.data.examinationDuration, name: res.data.data.examinationName, @@ -753,6 +755,7 @@ export default { }); } else if (props.isLevel == 3) { addTempTask({ + examType: 1, courseId: res.data.data.examinationId, duration: res.data.data.examinationDuration, name: res.data.data.examinationName, @@ -775,9 +778,9 @@ export default { }; // 外部考试 const updateTask1 = (res) => { - state.EditTestId = res.data.data.externalId; + state.EditTestId = res.data.data.examinationId; if (props.faceLevel) { - state.EditTestId = res.data.data.externalId; + state.EditTestId = res.data.data.examinationId; state.paperName = ""; closeDrawer(); } else { @@ -787,9 +790,10 @@ export default { return message.warning("请先选中关卡"); } let editObj1 = { + examType: 2, chapterId: props.isactive, - courseId: res.data.data.externalId, - name: res.data.data.externalName, + courseId: res.data.data.examinationId, + name: res.data.data.examinationName, routerId: props.routerId, routerTaskId: props.routerTaskId || 0, type: 5, @@ -807,8 +811,9 @@ export default { }); } else if (props.isLevel == 2) { let editObj = { - courseId: res.data.data.externalId, - name: res.data.data.externalName, + examType: 2, + courseId: res.data.data.examinationId, + name: res.data.data.examinationName, projectId: props.projectId, projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, @@ -827,8 +832,9 @@ export default { }); } else if (props.isLevel == 3) { addTempTask({ - courseId: res.data.data.externalId, - name: res.data.data.externalName, + examType: 2, + courseId: res.data.data.examinationId, + name: res.data.data.examinationName, projectTemplateId: props.projectTemplateId, projectTaskId: props.projectTaskId || 0, stageId: props.chooseStageId || 0, diff --git a/src/components/drawers/ExportAchievement.vue b/src/components/drawers/ExportAchievement.vue index e00e50ff..50a60742 100644 --- a/src/components/drawers/ExportAchievement.vue +++ b/src/components/drawers/ExportAchievement.vue @@ -235,7 +235,7 @@ const state = reactive({ fileType: ["xls", "xlsx"], importScore: - process.env.VUE_APP_BASE_API + "/admin/external/exam/manage/importExternalExamScore", + process.env.VUE_APP_BASE_API + "/admin/external/exam/manage/ImportExternalScore", uploadpercent: -1, uploadErr: false, //上传失败 addLoading: false,