From e243768f7bb506ef0a2ec8d0a6a90c39626e1dff Mon Sep 17 00:00:00 2001
From: hujunpeng <junpeng.hu@51dayu.com.cn>
Date: Tue, 25 Mar 2025 17:07:59 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=AE=A1=E7=90=86=E5=92=8C?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/examPaper/examPaperAdd.tsx      |  6 +--
 .../src/views/examPaper/examPaperList.tsx     | 42 ++++++++++++-------
 .../src/views/examPaper/examPaperView.tsx     |  2 +-
 .../src/views/question/questionEdit.tsx       |  2 +-
 4 files changed, 32 insertions(+), 20 deletions(-)

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<any, States> {
                 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<any, States> {
                             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<any, States> {
                     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<any, States> {
         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<any, States> {
                 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<any, States> {
                 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<any, States> {
                 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);