diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index fed2d372..28414a54 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -18,25 +18,43 @@ />
-
+
+ + +
+
-
+
@@ -50,6 +68,7 @@
-
- + {{ formData.examinationTestName }}
@@ -117,6 +136,7 @@
允许重复考试:
允许查看 不允许查看 -
+
@@ -209,7 +232,7 @@
@@ -222,8 +245,9 @@
评分模式:
-
+
@@ -240,6 +264,7 @@
@@ -267,7 +292,7 @@
数据来源:
-
取消 - 确定 + 确定 + 确定
@@ -334,25 +360,52 @@ const props = defineProps({ taskList: [] }) const visible = ref(false) -const formData = ref({examType: 1}) +const formData = ref({ + examType: 1, + showAnswers: 2, + showAnalysis: 2, + scoringModel: 2, + questionArrangement: 4 +}) + +const formDataOuter = ref({ + examType: 2, + examinationName:"", + source:"", + externalExplain:"" +}) + const emit = defineEmits({}) const taskIndex = ref(-1); const dateTime = ref([]); +const isOuter = ref(1); const closeDrawer = () => { visible.value = false taskIndex.value = -1 - formData.value = {examType: 1} + formData.value = { + examType: 1, + showAnswers: 2, + showAnalysis: 2, + scoringModel: 2, + questionArrangement: 4 + } + formDataOuter.value = ref({ + examType: 2, + examinationName:"", + source:"", + externalExplain:"" + }) dateTime.value = [] }; -const range = (start, end) => { - const result = []; - for (let i = start; i < end; i++) { - result.push(i); - } - return result; -}; +// const range = (start, end) => { +// const result = []; +// for (let i = start; i < end; i++) { +// result.push(i); +// } +// return result; +// }; function timeChange(time, timeStr) { formData.value.examinationStartTime = timeStr[0] @@ -364,11 +417,12 @@ const disabledDate = (current) => { }; const disabledRangeTime = () => ({ - disabledHours: () => range(0, 24).splice(4, 20), - disabledMinutes: () => range(30, 60), - disabledSeconds: () => [55, 56], + // disabledHours: () => range(0, 24).splice(4, 20), + // disabledMinutes: () => range(30, 60), + // disabledSeconds: () => [55, 56], }); +// 系统考试 function confirm() { if (!formData.value.examinationName) { message.warning("请输入考试名称"); @@ -401,16 +455,43 @@ function confirm() { const data = props.taskList[taskIndex.value] data.name = formData.value.examinationName data.info = formData.value + data.examType = formData.value == 1 ? 1 : 2 + } + emit('update:taskList', [...props.taskList]) + closeDrawer() +} + +// 外部考试 +function confirmouter() { + if (!formDataOuter.value.examinationName) { + message.warning("请输入考试名称"); + return + } + if (!formDataOuter.value.source) { + message.warning("请输入数据来源"); + return + } + + if (taskIndex.value === -1) { + const list = props.taskList + list.push({name: formDataOuter.value.examinationName, type: props.type, info: formDataOuter.value}) + } else { + const data = props.taskList[taskIndex.value] + data.name = formDataOuter.value.examinationName + data.info = formDataOuter.value + data.examType = 2 } emit('update:taskList', [...props.taskList]) closeDrawer() } function openDrawer(i, row) { - row && (formData.value = row.info); - row && (dateTime.value = [dayjs(row.info.examinationStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.examinationEndTime, "YYYY-MM-DD HH:mm")]); + row && row.info.examType == 1 ? row && (formData.value = row.info) : row && (formDataOuter.value = row.info); + row ? isOuter.value = row.info.examType : isOuter.value = 1; + row && row.info.examType == 1 && (dateTime.value = [dayjs(row.info.examinationStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.examinationEndTime, "YYYY-MM-DD HH:mm")]); (i >= 0) && (taskIndex.value = i); visible.value = true + } const delTag = () => { @@ -419,7 +500,7 @@ const delTag = () => { } function changeOuter(v) { - formData.value.examType = v + isOuter.value = v; } defineExpose({openDrawer})