Merge branch 'master' of http://10.10.14.176:3000/web/syzx

web/src/pages/mockExamination/paper/index.tsx

@@ -2,7 +2,7 @@
 import { AlignLeftOutlined, PlusOutlined } from '@ant-design/icons';
 import { Switch, Button, Card, Col, List, Menu, Progress, Row, Typography, Space, Divider, Radio, Checkbox, Form } from 'antd';
 import { PageContainer } from '@ant-design/pro-layout';
-import { useParams, useRequest } from 'umi';
+import { useParams, useRequest, history } from 'umi';
 import { useEffect, useRef, useState } from 'react';
 const { Text, Link } = Typography;
 import { getRulesPaper, getPaperQuestionList, finishExamination, getCurrentDate } from '../service';
@@ -196,7 +196,7 @@ const CardList = () => {
 
         if (result.success) {
           console.log(result, 'questionFinish server', params)
-          history.push(`/mockExamination/index/paper/${record.id}/${record.examination_time}`);
+          history.push(`/mockExamination/index/paper/${result.id}/${result.examination_time}`);
 
         }
       }