From c1408f575e6e422a9b59b84296fb8c5cb73bab98 Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Tue, 8 Mar 2022 13:49:27 +0800
Subject: [PATCH 1/4] fix

---
 admin/src/pages/examinationrules/components/ScoreSetter.tsx | 4 ++--
 admin/src/pages/examinationrules/normal/step/index.tsx      | 2 +-
 admin/src/pages/questionbank/index.tsx                      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/admin/src/pages/examinationrules/components/ScoreSetter.tsx b/admin/src/pages/examinationrules/components/ScoreSetter.tsx
index 006b2c6..560710a 100644
--- a/admin/src/pages/examinationrules/components/ScoreSetter.tsx
+++ b/admin/src/pages/examinationrules/components/ScoreSetter.tsx
@@ -94,7 +94,7 @@ const ScoreSetter = (props: any, ref: any) => {
             { (record?.code === 1) &&
                 <>
                     <span>错选、漏选得:</span>
-                    <Form.Item style={{margin:0}} name={`score_harf`}><InputNumber min={0} type="number" defaultValue={questionTypeValues ? questionTypeValues[index]?.score_harf : 0} placeholder="请输入" size="small" name='score_harf' onChange={(value)=>{
+                    <Form.Item style={{margin:0}} name={`score_harf`}><InputNumber min={0} max={99} maxLength={2} type="number" defaultValue={questionTypeValues ? questionTypeValues[index]?.score_harf : 0} placeholder="请输入" size="small" name='score_harf' onChange={(value)=>{
                       //
                       const _data = [];
                       console.log('typeScore',typeScore)
@@ -202,7 +202,7 @@ const ScoreSetter = (props: any, ref: any) => {
     >
     <EditableProTable
       title={()=>{
-        return <Space>共计 {sumQuestion} 题, 总计 {sumScore} 分 通过分数线 
+        return <Space size="large"><span>共计 {sumQuestion} 题,</span><span>总计 {sumScore} 分</span> 通过分数线 
         <Form.Item style={{margin:0}} name='pass_socre' initialValue={0}><InputNumber min={0} onChange={(value)=>{
           setPassScore(value)
         }} /></Form.Item>       
diff --git a/admin/src/pages/examinationrules/normal/step/index.tsx b/admin/src/pages/examinationrules/normal/step/index.tsx
index 8475ec3..9d1a44f 100644
--- a/admin/src/pages/examinationrules/normal/step/index.tsx
+++ b/admin/src/pages/examinationrules/normal/step/index.tsx
@@ -319,7 +319,7 @@ export default () => {
                         onFinish={async () => {
                             console.log(formRef.current?.getFieldsValue());
                             setCurrentStep(2) // 设置步骤号
-                            alert(params?.id || rulesId)
+                            //alert(params?.id || rulesId)
 
                             runPaper({rules_id: params?.id || rulesId})
                             return true;
diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx
index feb08ad..596aa88 100644
--- a/admin/src/pages/questionbank/index.tsx
+++ b/admin/src/pages/questionbank/index.tsx
@@ -365,7 +365,7 @@ const QuestionBank = () => {
           return [
             <Dropdown overlay={menu}>
               <Button type="primary">
-              <PlusOutlined /> 新建 <DownOutlined />
+              <PlusOutlined /> 新建试题 <DownOutlined />
               </Button>
             </Dropdown>,
             <Button key="remove" type="primary" danger onClick={async (value)=>{

From b58188330b35f730a4da3340bdcc13e8a8fdbb38 Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Tue, 8 Mar 2022 14:20:52 +0800
Subject: [PATCH 2/4] fix bug

---
 admin/config/config.ts                               |  4 ++--
 .../pages/questionbank/components/AnswersEditor.tsx  | 12 +++++++-----
 admin/src/pages/questionbank/index.tsx               |  9 +++++----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/admin/config/config.ts b/admin/config/config.ts
index 82d6c11..216ffe5 100644
--- a/admin/config/config.ts
+++ b/admin/config/config.ts
@@ -144,7 +144,7 @@ export default defineConfig({
       name: '考试规则维护',
       routes: [
         {
-          name: '模拟考试规则维护',
+          name: '模拟考试规则设置',
           icon: 'smile',
           path: '/examinationrules/normal',
           component: './examinationrules/normal',
@@ -164,7 +164,7 @@ export default defineConfig({
           hideInMenu: true,
         },
         {
-          name: '资质考试规则维护',
+          name: '资质考试规则设置',
           icon: 'smile',
           path: '/examinationrules/attestation',
           component: './examinationrules/attestation',
diff --git a/admin/src/pages/questionbank/components/AnswersEditor.tsx b/admin/src/pages/questionbank/components/AnswersEditor.tsx
index 29f44cc..7d741cd 100644
--- a/admin/src/pages/questionbank/components/AnswersEditor.tsx
+++ b/admin/src/pages/questionbank/components/AnswersEditor.tsx
@@ -37,11 +37,11 @@ const formItemLayoutWithOutLabel = {
   },
 };
 console.log('first');
-const AnswersSelector = () => {
-   
+const AnswersSelector = (props) => {
+  const {type} = props;
   return (
     <Form.List
-        initialValue={['','','','']}
+        initialValue={type === 2 ? ['正确','错误'] : ['','','','']}
         name="answers"
         rules={[
           {
@@ -76,14 +76,15 @@ const AnswersSelector = () => {
                 >
                   <Input placeholder="" style={{ width: '80%' }} />
                 </Form.Item>
-                {fields.length > 1 ? (
+                {(fields.length > 1) && (type !== 2) &&
                   <MinusCircleOutlined
                     className="dynamic-delete-button"
                     onClick={() => remove(field.name)}
                   />
-                ) : null}
+                }
               </Form.Item>
             ))}
+            { (type !== 2) &&
             <Form.Item>
               <Button
                 type="dashed"
@@ -95,6 +96,7 @@ const AnswersSelector = () => {
               </Button>
               <Form.ErrorList errors={errors} />
             </Form.Item>
+            }
           </>
         )}
       </Form.List>
diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx
index 596aa88..7dd0fad 100644
--- a/admin/src/pages/questionbank/index.tsx
+++ b/admin/src/pages/questionbank/index.tsx
@@ -207,7 +207,7 @@ const QuestionBank = () => {
       hideInForm: false,
       hideInSearch: true,
       renderFormItem: (item, { defaultRender, ...rest }, form) => (
-        <AnswersSelector />
+        <AnswersSelector type={addType?.value} />
       ),
       formItemProps: {
         rules: [
@@ -239,12 +239,13 @@ const QuestionBank = () => {
           console.log('====0')
         }
         console.log('answers??',form.getFieldValue('answers')?.length)
-        console.log('addType?.value', addType?.value)        
+        console.log('addType?.value', addType?.value)
+
         // 0 单选 1 多选 2 判断
-        return ((addType?.value === 0) || (Number(form.getFieldValue('question_type')) === 0) || Number(form.getFieldValue('question_type')) === 2) ? 
+        return ((addType?.value === 0 || addType?.value === 2) || (Number(form.getFieldValue('question_type')) === 0) || Number(form.getFieldValue('question_type')) === 2) ? 
         <Radio.Group
           name="answertrue"
-          options={['A', 'B', 'C', 'D']}
+          options={addType?.value === 0 ? ['A', 'B', 'C', 'D'] : ['A', 'B']}
         />
         :
         <Checkbox.Group

From 11e562c749bae252e3f30d1671690518ed15445a Mon Sep 17 00:00:00 2001
From: wangxi <123456>
Date: Tue, 8 Mar 2022 15:38:15 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=B5=8B=E8=AF=95bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/pages/course/list/index.tsx           |  10 +-
 web/src/pages/course/subject/index.tsx        |   7 +-
 .../mockExamination/chapterExamination.tsx    |  10 +-
 web/src/pages/mockExamination/chapterList.tsx | 100 +++++++++++-------
 4 files changed, 78 insertions(+), 49 deletions(-)

diff --git a/web/src/pages/course/list/index.tsx b/web/src/pages/course/list/index.tsx
index 01a507f..e6cf72c 100644
--- a/web/src/pages/course/list/index.tsx
+++ b/web/src/pages/course/list/index.tsx
@@ -99,7 +99,11 @@ const CardList = () => {
                     JSON.stringify(last_data)!=='{}'?
                       <>
                       <Row>
-                        <Col span={16} style={{ display: 'inline-block', padding: 10 }}><span>学习进度：</span><span style={{ display: 'inline-block', width: '80%' }}><Progress percent={subject_data ? subject_data.subject_learning_progress * 100 : 0} /></span></Col>
+                        <Col span={16} style={{ display: 'inline-block', padding: 10 }}><span>学习进度：</span><span style={{ display: 'inline-block', width: '80%' }}>
+                          <Progress percent={subject_data ? subject_data.subject_learning_progress * 100 : 0}
+                                    format={(percent) => percent === 100 ? '100%' : `${percent}%`}
+                          />
+                        </span></Col>
                       </Row>
                       <Row>
                         <Col span={10} style={{ padding: 10 }}><span>上次学习：</span><span>{last_data ? last_data.course_name : '--'}</span></Col>
@@ -169,7 +173,9 @@ const CardList = () => {
                       <div title={item?.course_name} style={{ paddingRight: '1rem', width: '30%', display: 'inline-block', verticalAlign: 'middle', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{item?.course_name}</div>
                       <div style={{ paddingRight: '1rem', width: '10%', display: 'inline-block' }}>{item?.course_hours}小时</div>
                       <div style={{ paddingRight: '1rem', width: '30%', display: 'inline-block' }}>
-                        <Progress percent={item?.learning_progress * 100} />
+                        <Progress percent={item?.learning_progress * 100}
+                                  format={(percent) => percent === 100 ? '100%' : `${percent}%`}
+                        />
                       </div>
                       <div style={{ paddingRight: '1rem', width: '20%', display: 'inline-block', textAlign: 'right' }}>
                         <Button type="primary" onClick={() => {
diff --git a/web/src/pages/course/subject/index.tsx b/web/src/pages/course/subject/index.tsx
index 9ee1301..51f3ed7 100644
--- a/web/src/pages/course/subject/index.tsx
+++ b/web/src/pages/course/subject/index.tsx
@@ -70,7 +70,12 @@ const SubjectList = () => {
                               <div dangerouslySetInnerHTML={{__html:item.subject_describe}}/>
                             </Paragraph>
                           </Card.Grid>
-                          <Card.Grid hoverable={false} style={{width:'30%',textAlign:'center'}}><Progress type="circle" percent={item?.subject_learning_progress*100} /></Card.Grid>
+                          <Card.Grid hoverable={false} style={{width:'30%',textAlign:'center'}}>
+                            <Progress type="circle"
+                                      percent={item?.subject_learning_progress*100}
+                                      format={(percent) => percent === 100 ? '100%' : `${percent}%`}
+                            />
+                          </Card.Grid>
                           <Card.Grid hoverable={false} style={{width:'20%',textAlign:'center'}}>
                             <Button type="primary" onClick={()=>{
                               const info=item.data_id+','+item.data_type+','+item.subject_id;
diff --git a/web/src/pages/mockExamination/chapterExamination.tsx b/web/src/pages/mockExamination/chapterExamination.tsx
index 1e3907e..78d78fd 100644
--- a/web/src/pages/mockExamination/chapterExamination.tsx
+++ b/web/src/pages/mockExamination/chapterExamination.tsx
@@ -44,20 +44,20 @@ const SubjectList = () => {
                     hoverable
                     className={styles.card}
                     actions={[]}
-                    extra={<><span style={{ padding: 10 }}>开始学习时间:{item?.learning_start_time}</span><span style={{ padding: 10 }}>距离结束时间：{item?.distance_end_time}</span><span style={{ padding: 10 }}>考核学时：{item?.total_course_hours}小时</span></>}
+                    // extra={<><span style={{ padding: 10 }}>开始学习时间:{item?.learning_start_time}</span><span style={{ padding: 10 }}>距离结束时间：{item?.distance_end_time}</span><span style={{ padding: 10 }}>考核学时：{item?.total_course_hours}小时</span></>}
                   >
                     <Card.Meta
-                      avatar={<Image preview={false} width={200} height={150} src={`${item.attachment_json.url}`} fallback="../fallback.svg" />}
+                      avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${item.attachment_json.url}`} fallback="../fallback.svg" />}sss
                       title={false}
                       description={
                         <>
                           <Card.Grid hoverable={false} style={{ width: '50%', padding: 0 }}>
                             <Paragraph className={styles.item} ellipsis={{ rows: 4 }}>
-                              {item.subject_describe}
+                              <div dangerouslySetInnerHTML={{__html:item.subject_describe}}/>
                             </Paragraph>
                           </Card.Grid>
-                          <Card.Grid hoverable={false} style={{ width: '30%', textAlign: 'center' }}><Progress type="circle" percent={item?.subject_learning_progress * 100} /></Card.Grid>
-                          <Card.Grid hoverable={false} style={{ width: '20%', textAlign: 'center' }}>
+                          {/*<Card.Grid hoverable={false} style={{ width: '30%', textAlign: 'center' }}><Progress type="circle" percent={item?.subject_learning_progress * 100} /></Card.Grid>*/}
+                          <Card.Grid hoverable={false} style={{ width: '50%', textAlign: 'right' }}>
                             <Button type="primary" onClick={() => {
                               const info = item.data_id + ',' + item.data_type + ',' + item.subject_id;
                               history.push(`/mockExamination/chapterExamination/chapterList/${item.data_id}/${item.data_type}/${item.subject_id}`);
diff --git a/web/src/pages/mockExamination/chapterList.tsx b/web/src/pages/mockExamination/chapterList.tsx
index f196315..157bda9 100644
--- a/web/src/pages/mockExamination/chapterList.tsx
+++ b/web/src/pages/mockExamination/chapterList.tsx
@@ -1,6 +1,6 @@
 import { AlignLeftOutlined, LaptopOutlined, NotificationOutlined, PlusOutlined, UserOutlined } from '@ant-design/icons';
 import { useEffect, useState } from 'react';
-import { Button, Card, Col, Layout, List, Menu, Progress, Row, Typography } from 'antd';
+import { Button, Card, Col, Layout, List, Menu, Progress, Row, Typography,Image } from 'antd';
 import { PageContainer } from '@ant-design/pro-layout';
 import { useParams, useRequest, history } from 'umi';
 import { viewMyLearningSubject, getCourseExaminationProgressList } from './service';
@@ -57,15 +57,16 @@ const CardList = () => {
           total_question_count += item.question_count;
           if (item.finish_count !== 0) {
             let num = 0;
-            num = result.finish_count / result.question_count;
-            item.process = num.toFixed(4)
+            num = item.finish_count/item.question_count;
+            item.process = parseFloat(num).toFixed(2)
           } else {
             item.process = 0;
           }
         });
+        console.log('result.list',result.list)
         if (total_finish_count !== 0) {
           const total_num = total_finish_count / total_question_count;
-          total_process = total_num.toFixed(4)
+          total_process = parseFloat(total_num).toFixed(2)
 
         } else {
           total_process = 0;
@@ -98,42 +99,59 @@ const CardList = () => {
 
   const content = (
     <div className={styles.pageHeaderContent}>
-      <Card
-        title={<a>{subject_data ? subject_data.subject_name : '--'}</a>}
-        hoverable={false}
-        className={styles.card}
-        actions={[]}
-      >
-        <Card.Meta
-          avatar={<img alt="" className={styles.cardAvatar} src={'https://gw.alipayobjects.com/zos/rmsportal/uMfMFlvUuceEyPpotzlq.png'} style={{ width: '270px', height: '150px', borderRadius: '10px' }} />}
-          title={false}
-          description={
-            <>
-              <Card.Grid hoverable={false} style={{ width: '100%', padding: 0, boxShadow: 'none' }}>
-                <Paragraph className={styles.item} ellipsis={{ rows: 4 }} style={{ paddingLeft: 10 }}>
-                  {subject_data ? subject_data.subject_describe : '--'}
-                </Paragraph>
-                <Row>
-                  <Col span={16} style={{ display: 'inline-block', padding: 10 }}><span>章节模拟考试进度：</span><span style={{ display: 'inline-block', width: '80%' }}><Progress percent={total_process * 100} /></span></Col>
-                </Row>
-                <Row>
-                  <Col span={4} style={{ padding: 10 }}>
-                    <Button type="primary"
-                      onClick={() => {
-                        console.log('last_data', last_data)
-                        const info = subject_data.subject_id + "," + cookie.load('person_id')
-                        console.log(subject_data, 'subject_data')
-                        history.push(`/mockExamination/chapterExamination/chapterList/chapterErrorListPaper/${info}`)
-
-                      }}
-                    >错题练习</Button>
-                  </Col>
-                </Row>
-              </Card.Grid>
-            </>
-          }
-        />
-      </Card>
+      {
+        subject_data.length!==0?
+          <Card
+            title={<a>{subject_data ? subject_data.subject_name : '--'}</a>}
+            hoverable={false}
+            className={styles.card}
+            actions={[]}
+          >
+            <Card.Meta
+              avatar={<Image preview={false} width={200} height={150} src={`/dsideal_yy/html/${subject_data.attachment_json.url}`} fallback="../fallback.svg" />}
+              title={false}
+              description={
+                <>
+                <Card.Grid hoverable={false} style={{ width: '100%', padding: 0, boxShadow: 'none' }}>
+                  <Paragraph className={styles.item} ellipsis={{ rows: 4 }} style={{ paddingLeft: 10 }}>
+                    {subject_data ?
+                      <div dangerouslySetInnerHTML={{__html:subject_data.subject_describe}}/>
+                      : '--'}
+                  </Paragraph>
+
+                </Card.Grid>
+                <Card.Grid hoverable={false} style={{width:'25%',textAlign:'center',boxShadow: 'none'}}>
+                  <Button type="primary"
+                          style={{width:'10rem',height:'6rem'}}
+                          onClick={() => {
+                            console.log('last_data', last_data)
+                            const info = subject_data.subject_id + "," + cookie.load('person_id')
+                            console.log(subject_data, 'subject_data')
+                            history.push(`/mockExamination/chapterExamination/chapterList/chapterErrorListPaper/${info}`)
+
+                          }}
+                  >错题练习</Button>
+                </Card.Grid>
+                <Card.Grid hoverable={false} style={{width:'50%',textAlign:'center',boxShadow: 'none'}}>
+                  <span style={{ display: 'inline-block', width:'100%' }}>
+                    <Progress  width={70}
+                               type="circle"
+                               percent={parseInt(total_process * 100)}
+                               format={(percent) => percent === 100 ? '100%' : `${percent}%`}
+                    />
+                  </span>
+                  <span>章节模拟考试进度</span>
+                </Card.Grid>
+
+                </>
+              }
+            />
+          </Card>
+            :<div/>
+      }
+
+
+
     </div>
   );
 
@@ -178,7 +196,7 @@ const CardList = () => {
                       <div title={item?.course_name} style={{ paddingRight: '1rem', width: '30%', display: 'inline-block', verticalAlign: 'middle', overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap' }}>{item?.course_name}</div>
                       <div style={{ paddingRight: '1rem', width: '10%', display: 'inline-block' }}>{item?.finish_count}题/{item?.question_count}题</div>
                       <div style={{ paddingRight: '1rem', width: '30%', display: 'inline-block' }}>
-                        <Progress percent={item?.progress * 100} />
+                        <Progress percent={item?parseInt(item.process * 100):0}  format={(percent) => percent === 100 ? '100%' : `${percent}%`}/>
                       </div>
                       <div style={{ paddingRight: '1rem', width: '20%', display: 'inline-block', textAlign: 'right' }}>
                         <Button type="primary" onClick={() => {

From c8498abbad03482241657f9e2ef51d1394f6dee1 Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Tue, 8 Mar 2022 17:00:20 +0800
Subject: [PATCH 4/4] fix

---
 admin/config/config.ts                        | 10 ++++++++-
 .../pages/examination/certificate/index.tsx   |  2 +-
 .../pages/examination/certificate/person.tsx  | 22 ++++++++++++++++---
 .../attestation/step/index.tsx                |  2 +-
 admin/src/pages/questionbank/index.tsx        |  4 ++--
 5 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/admin/config/config.ts b/admin/config/config.ts
index 216ffe5..545bf37 100644
--- a/admin/config/config.ts
+++ b/admin/config/config.ts
@@ -77,6 +77,10 @@ export default defineConfig({
       icon: 'table',
       name: '课程管理',
       routes: [
+        {
+          path: '/course',
+          redirect: '/course/subject',
+        },
         {
           name: '主题设置',
           icon: 'smile',
@@ -124,6 +128,10 @@ export default defineConfig({
       icon: 'table',
       name: '题库维护',
       routes: [
+        {
+          path: '/questionbank',
+          redirect: '/questionbank/normal',
+        },
         {
           name: '常规题库维护',
           icon: 'smile',
@@ -212,7 +220,7 @@ export default defineConfig({
           name: '制证名单',
           icon: 'smile',
           hideInMenu: true,
-          path: '/examination/certificate/person/:id/:accreditation_status',
+          path: '/examination/certificate/person/:id/:accreditation_status/:name',
           component: './examination/certificate/person',
         },
       ],
diff --git a/admin/src/pages/examination/certificate/index.tsx b/admin/src/pages/examination/certificate/index.tsx
index 7972932..e952833 100644
--- a/admin/src/pages/examination/certificate/index.tsx
+++ b/admin/src/pages/examination/certificate/index.tsx
@@ -208,7 +208,7 @@ const CourseList: React.FC = () => {
         <a
           key="detail"
           onClick={() => {
-            history.push('/examination/certificate/person/' + record.examination_id + "/" + record.accreditation_status)
+            history.push('/examination/certificate/person/' + record.examination_id + "/" + record.accreditation_status + "/" + encodeURIComponent(record.examination_name))
 
           }}
         >
diff --git a/admin/src/pages/examination/certificate/person.tsx b/admin/src/pages/examination/certificate/person.tsx
index 39ae0a3..efbb5b1 100644
--- a/admin/src/pages/examination/certificate/person.tsx
+++ b/admin/src/pages/examination/certificate/person.tsx
@@ -1,7 +1,7 @@
 import React, { useState, useRef } from 'react';
-import { useRequest, useParams } from 'umi';
+import { useRequest, useParams, Link } from 'umi';
 import { PlusOutlined, TagsOutlined, UploadOutlined } from '@ant-design/icons';
-import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Select } from 'antd';
+import { Button, message, Input, Drawer, Modal, Col, Row, Space, Upload, Select, Breadcrumb } from 'antd';
 import { PageContainer, FooterToolbar } from '@ant-design/pro-layout';
 import type { ProColumns, ActionType } from '@ant-design/pro-table';
 import ProTable from '@ant-design/pro-table';
@@ -207,7 +207,23 @@ const CourseList: React.FC = () => {
   ];
 
   return (
-    <PageContainer>
+    <PageContainer
+      header={{
+        breadcrumbRender: (props, originBreadcrumb)=>{
+          return <Breadcrumb>
+            <Breadcrumb.Item>
+              <Link to="/examination/option">考试管理</Link>
+            </Breadcrumb.Item>
+            <Breadcrumb.Item>
+              <Link to="/examination/certificate">制证管理</Link>
+            </Breadcrumb.Item>
+            <Breadcrumb.Item>
+            <Link to="">{decodeURIComponent(params?.name)}</Link>
+            </Breadcrumb.Item>
+          </Breadcrumb>
+        }
+      }}
+    >
       <ProTable<TableListItem, TableListPagination>
         headerTitle={false}
         actionRef={actionRef}
diff --git a/admin/src/pages/examinationrules/attestation/step/index.tsx b/admin/src/pages/examinationrules/attestation/step/index.tsx
index f4d8171..d8e2fb3 100644
--- a/admin/src/pages/examinationrules/attestation/step/index.tsx
+++ b/admin/src/pages/examinationrules/attestation/step/index.tsx
@@ -320,7 +320,7 @@ export default () => {
                                         // tooltip="限制考试时长的情况下，用户考试中离开，倒计时不会停止。"
                                         />
 
-                                        <ProFormDateRangePicker name="dateRange" label="试卷有效期" initialValue={[ruleData.start_time, ruleData.end_time]} />
+                                        <ProFormDateRangePicker name="dateRange" label="试卷有效期" initialValue={[ruleData.start_time, ruleData.end_time]} rules={[{ required: true, message: '请输试卷有效期' }]} />
                                     </>
                                 )}
                             </Col>
diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx
index 7dd0fad..ee7b139 100644
--- a/admin/src/pages/questionbank/index.tsx
+++ b/admin/src/pages/questionbank/index.tsx
@@ -207,7 +207,7 @@ const QuestionBank = () => {
       hideInForm: false,
       hideInSearch: true,
       renderFormItem: (item, { defaultRender, ...rest }, form) => (
-        <AnswersSelector type={addType?.value} />
+        <AnswersSelector type={addType?.value || Number(form.getFieldValue('question_type'))} />
       ),
       formItemProps: {
         rules: [
@@ -245,7 +245,7 @@ const QuestionBank = () => {
         return ((addType?.value === 0 || addType?.value === 2) || (Number(form.getFieldValue('question_type')) === 0) || Number(form.getFieldValue('question_type')) === 2) ? 
         <Radio.Group
           name="answertrue"
-          options={addType?.value === 0 ? ['A', 'B', 'C', 'D'] : ['A', 'B']}
+          options={addType?.value === 0 || (Number(form.getFieldValue('question_type')) === 0) ? ['A', 'B', 'C', 'D'] : ['A', 'B']}
         />
         :
         <Checkbox.Group