diff --git a/packages/examination/src/views/examPaper/examPaperAdd.tsx b/packages/examination/src/views/examPaper/examPaperAdd.tsx index 178b222..a239023 100644 --- a/packages/examination/src/views/examPaper/examPaperAdd.tsx +++ b/packages/examination/src/views/examPaper/examPaperAdd.tsx @@ -106,7 +106,7 @@ class ExamPaperAdd extends Component { const newQuestions: QuestionState[] = res.data.data.map((questionData: any) => { const options = questionData.options.split(','); const answerOptions = options.map((option: any) => { - const [value, label] = option.split(':'); + const [value, label] = option.split('.'); return { value, label }; }); return { @@ -153,7 +153,7 @@ class ExamPaperAdd extends Component { const newQuestions: QuestionState[] = res.data.map((questionData: any) => { const options = questionData.options.split(','); const answerOptions = options.map((option: any) => { - const [value, label] = option.split(':'); + const [value, label] = option.split('.'); return { value, label }; }); return { @@ -240,7 +240,7 @@ class ExamPaperAdd extends Component { const newQuestions: QuestionState[] = res.data.data.map((questionData: any) => { const options = questionData.options.split(','); const answerOptions = options.map((option: any) => { - const [value, label] = option.split(':'); + const [value, label] = option.split('.'); return { value, label }; }); return { diff --git a/packages/examination/src/views/examPaper/examPaperList.tsx b/packages/examination/src/views/examPaper/examPaperList.tsx index 942258b..428c795 100644 --- a/packages/examination/src/views/examPaper/examPaperList.tsx +++ b/packages/examination/src/views/examPaper/examPaperList.tsx @@ -149,20 +149,28 @@ class ExamPaperList extends Component { const newStatus = paperStatus === 0? 1 : 0; const newStatusText = paperStatus === 0? '启用' : '停用'; const idList = [id]; - upPaperStatus(idList, newStatus).then((res) => { - const success = res['success']; - if (success) { - message.success(`${newStatusText}成功`); - this.setState((prevState) => ({ - list: prevState.list.map((item) => - item.id === id? { ...item, paperStatus: newStatus } : item - ) - })); - } else { - message.error(`${newStatusText}失败,请稍后重试`); - } - }).catch(() => { - message.error(`${newStatusText}时发生错误,请检查`); + Modal.confirm({ + title: `确认${newStatusText}`, + content: `你确定要${newStatusText}这个试卷吗?`, + onOk: () => { + upPaperStatus(idList, newStatus).then((res) => { + const success = res['success']; + if (success) { + message.success(`${newStatusText}成功`); + this.setState((prevState) => ({ + list: prevState.list.map((item) => + item.id === id? { ...item, paperStatus: newStatus } : item + ) + })); + } else { + message.error(`${newStatusText}失败,请稍后重试`); + } + }).catch(() => { + message.error(`${newStatusText}时发生错误,请检查`); + }); + }, + onCancel: () => { + }, }); }; @@ -269,7 +277,11 @@ class ExamPaperList extends Component { dataIndex: 'examDuration', key: 'examDuration', align: 'center', - width: 120 + width: 120, + render: (examDuration: any, record: any) => { + const unit = String(record.durationType) === '1'? '分(min)' : '时(h)'; + return `${examDuration} ${unit}`; + } }, { title: '状态', diff --git a/packages/examination/src/views/examPaper/examPaperView.tsx b/packages/examination/src/views/examPaper/examPaperView.tsx index 672ac7c..87a2339 100644 --- a/packages/examination/src/views/examPaper/examPaperView.tsx +++ b/packages/examination/src/views/examPaper/examPaperView.tsx @@ -73,7 +73,7 @@ class ExamPaperView extends Component { const newQuestions: QuestionState[] = res.data.data.map((questionData: any) => { const options = questionData.options.split(','); const answerOptions = options.map((option: any) => { - const [value, label] = option.split(':'); + const [value, label] = option.split('.'); return { value, label }; }); return { diff --git a/packages/examination/src/views/question/questionEdit.tsx b/packages/examination/src/views/question/questionEdit.tsx index bb299ad..b133666 100644 --- a/packages/examination/src/views/question/questionEdit.tsx +++ b/packages/examination/src/views/question/questionEdit.tsx @@ -61,7 +61,7 @@ class QuestionEdit extends Component { formValues['answer'] = res.data.answer; const options = res.data.options.split(','); options.forEach((option: any) => { - const [key, value] = option.split(':'); + const [key, value] = option.split('.'); formValues[`option${key}`] = value; }); this.formRef.current.setFieldsValue(formValues);