Merge branch 'feature/pangguoming/20210607/answer_detail' into dev

src/modules/teach-tool/examination-manager/TestDetailPage.jsx

@@ -7,19 +7,17 @@
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  * @Copyrigh: © 2020 杭州杰竞科技有限公司 版权所有
  */
  */
 import React, { useState, useEffect } from 'react';
 import React, { useState, useEffect } from 'react';
-import { Route, withRouter } from 'react-router-dom';
+import { withRouter } from 'react-router-dom';
 import User from '@/common/js/user';
 import User from '@/common/js/user';
 import './TestDetailPage.less';
 import './TestDetailPage.less';
 import Service from '@/common/js/service';
 import Service from '@/common/js/service';
-import { message, Empty } from 'antd';
-import moment from 'moment';
+import { message } from 'antd';
 import AnswerDescPage from '../components/AnswerDescPage';
 import AnswerDescPage from '../components/AnswerDescPage';
 import Breadcrumbs from '@/components/Breadcrumbs';
 import Breadcrumbs from '@/components/Breadcrumbs';
 
 
 function TestDetailPage(props) {
 function TestDetailPage(props) {
   const examId = props.match.params.testId.replace(/\?.+/, '');
   const examId = props.match.params.testId.replace(/\?.+/, '');
   const paperId = window.getParameterByName('paperId');
   const paperId = window.getParameterByName('paperId');
-  const [customerId, setCustomerId] = useState('');
   const [examDetail, setExamDetail] = useState({
   const [examDetail, setExamDetail] = useState({
     answerAnalysis: '',
     answerAnalysis: '',
     resultShow: '',
     resultShow: '',
@@ -36,34 +34,15 @@ function TestDetailPage(props) {
     totalScore: 0,
     totalScore: 0,
     userCorrectQuestion: 0,
     userCorrectQuestion: 0,
     userExamDuration: 0,
     userExamDuration: 0,
-    userExamState: 'INIT',
     userScore: 0,
     userScore: 0,
   }); // 考试详情
   }); // 考试详情
-  const [testState, setTestState] = useState({
-    isDelete: false,
-  }); // 考试状态
   const [paperDetail, setPaperDetail] = useState({}); // 试卷详情
   const [paperDetail, setPaperDetail] = useState({}); // 试卷详情
   const [questionList, setQuestionList] = useState([]); // 试卷题目列表
   const [questionList, setQuestionList] = useState([]); // 试卷题目列表
   const [userAnswerList, setUserAnswerList] = useState([]); // 用户答案列表
   const [userAnswerList, setUserAnswerList] = useState([]); // 用户答案列表
   const [isScrollShow, setIsScrollShow] = useState(false); // 是否展示回到顶部按钮
   const [isScrollShow, setIsScrollShow] = useState(false); // 是否展示回到顶部按钮
 
 
-  const {
-    answerAnalysis,
-    resultContent,
-    resultShow,
-    examName,
-    examStartTime,
-    examEndTime,
-    totalScore,
-    totalQuestionCount,
-    passScore,
-    examDuration,
-    examDesc,
-    userExamDuration,
-    userExamState,
-    userScore,
-    userCorrectQuestion,
-  } = examDetail;
+  const { answerAnalysis, resultContent, examName, totalScore, totalQuestionCount, passScore, examDuration, userExamDuration, userScore, userCorrectQuestion } =
+    examDetail;
 
 
   useEffect(() => {
   useEffect(() => {
     bindScroll();
     bindScroll();
@@ -120,9 +99,6 @@ function TestDetailPage(props) {
 
 
   function handleChangeShowErrorPage() {
   function handleChangeShowErrorPage() {
     setIsShowErrorPage(true);
     setIsShowErrorPage(true);
-    setTestState({
-      isDelete: true,
-    });
   }
   }
 
 
   // 用户时长转换
   // 用户时长转换
@@ -157,10 +133,6 @@ function TestDetailPage(props) {
   }
   }
 
 
   function renderResultInfo() {
   function renderResultInfo() {
-    console.log('userExamState====>', userExamState);
-    if (userExamState !== 'INIT') {
-      if (userExamState === 'FINISH_EXAM') {
-        if (resultShow === 'IMMEDIATELY' || (resultShow === 'AFTER_EXAM_END' && Date.now() > examEndTime)) {
     return (
     return (
       <div>
       <div>
         <div className='exam-info'>
         <div className='exam-info'>
@@ -218,9 +190,7 @@ function TestDetailPage(props) {
                     }}>
                     }}>
                     <img
                     <img
                       className='icon'
                       className='icon'
-                            src={
-                              item.isCorrect === 1 ? 'https://image.xiaomaiketang.com/xm/FwZa2Kaypc.png' : 'https://image.xiaomaiketang.com/xm/7tRHDf6ysA.png'
-                            }
+                      src={item.isCorrect === 1 ? 'https://image.xiaomaiketang.com/xm/FwZa2Kaypc.png' : 'https://image.xiaomaiketang.com/xm/7tRHDf6ysA.png'}
                     />
                     />
                     <div className='result-content-box'>{index + 1}</div>
                     <div className='result-content-box'>{index + 1}</div>
                   </div>
                   </div>
@@ -232,47 +202,6 @@ function TestDetailPage(props) {
         <AnswerDescPage />
         <AnswerDescPage />
       </div>
       </div>
     );
     );
-        } else if (resultShow === 'AFTER_EXAM_END') {
-          return customizeRenderEmpty('after');
-        }
-      } else {
-        return customizeRenderEmpty('lack');
-      }
-    }
-  }
-
-  function customizeRenderEmpty(status) {
-    return (
-      <div className='empty-result'>
-        <Empty
-          image={status === 'lack' ? 'https://image.xiaomaiketang.com/xm/7xi4YTXmHK.png' : 'https://image.xiaomaiketang.com/xm/bhGtST27Hf.png'}
-          imageStyle={{
-            height: '100px',
-          }}
-          description={
-            status === 'lack' ? (
-              <div className='lack-desc'>
-                <div className='title'>缺考</div>
-                <div className='content'>你没有成功交卷哦</div>
-              </div>
-            ) : (
-              <div className='after-desc'>
-                <div className='title'>恭喜你完成考试！</div>
-                <div className='after-show-box'>
-                  <div>本次考试用时 {window.formatHourTime(Number(userExamDuration || 0))}</div>
-                  <div>
-                    考试结果会在
-                    <span style={{ color: '#333333' }}>
-                      {moment(Number(examEndTime)).format('YYYY.MM.DD HH:mm')}
-                      公布哦
-                    </span>
-                  </div>
-                </div>
-              </div>
-            )
-          }></Empty>
-      </div>
-    );
   }
   }
 
 
   let sortedAnswerList = [];
   let sortedAnswerList = [];