Merge branch 'feature/yuananting/20210327/test-paper' of…

Merge branch 'feature/yuananting/20210327/test-paper' of https://xmgit.ixm5.cn/xiaomai-cloud-class/xiaomai-cloud-class-web into feature/yuananting/20210327/test-paper

src/modules/teach-tool/examination-manager/AddExam.tsx

@@ -50,8 +50,9 @@ function AddExam(props: any) {
     }, [])
 
     useEffect(() => {
+        console.log(paperInfo)
         setPaperId(paperInfo.paperId)
-        setPassRate(paperInfo.passScore)
+        setPassRate(paperInfo.passRate)
 
     }, [paperInfo.paperId])
 

src/modules/teach-tool/examination-manager/ExamData.tsx

@@ -19,7 +19,7 @@ function ExamData(props: any) {
     }
 
     const examDataInit: any = {};
-    const queryInit: any = { current: 1, size: 10,order: 'SORT_ASC'};
+    const queryInit: any = { current: 1, size: 10, order: 'SORT_ASC' };
     const [examData, setUserData] = useState(examDataInit);
     const [list, setList] = useState([]);
     const [query, setQuery] = useState(queryInit);
@@ -102,7 +102,7 @@ function ExamData(props: any) {
             title: "序号",
             dataIndex: "sort",
             width: 60,
-            render: (text: any) => <span>{text+1}</span>,
+            render: (text: any) => <span>{text + 1}</span>,
         },
         {
             title: "题目",
@@ -128,7 +128,7 @@ function ExamData(props: any) {
             dataIndex: "currentAccuracy",
             sorter: true,
             sortOrder: field === "currentAccuracy" ? order : sortStatus.type,
-            render: (text: any) => <span>{text*100}%</span>,
+            render: (text: any) => <span>{text * 100}%</span>,
         },
         {
             title: <div>历史正确率 <Tooltip
@@ -140,7 +140,7 @@ function ExamData(props: any) {
             </Tooltip>
             </div>,
             dataIndex: "totalAccuracy",
-            render: (text: any) => <span>{text*100}%</span>,
+            render: (text: any) => <span>{text * 100}%</span>,
 
         },
 
@@ -177,8 +177,8 @@ function ExamData(props: any) {
             userId: User.getStoreUserId(),
             source: 0
         }).then((res) => {
-            const dom =(document as any).getElementById("load-play-back-excel")
-            dom.setAttribute('href',res.result);
+            const dom = (document as any).getElementById("load-play-back-excel")
+            dom.setAttribute('href', res.result);
             dom.click();
 
         })
@@ -195,35 +195,35 @@ function ExamData(props: any) {
         ></a>
         <div className="dataPanal">
             <div className="item">
-                <div className="num">{examData.singleChoiceAccuracy * 100}%</div>
+                <div className="num">{(examData.singleChoiceAccuracy || 0) * 100}%</div>
                 <div className="percent">正确率</div>
                 <div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fa;</span> 单选题 <span>(共{examData.singleChoiceCnt}题)</span></div></div>
             </div>
             <div className="item">
-                <div className="num">{examData.multiChoiceAccuracy * 100}%</div>
+                <div className="num">{(examData.multiChoiceAccuracy || 0) * 100}%</div>
                 <div className="percent">正确率</div>
                 <div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fb;</span>多选题 <span>(共{examData.multiChoiceCnt}题)</span></div></div>
             </div>
             <div className="item">
-                <div className="num">{examData.judgeAccuracy * 100}%</div>
+                <div className="num">{(examData.judgeAccuracy || 0) * 100}%</div>
                 <div className="percent">正确率</div>
                 <div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fc;</span>判断题 <span>(共{examData.judgeCnt}题)</span></div></div>
             </div>
             <div className="item">
-                <div className="num">{examData.gapFillingAccuracy * 100}%</div>
+                <div className="num">{(examData.gapFillingAccuracy || 0) * 100}%</div>
                 <div className="percent">正确率</div>
                 <div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fd;</span>填空题 <span>(共{examData.gapFillingCnt}题)</span></div></div>
             </div>
             <div className="item">
-                <div className="num">{examData.indefiniteChoiceAccuracy * 100}%</div>
+                <div className="num">{(examData.indefiniteChoiceAccuracy || 0) * 100}%</div>
                 <div className="percent">正确率</div>
                 <div className="subTitle"><div className="type"><span className="icon iconfont">&#xe7fe;</span>不定项选择题 <span>(共{examData.indefiniteChoiceCnt}题)</span></div></div>
             </div>
         </div>
         {
-            !!allData &&  <Button style={{ marginBottom: 12, marginTop: 12 }} onClick={download} >导出</Button>
+            !!allData && <Button style={{ marginBottom: 12, marginTop: 12 }} onClick={download} >导出</Button>
         }
-       
+
 
         <div className="content">
             <Table