From 342de14da4f62b1e46041ba17a7c4e057d9ad767 Mon Sep 17 00:00:00 2001
From: liuyiliang <yiliang.liu@51dayu.com.cn>
Date: Thu, 27 Mar 2025 17:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E7=AE=A1=E8=A1=8C=E4=B8=9A=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exam-online/compoents/ExamDetailAnalysisPage.tsx      | 8 ++++----
 .../src/views/exam-online/compoents/ExamListPage.tsx      | 8 ++++----
 .../views/exam-online/compoents/ExamPaperAnalysisPage.tsx | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx b/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx
index 54e6bae..c3d41cb 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamDetailAnalysisPage.tsx
@@ -24,7 +24,7 @@ const ExamDetailAnalysisPage: React.FC = () => {
     const [examName, setExamName] = useState('');
     const [paperName, setPaperName] = useState('');
     const [examArea, setExamArea] = useState('');
-    const [industry, setIndustry] = useState('');
+    const [industry, setIndustry] = useState(null);
     const [industryOptions, setIndustryOptions] = useState<{ value: string; label: string }[]>([]);
     const [tableData, setTableData] = useState<ExamDataItem[]>([]);
     const [pagination, setPagination] = useState({
@@ -62,7 +62,7 @@ const ExamDetailAnalysisPage: React.FC = () => {
         setExamName('');
         setPaperName('');
         setExamArea('');
-        setIndustry('');
+        setIndustry(null);
         handleSearch();
     };
 
@@ -70,7 +70,7 @@ const ExamDetailAnalysisPage: React.FC = () => {
         const param = {
             examName:examName,
             paperName:paperName,
-            industry:industry,
+            industry:!industry ? '' : industry,
             examArea:examArea,
         }
         const fetchData = async () => {
@@ -205,8 +205,8 @@ const ExamDetailAnalysisPage: React.FC = () => {
                                 value={industry}
                                 onChange={(value) => setIndustry(value)}
                                 style={{ width: 150 }} // 调整下拉框宽度
+                                allowClear
                             >
-                                <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/ExamListPage.tsx b/packages/examination/src/views/exam-online/compoents/ExamListPage.tsx
index 786b8ed..910e18e 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamListPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamListPage.tsx
@@ -29,7 +29,7 @@ const ExamListPage = ({ history }: { history: any }) => {
     const [searchForm, setSearchForm] = useState({
         examName: '',
         paperName: '',
-        regulatedIndustry: '',
+        regulatedIndustry: null,
         validTime: null as Moment | null, // 修改为 Moment 类型
     });
     const [selectedRows, setSelectedRows] = useState<number[]>([]);
@@ -62,7 +62,7 @@ const ExamListPage = ({ history }: { history: any }) => {
         setSearchForm({
             examName: '',
             paperName: '',
-            regulatedIndustry: '',
+            regulatedIndustry: null,
             validTime: null,
         });
         setPagination({ ...pagination, current: 1 });
@@ -77,7 +77,7 @@ const ExamListPage = ({ history }: { history: any }) => {
             const params = {
                 examName: searchForm.examName,
                 paperName: searchForm.paperName,
-                regulatedIndustry: searchForm.regulatedIndustry,
+                regulatedIndustry: !searchForm.regulatedIndustry ? '' : searchForm.regulatedIndustry,
                 validDate: searchForm.validTime ? searchForm.validTime.format('YYYY-MM-DD') : '' // 使用 moment 的 format 方法
             };
 
@@ -512,8 +512,8 @@ const ExamListPage = ({ history }: { history: any }) => {
                                         setSearchForm({...searchForm, regulatedIndustry: value})
                                     }
                                     style={{width: 240}}
+                                    allowClear
                                 >
-                                    <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 214eb73..e817a37 100644
--- a/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisPage.tsx
+++ b/packages/examination/src/views/exam-online/compoents/ExamPaperAnalysisPage.tsx
@@ -23,7 +23,7 @@ export type PaperAnalysisDataItem = {
 
 const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
     const [paperName, setPaperName] = useState('');
-    const [industry, setIndustry] = useState('');
+    const [industry, setIndustry] = useState(null);
     const [industryOptions, setIndustryOptions] = useState<{ value: string; label: string }[]>([]);
     const [tableData, setTableData] = useState<PaperAnalysisDataItem[]>([]);
     const [pagination, setPagination] = useState({
@@ -55,7 +55,7 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
 
     const handleReset = () => {
         setPaperName('');
-        setIndustry('');
+        setIndustry(null);
         setTableData(tableData);
         setPagination({
             ...pagination,
@@ -76,7 +76,7 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
     const handleSearch = () => {
         const param = {
             paperName:paperName,
-            industry:industry,
+            industry:!industry ? '' : industry
         }
         const fetchData = async () => {
             try {
@@ -161,8 +161,8 @@ const ExamPaperAnalysisPage: React.FC<RouteComponentProps> = ({history}) => {
                                 value={industry}
                                 onChange={(value) => setIndustry(value)}
                                 style={{ width: 300 }}
+                                allowClear
                             >
-                                <Option key="" value="">全部</Option>
                                 {industryOptions.map((option) => (
                                     <Option key={option.value} value={option.value}>
                                         {option.label}