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

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

@@ -136,22 +136,18 @@ function TestDetailPage(props) {
     return (
     return (
       <div>
       <div>
         <div className='exam-info'>
         <div className='exam-info'>
-          {['PASS_AND_SCORE', 'ONLY_SCORE'].includes(resultContent) && (
-            <div className='info-score item'>
-              <div className='current-score'>
-                {userScore}
-                <img src='https://image.xiaomaiketang.com/xm/TsaApiPyxA.png' />
-              </div>
-              <div className='origin-data'>总分{totalScore}</div>
+          <div className='info-score item'>
+            <div className='current-score'>
+              {userScore}
+              <img src='https://image.xiaomaiketang.com/xm/TsaApiPyxA.png' />
             </div>
             </div>
-          )}
+            <div className='origin-data'>总分{totalScore}</div>
+          </div>
 
 
-          {['PASS_AND_SCORE', 'ONLY_PASS'].includes(resultContent) && (
-            <div className='info-level item'>
-              <div className='current-level'>{userScore < passScore ? '不及格' : '及格'}</div>
-              <div className='origin-data'>及格分{passScore}</div>
-            </div>
-          )}
+          <div className='info-level item'>
+            <div className='current-level'>{userScore < passScore ? '不及格' : '及格'}</div>
+            <div className='origin-data'>及格分{passScore}</div>
+          </div>
 
 
           <div className='info-correct item'>
           <div className='info-correct item'>
             <div className='current-correct'>
             <div className='current-correct'>
@@ -169,36 +165,35 @@ function TestDetailPage(props) {
             <div className='origin-data'>考试时长{(examDuration || 0) / 60 / 1000}分钟</div>
             <div className='origin-data'>考试时长{(examDuration || 0) / 60 / 1000}分钟</div>
           </div>
           </div>
         </div>
         </div>
-        {['ANALYSE_AND_RIGHT_OR_WRONG', 'RIGHT_OR_WRONG'].includes(answerAnalysis) && (
-          <div className='exam-result'>
-            <div className='result-title'>
-              <div className='left-title'>答题情况</div>
-              <div className='right-tip'>
-                <span className='correct-num'>{userCorrectQuestion}</span>
-                <span className='incorrect-num'>/{totalQuestionCount} </span>
-                道正确
-              </div>
-            </div>
-            <div className='result-content'>
-              {sortedAnswerList.map((item, index) => {
-                return (
-                  <div
-                    className='result-content__item'
-                    onClick={() => {
-                      console.log('item', item);
-                      handleQuickActiveQuestion(item.questionId);
-                    }}>
-                    <img
-                      className='icon'
-                      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>
-                );
-              })}
+
+        <div className='exam-result'>
+          <div className='result-title'>
+            <div className='left-title'>答题情况</div>
+            <div className='right-tip'>
+              <span className='correct-num'>{userCorrectQuestion}</span>
+              <span className='incorrect-num'>/{totalQuestionCount} </span>
+              道正确
             </div>
             </div>
           </div>
           </div>
-        )}
+          <div className='result-content'>
+            {sortedAnswerList.map((item, index) => {
+              return (
+                <div
+                  className='result-content__item'
+                  onClick={() => {
+                    console.log('item', item);
+                    handleQuickActiveQuestion(item.questionId);
+                  }}>
+                  <img
+                    className='icon'
+                    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>
+              );
+            })}
+          </div>
+        </div>
         <AnswerDescPage />
         <AnswerDescPage />
       </div>
       </div>
     );
     );