From 9342a21839c401e84d4041a96b7300967e4a0920 Mon Sep 17 00:00:00 2001
From: zhengpengju <zpj0219@126.com>
Date: Tue, 8 Mar 2022 11:40:56 +0800
Subject: [PATCH] fix bug

---
 admin/src/pages/course/option/index.tsx       |  2 +-
 .../attestation/step/index.tsx                | 28 ++++++++++++++-----
 .../pages/examinationrules/normal/index.tsx   | 11 +++++---
 .../examinationrules/normal/step/index.tsx    |  2 +-
 admin/src/pages/questionbank/index.tsx        |  3 +-
 5 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/admin/src/pages/course/option/index.tsx b/admin/src/pages/course/option/index.tsx
index d07b9c4..bb7de51 100644
--- a/admin/src/pages/course/option/index.tsx
+++ b/admin/src/pages/course/option/index.tsx
@@ -174,7 +174,7 @@ const CourseList: React.FC = () => {
       hideInTable: true,
       hideInForm: false,
       hideInSearch: true,
-      renderText: (val: string) => `${val}`,
+      renderText: (val: string) => `${val} 分钟`,
       formItemProps: {
         // 参照 https://ant.design/components/form-cn/#Rule
         rules: [
diff --git a/admin/src/pages/examinationrules/attestation/step/index.tsx b/admin/src/pages/examinationrules/attestation/step/index.tsx
index 71913dc..f4d8171 100644
--- a/admin/src/pages/examinationrules/attestation/step/index.tsx
+++ b/admin/src/pages/examinationrules/attestation/step/index.tsx
@@ -80,11 +80,25 @@ export default () => {
             dataIndex: 'examination_time',
             valueType: 'text',
             sorter: false,
-            hideInTable: true,
+            hideInTable: false,
             hideInForm: true,
             hideInSearch: true,
             renderText: (val: string) => `${val}`,
+        },
+        {
+            title: '题型设置',
+            dataIndex: 'question_type',
+            valueType: 'text',
+            sorter: false,
+            hideInTable: false,
+            hideInForm: true,
+            hideInSearch: true,
+            renderText: (val: string) => {
+                return <>
+                
+                </>
             },
+        },
         {
             title: '关联主题',
             dataIndex: 'subject_name',
@@ -435,7 +449,7 @@ export default () => {
                                 >
                                     <ProDescriptions.Item dataIndex="id" hideInDescriptions />
                                     <ProDescriptions.Item dataIndex="rules_name" label="考试名称" valueType="text" />
-                                    <ProDescriptions.Item dataIndex="subject_name" label="关联培训主题" valueType="text" />
+                                    <ProDescriptions.Item dataIndex="subject_name" label="关联主题" valueType="text" />
                                     <ProDescriptions.Item dataIndex="examination_time" label="考试时长" valueType="text" renderText={(text)=>(`${text} 分钟`)} />
 
                                     <ProDescriptions.Item dataIndex="grade" label="试卷信息" valueType="text" render={()=>{
@@ -517,15 +531,15 @@ export default () => {
                 width="80%"
                 visible={paperModalVisible}
                 onVisibleChange={handlePaperModalVisible}
-                footer={null}
                 onFinish={async () => {
-                    const values = setterRef.current?.getData()                 
-                    console.log('试卷详情::::', values);
+                    //alert(0)
+                    //const values = setterRef.current?.getData()                 
+                    //console.log('试卷详情::::', values);
                     //const {code, data: paper, msg} = await saveQuestionTypeScore({rules_id:Number(params?.id), type_score: JSON.stringify(values)})
-                    console.log('paper', paper)
+                    //console.log('paper', paper)
                     // setUuidPaper(paper?.paper_uuid)
                     // message.success('提交成功');
-                    handleScoreModalVisible(false)
+                    handlePaperModalVisible(false)
                     return true;
                 }}
             >
diff --git a/admin/src/pages/examinationrules/normal/index.tsx b/admin/src/pages/examinationrules/normal/index.tsx
index 97a5f42..b1237af 100644
--- a/admin/src/pages/examinationrules/normal/index.tsx
+++ b/admin/src/pages/examinationrules/normal/index.tsx
@@ -85,7 +85,7 @@ const ExaminationRules: React.FC = () => {
       width: 48,
     },
     {
-      title: '模拟考试名称',
+      title: '考试名称',
       dataIndex: 'rules_name',
       valueType: 'text',
       hideInTable: false,
@@ -185,18 +185,21 @@ const ExaminationRules: React.FC = () => {
             onClick={() => {
               history.push('/examinationrules/normal/step/' + record.id)
             }}
+            style={{padding: '0 2px 0 0'}}
           >
             编辑
             </Button>,
           <Button type="link"
             key="remove"
-        
+            disabled={record.b_use ? true : false}
             onClick={ () => {
               handleRemove([{ key: record?.id }], record); // 调用批量删除函数（如果接口不支持批量需要在service中处理）
               setSelectedRows([]);
               actionRef.current?.reloadAndRest?.();
-            }}>
-            <Typography.Text type="danger">删除</Typography.Text>
+            }}
+            style={{padding: '0 2px 0 0'}}
+            >
+            <Typography.Text disabled={record.b_use ? true : false} type={"danger"}>删除</Typography.Text>
           </Button>,
           <a
             key="b_use"
diff --git a/admin/src/pages/examinationrules/normal/step/index.tsx b/admin/src/pages/examinationrules/normal/step/index.tsx
index f0b2944..8475ec3 100644
--- a/admin/src/pages/examinationrules/normal/step/index.tsx
+++ b/admin/src/pages/examinationrules/normal/step/index.tsx
@@ -481,7 +481,7 @@ export default () => {
                                 >
                                     <ProDescriptions.Item dataIndex="id" hideInDescriptions />
                                     <ProDescriptions.Item dataIndex="rules_name" label="考试名称" valueType="text" />
-                                    <ProDescriptions.Item dataIndex="subject_name" label="关联培训主题" valueType="text" />
+                                    <ProDescriptions.Item dataIndex="subject_name" label="关联主题" valueType="text" />
                                     <ProDescriptions.Item dataIndex="examination_time" label="考试时长" valueType="text" renderText={(text)=>(`${text} 分钟`)} />
 
                                     <ProDescriptions.Item dataIndex="grade" label="试卷信息" valueType="text" render={()=>{
diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx
index 8ff2a33..feb08ad 100644
--- a/admin/src/pages/questionbank/index.tsx
+++ b/admin/src/pages/questionbank/index.tsx
@@ -219,7 +219,7 @@ const QuestionBank = () => {
       },
     },
     {
-      title: '答案',
+      title: '正确答案',
       dataIndex: 'answertrue',
       valueType: 'text',
       sorter: false,
@@ -339,6 +339,7 @@ const QuestionBank = () => {
         pagination={{
           defaultPageSize: 10,
           showSizeChanger: false,
+          showQuickJumper: true
         }}
         search={{}}
         toolBarRender={() => {