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

web/src/pages/mockExamination/chapterErrorListPaper.tsx

@@ -243,7 +243,7 @@ const CardList = () => {
                     >
                         <Space direction="vertical" style={{ width: '100%', padding: '24px 48px' }}>
                             <Typography style={{ marginBottom: 16, fontSize: 18 }}>
-                                {JSON.stringify(questionNow) !== {} ? questionNow.index[1] + 1 : ""} 、{questionNow?.question_stem}
+                                、{questionNow?.question_stem}
 
                             </Typography>
                             <Space direction="vertical" style={{ fontSize: 16 }}>
@@ -368,6 +368,12 @@ const CardList = () => {
                                                                 // runSavePersonAnswer({
                                                                 //     answer_ids: e.target.value,
                                                                 //     question_id: questionNow.question_id,
+                                                                //     record_id: rulesPaperInfo.record_id
+                                                                // })
+                                                                // console.log("答题：", questionAnswer, qArr, questionNow)
+                                                                // 修改答题卡状态 写入答案以及修改答题状态
+                                                                const qX = questionNow?.question_type;
+                                                                const qI = questionNow?.index;
                                                                 questionList[questionNow.index[0]].question_list[questionNow.index[1]].answerSelect = questionAnswer;
                                                                 if (questionAnswer === questionNow.answertrue) {
                                                                     questionList[questionNow.index[0]].question_list[questionNow.index[1]].state = 0
@@ -385,71 +391,88 @@ const CardList = () => {
 
                                                     })}</Space></Radio.Group>
                                             ) : ""
-                                        }              <div style={{ background: '#ffffff', padding: 24 }}>
+                                        }
-                                            <Space direction="vertical" style={{ width: '100%' }}>
+                                    </Form.Item>
-                                                <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
+                                </Form>
-                                                <strong>答题序号</strong>
+                            </Space>
-                                                <Typography>{questionNowNum}/{questionNum}</Typography>
+
-                                                <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
+                            <Radio.Group onChange={() => { return true }} value={0} size="large">
-                                                <Button
+                                <Space direction="vertical" style={{ fontSize: 16 }}>
-                                                    size="large"
+                                    <Button type="primary" onClick={() => {
-                                                    disabled={lastBtnShow}
+                                        setParsingShow(!parsingShow)
-
+                                    }}>查看答案</Button>
-                                                    onClick={() => {
+                                    <div style={{ display: (parsingShow ? 'block' : 'none') }} dangerouslySetInnerHTML={{ __html: questionNow.parsing }} />
-
+                                </Space>
-                                                        paperInfo.map((e, i) => {
+                            </Radio.Group>
-
+                        </Space>
-                                                            if (e.question_id === questionNow.question_id) {
+                    </ProCard>
-                                                                const nextTemp = paperInfo[i - 1]
+                </Col>
-                                                                const questionList = questionTypeList
+                <Col span={5} style={{ paddingLeft: 24 }}>
-                                                                let nextData = {}
+                    <div style={{ background: '#ffffff', padding: 24 }}>
-                                                                questionList[nextTemp.index[0]].question_list.map((item, index) => {
+                        <Space direction="vertical" style={{ width: '100%' }}>
-                                                                    if (item.question_id === nextTemp.question_id) {
+                            <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
-                                                                        nextData = item
+                            <strong>答题序号</strong>
-                                                                    }
+                            <Typography>{questionNowNum}/{questionNum}</Typography>
-                                                                })
+                            <Divider style={{ margin: '6px 0', opacity: 0.5 }} />
-                                                                setQuestionNow(nextData)
+                            <Button
-                                                            }
+                                size="large"
+                                disabled={lastBtnShow}
+
+                                onClick={() => {
+
+                                    paperInfo.map((e, i) => {
+
+                                        if (e.question_id === questionNow.question_id) {
+                                            const nextTemp = paperInfo[i - 1]
+                                            const questionList = questionTypeList
+                                            let nextData = {}
+                                            questionList[nextTemp.index[0]].question_list.map((item, index) => {
+                                                if (item.question_id === nextTemp.question_id) {
+                                                    nextData = item
+                                                }
+                                            })
+                                            setQuestionNow(nextData)
+                                        }
 
-                                                        })
+                                    })
 
-                                                    }}
+                                }}
 
-                                                    block>上一题</Button>
+                                block>上一题</Button>
 
-                                                <Button size="large"
+                            <Button size="large"
-                                                    disabled={nextBtnShow}
+                                disabled={nextBtnShow}
-                                                    block onClick={() => {
+                                block onClick={() => {
 
-                                                        paperInfo.map((e, i) => {
+                                    paperInfo.map((e, i) => {
 
-                                                            if (e.question_id === questionNow.question_id) {
+                                        if (e.question_id === questionNow.question_id) {
-                                                                const nextTemp = paperInfo[i + 1]
+                                            const nextTemp = paperInfo[i + 1]
-                                                                const questionList = questionTypeList
+                                            const questionList = questionTypeList
-                                                                let nextData = {}
+                                            let nextData = {}
-                                                                questionList[nextTemp.index[0]].question_list.map((item, index) => {
+                                            questionList[nextTemp.index[0]].question_list.map((item, index) => {
-                                                                    if (item.question_id === nextTemp.question_id) {
+                                                if (item.question_id === nextTemp.question_id) {
-                                                                        nextData = item
+                                                    nextData = item
-                                                                    }
+                                                }
-                                                                })
+                                            })
-                                                                setQuestionNow(nextData)
+                                            setQuestionNow(nextData)
-                                                            }
+                                        }
-
+
-                                                        })
+                                    })
-
+
-                                                    }}>下一题</Button>
+                                }}>下一题</Button>
-                                                <Button size="large" type="primary"
+                            <Button size="large" type="primary"
-                                                    onClick={() => {
+                                onClick={() => {
-
+
-                                                        history.goBack();
+                                    history.goBack();
-                                                    }}
+                                }}
-                                                    block>返回</Button>
+                                block>返回</Button>
-                                            </Space>
+                        </Space>
-                                        </div>
+                    </div>
-                                    </Col>
+                </Col>
-                                </Row >
+            </Row >
-                            </PageContainer >
+        </PageContainer >
-                            );
+    );
 };
 
-                            export default CardList;
+export default CardList;