diff --git a/admin/config/config.ts b/admin/config/config.ts
index 9ad43ce..907d6e1 100644
--- a/admin/config/config.ts
+++ b/admin/config/config.ts
@@ -182,7 +182,7 @@ export default defineConfig({
           component: './examinationrules/attestation',
         },
         {
-          name: '创建资质考试规则维护',
+          name: '新建资质考试规则',
           icon: 'smile',
           path: '/examinationrules/attestation/step',
           component: './examinationrules/attestation/step',
@@ -235,7 +235,7 @@ export default defineConfig({
     },
     {
       icon: 'table',
-      name: '生涯考试历史',
+      name: '生涯考试历史统计',
       path: '/history/analysis',
       component: './history/analysis',
     },
diff --git a/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx b/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx
index b18c68d..ec7127c 100644
--- a/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx
+++ b/admin/src/pages/examinationrules/attestation/components/AutoSelector.tsx
@@ -90,13 +90,13 @@ const AutoSelector = (props: any, ref: any) => {
     <>
     <Row><Col style={{padding:10}}>题库选择</Col></Row>
     <Row style={{padding:5}}>
-      <Col offset={1} span={5}>{`常规题库 ( ${normalQuestionSum} 道题)`}</Col>
+      <Col offset={1} span={5}><span style={{lineHeight:'32px'}}>{`常规题库 ( ${normalQuestionSum} 道题)`}</span></Col>
       <Col offset={1} span={10}>抽取比例: <InputNumber defaultValue={50} style={{textAlign:'center'}} value={questionCount[0]} onChange={(value)=>{
             setQuestionCount([value, 100 - value])
           }} /> %</Col>
     </Row>
     <Row style={{padding:5}}>
-      <Col offset={1} span={5}>{`资质考试题库 ( ${attestationQuestionSum} 道题)`}</Col>
+      <Col offset={1} span={5}><span style={{lineHeight:'32px'}}>{`资质考试题库:: ( ${attestationQuestionSum} 道题)`}</span></Col>
       <Col offset={1} span={10}>抽取比例: <InputNumber defaultValue={50} style={{textAlign:'center'}} value={questionCount[1]} onChange={(value)=>{
             setQuestionCount([100 - value, value])
           }} /> %</Col>
diff --git a/admin/src/pages/examinationrules/attestation/index.tsx b/admin/src/pages/examinationrules/attestation/index.tsx
index 860a232..3318d02 100644
--- a/admin/src/pages/examinationrules/attestation/index.tsx
+++ b/admin/src/pages/examinationrules/attestation/index.tsx
@@ -126,7 +126,7 @@ const ExaminationRules: React.FC = () => {
       hideInTable: false,
       hideInForm: false,
       hideInSearch: true,
-      renderText: (val: string) => `${val}`,
+      renderText: (val: string) => `${val} 分钟`,
     },
     {
       title: '关联主题',
@@ -189,7 +189,7 @@ const ExaminationRules: React.FC = () => {
       valueType: 'text',
       hideInSearch: true,
       hideInForm: false,
-      renderText: (val: string) => `${val || '-'}`,
+      renderText: (val: string) => `${val || '-'} 分`,
     },
     {
       title: '通过线',
@@ -199,7 +199,7 @@ const ExaminationRules: React.FC = () => {
       valueType: 'text',
       hideInSearch: true,
       hideInForm: false,
-      renderText: (val: string) => `${val || '-'}`,
+      renderText: (val: string) => `${val || '-'} 分`,
     },
     {
       title: '操作',
diff --git a/admin/src/pages/examinationrules/attestation/step/index.tsx b/admin/src/pages/examinationrules/attestation/step/index.tsx
index b13cdd3..5a510c6 100644
--- a/admin/src/pages/examinationrules/attestation/step/index.tsx
+++ b/admin/src/pages/examinationrules/attestation/step/index.tsx
@@ -189,7 +189,13 @@ export default () => {
                                     question_count: '50,50', // 当前数据库没保存，只能采用默认
                                     question_type_count: _type_count?.toString()
                                 }
-                            )                        
+                            )
+                            if(success){
+                                message.success('试卷生成成功') 
+                            }else{
+                                message.success('试卷生成失败')
+                            }
+                                             
                         }}
                         style={{fontSize:14, padding:'0 2px 0 0'}}
                     >
@@ -282,7 +288,7 @@ export default () => {
                                         <ProFormText
                                             name="rules_name"
                                             label="考试名称"
-                                            width="md"
+                                            width="lg"
                                             fieldProps={{ 
                                                 type: 'text',
                                                 allowClear: false,
@@ -304,7 +310,7 @@ export default () => {
                                         />
 
                                         <ProFormSelect
-                                            width="md"
+                                            width="lg"
                                             initialValue={ruleData.subject_id}
                                             request={async () => {
                                                 return querySubjectList().then(({ data }) => {
@@ -321,9 +327,28 @@ export default () => {
                                             name="subject_id"
                                             label="关联主题"
                                         />
-                                        <ProFormText addonAfter={`分钟`} name="examination_time" label="考试时长"
+                                        <ProFormText addonAfter={`分钟`} name="examination_time" label="考试时间"
                                             initialValue={ruleData.examination_time}
-                                            rules={[{ required: true, message: '请输入考试时长' }]}
+                                            rules={[{ required: true, message: '请输入考试时间' }]}
+                                            fieldProps={{ 
+                                                type: 'number',
+                                                min:1,
+                                                allowClear: false,
+                                                width: 'large',
+                                                onInput:(e)=>{
+                                                    const val = `${e.currentTarget?.value}`;
+                                                    console.log('val', val)
+                                                    console.log('val.charAt(0)', val.charAt(0))
+                                                    if(val.charAt(0) === ''){
+                                                        console.log('vvv', val)
+                                                        e.currentTarget.value = ''
+                                                    }
+                                                    if(val.length > 3) {
+                                                        e.currentTarget.value = val.slice(0,3)
+                                                    }
+                                                },
+                                                //style: {marginRight:3}
+                                            }}
                                         // tooltip="限制考试时长的情况下，用户考试中离开，倒计时不会停止。"
                                         />
                                         <Row style={{marginBottom:24,marginTop:-7}}>
@@ -331,14 +356,35 @@ export default () => {
                                         </Row>
 
                                         <ProFormText name="paper_count" label="试卷数量"
+                                            width='lg'
                                             initialValue={ruleData.paper_count}
-                                            rules={[{ required: true, message: '请输入数量' }]}
+                                            rules={[{ required: true, message: '请输入试卷数量' }]}
+                                            fieldProps={{ 
+                                                type: 'number',
+                                                min:1,
+                                                allowClear: false,
+                                                //width: 'large',
+                                                onInput:(e)=>{
+                                                    const val = `${e.currentTarget?.value}`;
+                                                    console.log('val', val)
+                                                    console.log('val.charAt(0)', val.charAt(0))
+                                                    if(val.charAt(0) === ''){
+                                                        console.log('vvv', val)
+                                                        e.currentTarget.value = ''
+                                                    }
+                                                    if(val.length > 3) {
+                                                        e.currentTarget.value = val.slice(0,3)
+                                                    }
+                                                },
+                                                //style:{width: '100%'}
+                                            }}
                                         // tooltip="限制考试时长的情况下，用户考试中离开，倒计时不会停止。"
                                         />
                                         <Row style={{marginBottom:24,marginTop:-7}}>
                                             <Col offset={8} style={{color:'#bfbfbf'}}>试卷数量与学生重复考试次数一致</Col>                                            
                                         </Row>
-                                        <ProFormDateRangePicker name="dateRange" label="试卷有效期" initialValue={[ruleData.start_time, ruleData.end_time]} rules={[{ required: true, message: '请输试卷有效期' }]} />
+                                        {console.log('###', ruleData)}
+                                        <ProFormDateRangePicker width='lg' name="dateRange" label="试卷有效期" initialValue={ (ruleData?.start_time && ruleData?.end_time) ? [ruleData?.start_time, ruleData?.end_time] : []} rules={[{ required: true, message: '请输试卷有效期' }]} />
                                         <Row style={{marginBottom:24,marginTop:-7}}>
                                             <Col offset={8} style={{color:'#bfbfbf'}}>试卷有效期指超过试卷有效期重新生成试卷</Col>                                            
                                         </Row>                                        
@@ -372,13 +418,14 @@ export default () => {
                                 options={false}
                                 search={false}
                                 toolBarRender={() => (
-                                    <Space style={{margin:-24}} >
+                                    <Space style={{margin:-48}} >
                                         <Button
                                             type="primary"
                                             key="primary"
                                             onClick={() => {
                                                 handleAutoModalVisible(true)
                                             }}
+                                            style={{marginRight:5}}
                                         >
                                             <PlusOutlined /> 系统组卷
                                         </Button> 
diff --git a/admin/src/pages/questionbank/index.tsx b/admin/src/pages/questionbank/index.tsx
index 99bee07..44f586a 100644
--- a/admin/src/pages/questionbank/index.tsx
+++ b/admin/src/pages/questionbank/index.tsx
@@ -584,7 +584,7 @@ const QuestionBank = () => {
                     <Space direction="horizontal" size="large">
                       <Typography>创建时间：{record?.create_time}</Typography>
                       <Typography>标签：{record?.tag_name}</Typography>
-                      <Typography>所属课程：{record?.course_name}</Typography>
+                      <Typography>课程：{record?.course_name}</Typography>
                     </Space>
                   </Col>
                   <Col flex={1} style={{textAlign:'right'}}>
diff --git a/web/src/pages/mockExamination/index.tsx b/web/src/pages/mockExamination/index.tsx
index 8a6768f..68e2435 100644
--- a/web/src/pages/mockExamination/index.tsx
+++ b/web/src/pages/mockExamination/index.tsx
@@ -8,59 +8,71 @@ import styles from './style.less';
 
 import ProTable from '@ant-design/pro-table';
 
-const columns: ProColumns<GithubIssueItem>[] = [
-  {
-    dataIndex: 'index',
-    valueType: 'indexBorder',
-    width: 48,
-  },
-  {
-    title: '标题',
-    dataIndex: 'rules_name',
-  },
-
-  {
-    title: '考试时间',
-    key: 'examination_time',
-    dataIndex: 'examination_time',
-    valueType: 'text',
-  },
-  {
-    title: '总分',
-    key: 'sum_score',
-    dataIndex: 'sum_score',
-    valueType: 'text',
-  },
-  {
-    title: '及格',
-    key: 'pass_score',
-    dataIndex: 'pass_score',
-    valueType: 'text',
-  },
-
-  {
-    title: '操作',
-    valueType: 'option',
-    render: (text, record, _, action) => [
-      <a
-        key="editable"
-        onClick={() => {
-          history.push(`/mockExamination/index/paper/${record.id}/${record.examination_time}`);
-        }}
-      >
-        开始考试
-      </a>,
-
-    ],
-  },
-];
 const SubjectList = () => {
 
+  const columns: ProColumns<GithubIssueItem>[] = [
+    {
+      dataIndex: 'index',
+      valueType: 'indexBorder',
+      width: 48,
+    },
+    {
+      title: '封面',
+      valueType: 'text',
+      request: async (params) => {
+        //alert(123)
+        // console.log('arr',arr)
+        // const {tags} = arr;
+        console.log('params::::', params );
+        const { data } = await getRulesList({b_use: 0});
+        return '123';
+      },
+    },
+    {
+      title: '标题',
+      dataIndex: 'rules_name',
+    },
+  
+    {
+      title: '考试时间',
+      key: 'examination_time',
+      dataIndex: 'examination_time',
+      valueType: 'text',
+    },
+    {
+      title: '总分',
+      key: 'sum_score',
+      dataIndex: 'sum_score',
+      valueType: 'text',
+    },
+    {
+      title: '及格',
+      key: 'pass_score',
+      dataIndex: 'pass_score',
+      valueType: 'text',
+    },
+  
+    {
+      title: '操作',
+      valueType: 'option',
+      render: (text, record, _, action) => [
+        <a
+          key="editable"
+          onClick={() => {
+            history.push(`/mockExamination/index/paper/${record.id}/${record.examination_time}`);
+          }}
+        >
+          开始考试
+        </a>,
+  
+      ],
+    },
+  ];
   const actionRef = useRef<ActionType>();
   return (
     <PageContainer content={false} extraContent={false}>
       <div className={styles.cardList}>
-        <ProTable<GithubIssueItem>
+        <ProTable
           columns={columns}
           actionRef={actionRef}
           request={async (value) => {
@@ -70,23 +82,35 @@ const SubjectList = () => {
               rules_type: 0
             })
             console.log(RulesData.table_List)
+
+            const _data = await getRulesList({
+              ...value,
+              b_use: 1,
+              rules_type: 0
+            });
+            const _data1 = await getRulesList({
+              ...value,
+              b_use: 1,
+              rules_type: 0
+            });
+
             return { data: RulesData.table_List }
           }}
-          editable={{
+          /*editable={{
             type: 'multiple',
           }}
           columnsState={{
             persistenceKey: 'pro-table-singe-demos',
             persistenceType: 'localStorage',
-          }}
+          }}*/
           search={false}
           rowKey="id"
           toolBarRender={false}
           pagination={{
             pageSize: 10,
           }}
-          dateFormatter="string"
-          headerTitle="高级表格"
+          //dateFormatter="string"
+          //headerTitle="高级表格"
         />
       </div>
     </PageContainer>