From c5862c589d28a2b74e2ec8484cc68d3f45e7929b Mon Sep 17 00:00:00 2001
From: hujunpeng <junpeng.hu@51dayu.com.cn>
Date: Fri, 28 Mar 2025 10:59:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../compoents/ExamPaperAnalysisDetailPage.tsx |  20 +--
 .../src/views/question/questionAdd.tsx        | 121 +++++++++---------
 2 files changed, 73 insertions(+), 68 deletions(-)

diff --git a/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisDetailPage.tsx b/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisDetailPage.tsx
index 252bceb..24f0cdc 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisDetailPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisDetailPage.tsx
@@ -111,33 +111,35 @@ const ExamPaperAnalysisDetailPage: React.FC<RouteComponentProps> = ({history}) =
     };
 
     return (
-        <div style={{ padding: 20 }}>
-            <ESBreadcrumbComponent url="/exam-statistics" previousText={"考试统计"} currentText={"试卷分析"} />
+        <div style={{padding: 20}}>
             {paperData && (
-                <>
+                <div>
                     {/* 第一行：试卷名称 */}
                     <Row gutter={16}>
                         <Col span={24}>
                             <Title level={3}>试卷名称：{paperData.paperName}</Title>
-                            <Button onClick={()=>handleGoBack()}>返回</Button>
                         </Col>
                     </Row>
                     {/* 第二行：QuestionComponent 标签 */}
-                    <Row gutter={16} style={{ marginTop: 20 }}>
+                    <Row gutter={16} style={{marginTop: 20}}>
                         <Col span={24}>
-                            <QuestionComponent questions={tableData} />
+                            <QuestionComponent questions={tableData}/>
                         </Col>
                     </Row>
                     {/* 第三行：柱状图 */}
-                    <Row gutter={16} style={{ marginTop: 20 }}>
+                    <Row gutter={16} style={{marginTop: 20}}>
                         <Col span={24}>
                             <h1>准确率分析</h1>
-                            <ReactECharts option={getBarChartOption(paperData.questionAccuracyData)} />
+                            <ReactECharts option={getBarChartOption(paperData.questionAccuracyData)}/>
                         </Col>
                     </Row>
-                </>
+                </div>
             )}
+            <div style={{display: 'flex', justifyContent: 'flex-end'}}>
+                <Button onClick={() => handleGoBack()}>返回</Button>
+            </div>
         </div>
+
     );
 };
 
diff --git a/packages/examination/src/views/question/questionAdd.tsx b/packages/examination/src/views/question/questionAdd.tsx
index 24eff92..920b6e9 100644
--- a/packages/examination/src/views/question/questionAdd.tsx
+++ b/packages/examination/src/views/question/questionAdd.tsx
@@ -2,6 +2,7 @@ import React, { Component } from "react";
 import { Form, Input, Button, Radio, Checkbox, Select, message } from "antd";
 import { dictionary } from "api/dict/index";
 import { addQuestion, findIndustry } from "api/question";
+import { CloseCircleOutlined } from '@ant-design/icons';
 import * as XLSX from "xlsx";
 
 const { Option } = Select;
@@ -282,70 +283,72 @@ class QuestionAdd extends Component<any, States> {
                     {formIds.map((formId, index) => (
                         <div key={formId} style={{ marginBottom: 30 }}>
                             <div style={{ display: "flex" }}>
-                                <Form.Item name={`questionTypes_${formId}`}>
-                                    <Radio.Group
-                                        onChange={(e) => this.handleQuestionTypeChange(formId, e.target.value)}
-                                    >
-                                        <Radio.Button value="1">单选题</Radio.Button>
-                                        <Radio.Button value="2">多选题</Radio.Button>
-                                    </Radio.Group>
-                                </Form.Item>
-                                <Form.Item
-                                    label="监管行业："
-                                    name={`industryId_${formId}`}
-                                    rules={[{ required: true, message: "请选择监管行业" }]}
-                                >
-                                    <Select
-                                        placeholder="请选择监管行业"
-                                        style={{ width: 240 }}
-                                        allowClear
+                                <div style={{ display: "flex", flex: 1, justifyContent: "flex-start" }}>
+                                    <Form.Item name={`questionTypes_${formId}`}>
+                                        <Radio.Group
+                                            onChange={(e) => this.handleQuestionTypeChange(formId, e.target.value)}
+                                        >
+                                            <Radio.Button value="1">单选题</Radio.Button>
+                                            <Radio.Button value="2">多选题</Radio.Button>
+                                        </Radio.Group>
+                                    </Form.Item>
+                                    <Form.Item
+                                        label="监管行业："
+                                        name={`industryId_${formId}`}
+                                        rules={[{ required: true, message: "请选择监管行业" }]}
                                     >
-                                        {industryDict && industryDict.length > 0? (
-                                            (() => {
-                                                let rows = [];
-                                                for (let i = 0; i < industryDict.length; i++) {
-                                                    const item = industryDict[i];
-                                                    rows.push(
-                                                        <Option value={item.industryId}>{item.industryName}</Option>
-                                                    );
-                                                }
-                                                return rows;
-                                            })()
-                                        ) : (
-                                            <Option disabled>暂无数据</Option>
-                                        )}
-                                    </Select>
-                                </Form.Item>
-                                <Form.Item
-                                    label="AQ服务类型："
-                                    name={`serviceTypeId_${formId}`}
-                                    rules={[{ required: true, message: "请选择AQ服务类型" }]}
-                                >
-                                    <Select
-                                        placeholder="请选择AQ服务类型"
-                                        style={{ width: 240 }}
-                                        allowClear
+                                        <Select
+                                            placeholder="请选择监管行业"
+                                            style={{ width: 240 }}
+                                            allowClear
+                                        >
+                                            {industryDict && industryDict.length > 0? (
+                                                (() => {
+                                                    let rows = [];
+                                                    for (let i = 0; i < industryDict.length; i++) {
+                                                        const item = industryDict[i];
+                                                        rows.push(
+                                                            <Option value={item.industryId}>{item.industryName}</Option>
+                                                        );
+                                                    }
+                                                    return rows;
+                                                })()
+                                            ) : (
+                                                <Option disabled>暂无数据</Option>
+                                            )}
+                                        </Select>
+                                    </Form.Item>
+                                    <Form.Item
+                                        label="AQ服务类型："
+                                        name={`serviceTypeId_${formId}`}
+                                        rules={[{ required: true, message: "请选择AQ服务类型" }]}
                                     >
-                                        {serviceTypeDict && serviceTypeDict.length > 0? (
-                                            (() => {
-                                                let rows = [];
-                                                for (let i = 0; i < serviceTypeDict.length; i++) {
-                                                    const item = serviceTypeDict[i];
-                                                    rows.push(
-                                                        <Option value={String(item.dictKey)}>{item.dictValue}</Option>
-                                                    );
-                                                }
-                                                return rows;
-                                            })()
-                                        ) : (
-                                            <Option disabled>暂无数据</Option>
-                                        )}
-                                    </Select>
-                                </Form.Item>
+                                        <Select
+                                            placeholder="请选择AQ服务类型"
+                                            style={{ width: 240 }}
+                                            allowClear
+                                        >
+                                            {serviceTypeDict && serviceTypeDict.length > 0? (
+                                                (() => {
+                                                    let rows = [];
+                                                    for (let i = 0; i < serviceTypeDict.length; i++) {
+                                                        const item = serviceTypeDict[i];
+                                                        rows.push(
+                                                            <Option value={String(item.dictKey)}>{item.dictValue}</Option>
+                                                        );
+                                                    }
+                                                    return rows;
+                                                })()
+                                            ) : (
+                                                <Option disabled>暂无数据</Option>
+                                            )}
+                                        </Select>
+                                    </Form.Item>
+                                </div>
                                 <Form.Item>
                                     {index > 0 && (
                                         <Button type="link" onClick={() => this.handleDeleteQuestion(formId)}>
-                                            X
+                                            <CloseCircleOutlined />
                                         </Button>
                                     )}
                                 </Form.Item>