From bafbcb4de341ea6254d3e6de1f947eeea354ae35 Mon Sep 17 00:00:00 2001
From: hujunpeng <junpeng.hu@51dayu.com.cn>
Date: Tue, 25 Mar 2025 16:00:04 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=98=E5=BA=93=E7=AE=A1=E7=90=86=E5=92=8C?=
 =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AE=A1=E7=90=86=E4=BB=A3=E7=A0=81=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exam-online/compoents/ExamDetailAnalysisPage.tsx  |  2 +-
 .../src/views/exam-online/compoents/ExamEditPage.tsx  | 11 ++++++-----
 .../exam-online/compoents/ExamPaperAnalysisPage.tsx   |  2 +-
 .../examination/src/views/examPaper/examPaperAdd.tsx  |  4 +++-
 .../examination/src/views/examPaper/examPaperList.tsx |  1 +
 .../examination/src/views/question/questionList.tsx   |  6 +++++-
 6 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx b/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx
index 1e3a12a..b291093 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx
@@ -40,6 +40,7 @@ const ExamDetailAnalysisPage: React.FC = () => {
             try {
                 const industryResponse = await getIndustryList();
                 setIndustryOptions(industryResponse.map((item: any) => ({ value: item.industry_id, label: item.industry_name })));
+                handleSearch();
             } catch (error) {
                 console.error('数据获取失败:', error);
             }
@@ -167,7 +168,6 @@ const ExamDetailAnalysisPage: React.FC = () => {
 
     return (
         <div style={{ padding: 20 }}>
-            <ESBreadcrumbComponent url="/exam-statistics" previousText={"考试统计"} currentText={"考试详情"} />
             {/* 检索条件行 */}
             <Row gutter={16}>
                 <Col span={5}>
diff --git a/packages/examination/src/views/exam-online/compoents/ExamEditPage.tsx b/packages/examination/src/views/exam-online/compoents/ExamEditPage.tsx
index 5a8193f..6509c1e 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamEditPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamEditPage.tsx
@@ -233,8 +233,6 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
 
     return (
         <div>
-            {/* 添加面包屑组件 */}
-            <ESBreadcrumbComponent currentText={breadcrumbText} />
             <h1>考试基本信息</h1>
             <Form
                 ref={formRef}
@@ -264,11 +262,14 @@ const ExamBasicInfoForm: React.FC<PropsWithRouter> = (props) => {
                 <Form.Item
                     label="监管行业"
                     name="regulatedIndustry"
-                    rules={[]}
-                    required
+                    rules={[
+                        {
+                            required: true,
+                            message: '请选择监管行业',
+                        },
+                    ]}
                 >
                     <Select placeholder="请选择监管行业" onChange={handleIndustryChange}>
-                        <Option key="" value="">全部</Option>
                         {industryOptions.map(option => (
                             <Option key={option.value} value={option.value}>
                                 {option.label}
diff --git a/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisPage.tsx b/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisPage.tsx
index 5b01d2d..4f2ad28 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisPage.tsx
@@ -45,6 +45,7 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
                 setTotalCount(paperAnalysisResponse.totalCount);
                 setUsedCount(paperAnalysisResponse.usedCount);
                 setDisabledCount(paperAnalysisResponse.disabledCount);
+                handleSearch();
             } catch (error) {
                 console.error('数据获取失败:', error);
             }
@@ -139,7 +140,6 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
 
     return (
         <div style={{ padding: 20 }}>
-            <ESBreadcrumbComponent url="/exam-statistics" previousText={"考试统计"} currentText={"试卷分析"} />
             {/* 检索条件行 */}
             <Row gutter={16}>
                 <Col span={6}>
diff --git a/packages/examination/src/views/examPaper/examPaperAdd.tsx b/packages/examination/src/views/examPaper/examPaperAdd.tsx
index bdf6602..178b222 100644
--- a/packages/examination/src/views/examPaper/examPaperAdd.tsx
+++ b/packages/examination/src/views/examPaper/examPaperAdd.tsx
@@ -543,10 +543,11 @@ class ExamPaperAdd extends Component<any, States> {
                             dataSource={selectedQuestionList}
                             columns={columns}
                             bordered={true}
+                            scroll={{ y: 200 }}
                             size={'small'}
                         />
                     </div>
-                    <div>
+                    <div style={{ marginTop: '20px' }}>
                         <h3 style={{ fontWeight: 'bold' }}>试题选择</h3>
                         <Form
                             className="filter"
@@ -594,6 +595,7 @@ class ExamPaperAdd extends Component<any, States> {
                         bordered={true}
                         size={'small'}
                         rowKey="id"
+                        scroll={{ y: 200 }}
                         loading={loading}
                         rowSelection={{
                             selectedRowKeys: selectedRowKeys,
diff --git a/packages/examination/src/views/examPaper/examPaperList.tsx b/packages/examination/src/views/examPaper/examPaperList.tsx
index 95de7f6..942258b 100644
--- a/packages/examination/src/views/examPaper/examPaperList.tsx
+++ b/packages/examination/src/views/examPaper/examPaperList.tsx
@@ -380,6 +380,7 @@ class ExamPaperList extends Component<any, States> {
                     bordered={true}
                     size={'small'}
                     loading={loading}
+                    scroll={{ y: 500 }}
                     rowSelection={{
                         selectedRowKeys: selectedRowKeys,
                         onChange: this.handleOnChange,
diff --git a/packages/examination/src/views/question/questionList.tsx b/packages/examination/src/views/question/questionList.tsx
index b2def50..49f25b7 100644
--- a/packages/examination/src/views/question/questionList.tsx
+++ b/packages/examination/src/views/question/questionList.tsx
@@ -234,7 +234,10 @@ class QuestionList extends Component<any, States> {
                 dataIndex: 'questionContent',
                 key: 'questionContent',
                 align: 'center',
-                width: 450
+                width: 450,
+                render: (questionContent: any, record: any) => {
+                    return `${questionContent} ${record.options}`;
+                }
             },
             {
                 title: '答案',
@@ -358,6 +361,7 @@ class QuestionList extends Component<any, States> {
                     rowKey="id"
                     bordered={true}
                     size={'small'}
+                    scroll={{ y: 500 }}
                     loading={loading}
                     rowSelection={{
                         selectedRowKeys: selectedRowKeys,