diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 8b58379a..07855172 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -300,6 +300,7 @@ const disabledRangeTime = () => ({ async function confirm() { + debugger await validate().catch(({errorFields}) => { message.warning(errorFields[0].errors.join()); throw Error("数据校验不通过") @@ -535,4 +536,3 @@ defineExpose({openDrawer}) } } - \ No newline at end of file diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 6a089d59..d34ac726 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -224,7 +224,7 @@ 允许查看 不允许查看 - +
@@ -245,7 +245,7 @@
评分模式:
-
+
数据来源:
- { } formDataOuter.value = ref({ examType: 2, - examinationName:"", + examinationName:"", source:"", externalExplain:"" }) @@ -448,6 +448,7 @@ function confirm() { message.warning("请输入及格线"); return } + debugger if (taskIndex.value === -1) { const list = props.taskList list.push({name: formData.value.examinationName, type: props.type, info: {...formData.value}}) @@ -748,4 +749,3 @@ defineExpose({openDrawer}) } } - \ No newline at end of file diff --git a/src/components/drawers/TestManage.vue b/src/components/drawers/TestManage.vue index 4990c0a2..1ddfae1b 100644 --- a/src/components/drawers/TestManage.vue +++ b/src/components/drawers/TestManage.vue @@ -72,13 +72,13 @@
-
-
- + @@ -128,8 +128,8 @@ import { message } from 'ant-design-vue'; import * as api from "../../api/indexExam"; import CQue from './CheckQue.vue' export default { - name: "TestManage", - components: { + name: "TestManage", + components: { CQue, }, props: { @@ -342,7 +342,7 @@ export default { justifyContent: "center", }} > - - - +
@@ -64,7 +64,7 @@ placeholder="请选择" :options="projectNameList" @change="selectProjectName" - + >
@@ -181,7 +181,7 @@ export default { tableDataTotal: 0, projectName: undefined, projectNameList: [ - + { id: 1, value: "0", @@ -241,7 +241,7 @@ export default { key: "studentDepartName", width: "20%", align: "center", - + className: "h", ellipsis: true, customRender: (text) => { @@ -356,8 +356,8 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, - taskId: props.datasource.id, - taskType: props.datasource.type, + taskId: props.datasource.id, + taskType: props.datasource.type, status: state.projectName, studentName: state.name, }); @@ -368,7 +368,7 @@ export default { currentStageId: props.datasource.chapterId, type: 2, pid: props.datasource.routerId, - taskId: props.datasource.id, + taskId: props.datasource.id, taskType: props.datasource.type, status: state.projectName, studentName: state.name, @@ -417,9 +417,9 @@ export default { // 处理在线课字段和表格中字段保持一致 let obj = { studentUserNo: res.data.data.studyDetailList[i].studentCode, - studentName: res.data.data.studyDetailList[i].studentName, - studentDepartName: res.data.data.studyDetailList[i].studentDepartName, - studentJobName: res.data.data.studyDetailList[i].studentJobName, + studentName: res.data.data.studyDetailList[i].studentName, + studentDepartName: res.data.data.studyDetailList[i].studentDepartName, + studentJobName: res.data.data.studyDetailList[i].studentJobName, lastStudyTime: res.data.data.studyDetailList[i].finishedTime, finishStatus: res.data.data.studyDetailList[i].status?res.data.data.studyDetailList[i].status:0 } @@ -462,8 +462,8 @@ export default { // 导出数据 function exportTaskStu() { - console.log(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`) - window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&taskType=${props.datasource.type}`) + console.log(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) + window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?currentStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.id}&taskType=${props.datasource.type}`) // window.open(`${process.env.VUE_APP_BASE_API}/admin/student/exportTaskStudent?pageNo=${state.currentPage}&pageSize=${state.pageSize}¤tStageId=${props.datasource.chapterId}&type=${2}&pid=${props.datasource.routerId}&taskId=${props.datasource.routerTaskId}&status=${state.name}&studentName=${state.projectName}`) } @@ -718,4 +718,3 @@ export default { } } - \ No newline at end of file