From f2da3d6929ef27d180b50961dcfbf9bfa9a028b2 Mon Sep 17 00:00:00 2001
From: francis-fh <francis_fh@163.com>
Date: Tue, 9 Jun 2026 16:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E8=B0=83=E7=A0=94=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/JobPortalHeader/index.tsx    |  4 +-
 src/pages/Company/List/index.tsx            | 27 ++++++++++++-
 src/pages/JobPortal/Detail/index.tsx        | 20 +++++-----
 src/pages/JobPortal/Policy/Detail/index.tsx |  4 --
 src/pages/JobPortal/Policy/index.tsx        |  4 --
 src/pages/Jobfair/PublicJobFair/index.tsx   | 40 +++++++++++++++++++-
 src/pages/Management/List/index.tsx         | 42 ++++++++++++++++++++-
 src/services/Management/list.ts             | 10 +++++
 src/services/company/list.ts                |  2 +-
 src/types/company/list.d.ts                 |  2 +
 src/types/jobfair/publicJobFair.d.ts        |  3 ++
 11 files changed, 133 insertions(+), 25 deletions(-)

diff --git a/src/components/JobPortalHeader/index.tsx b/src/components/JobPortalHeader/index.tsx
index 2e5709c..4e26de6 100644
--- a/src/components/JobPortalHeader/index.tsx
+++ b/src/components/JobPortalHeader/index.tsx
@@ -279,14 +279,14 @@ const JobPortalHeader: React.FC<JobPortalHeaderProps> = ({
             >
               简历
             </Button>
-            <Button
+            {/* <Button
               type="text"
               icon={<FundProjectionScreenOutlined />}
               onClick={() => handleNavClick('/job-portal/career-recommendation')}
               className={`nav-btn${isCareerRecommend ? ' active' : ''}`}
             >
               职业推荐
-            </Button>
+            </Button> */}
             <Button
               type="text"
               icon={<ReadOutlined />}
diff --git a/src/pages/Company/List/index.tsx b/src/pages/Company/List/index.tsx
index 3c305a7..8a2663f 100644
--- a/src/pages/Company/List/index.tsx
+++ b/src/pages/Company/List/index.tsx
@@ -17,6 +17,16 @@ import { getDictValueEnum } from '@/services/system/dict';
 import DictTag from '@/components/DictTag';
 import { postCompanyApproval } from '@/services/company/review';
 
+const buildListSearchParams = (values: Record<string, any>): API.CompanyList.Params => {
+  const { dateRange, ...rest } = values || {};
+  const params = { ...rest } as API.CompanyList.Params;
+  if (dateRange?.[0] && dateRange?.[1]) {
+    params.startDate = dateRange[0];
+    params.endDate = dateRange[1];
+  }
+  return params;
+};
+
 const loadCompanyDetail = async (record: API.CompanyList.Company) => {
   const resp = await getCmsCompanyDetail(record.companyId);
   const detail = parseCmsCompanyDetailResponse(resp);
@@ -82,6 +92,21 @@ function ManagementList() {
   }, []);
 
   const columns: ProColumns<API.CompanyList.Company>[] = [
+    {
+      title: '时间范围',
+      dataIndex: 'dateRange',
+      hideInTable: true,
+      valueType: 'dateRange',
+      fieldProps: {
+        format: 'YYYY-MM-DD',
+      },
+      search: {
+        transform: (value) => ({
+          startDate: value[0],
+          endDate: value[1],
+        }),
+      },
+    },
     {
       title: '公司名称',
       dataIndex: 'name',
@@ -279,7 +304,7 @@ function ManagementList() {
               hidden={!access.hasPerms('system:user:export')}
               onClick={async () => {
                 const searchVal = formTableRef.current?.getFieldsValue();
-                handleExport(searchVal as API.CompanyList.Params);
+                handleExport(buildListSearchParams(searchVal || {}));
               }}
             >
               <PlusOutlined />
diff --git a/src/pages/JobPortal/Detail/index.tsx b/src/pages/JobPortal/Detail/index.tsx
index 0af599c..cb473f5 100644
--- a/src/pages/JobPortal/Detail/index.tsx
+++ b/src/pages/JobPortal/Detail/index.tsx
@@ -552,19 +552,19 @@ const JobDetailPage: React.FC = () => {
                         lineWidth: 2,
                       },
                     }}
-                    meta={{
-                      score: {
-                        alias: '评分',
-                        min: 0,
-                        max: 100,
+                    scale={{
+                      y: {
+                        domainMin: 0,
+                        domainMax: 100,
                         nice: true,
                       },
                     }}
-                    yAxis={{
-                      label: false,
-                      tickLine: null,
-                      line: null,
-                      grid: null,
+                    axis={{
+                      y: {
+                        label: false,
+                        tick: false,
+                        line: false,
+                      },
                     }}
                     height={300}
                   />
diff --git a/src/pages/JobPortal/Policy/Detail/index.tsx b/src/pages/JobPortal/Policy/Detail/index.tsx
index d326f18..b5e5c2c 100644
--- a/src/pages/JobPortal/Policy/Detail/index.tsx
+++ b/src/pages/JobPortal/Policy/Detail/index.tsx
@@ -11,7 +11,6 @@ import {
 import {
   ArrowLeftOutlined,
   CalendarOutlined,
-  EyeOutlined,
   FileTextOutlined,
   BankOutlined,
 } from '@ant-design/icons';
@@ -140,9 +139,6 @@ const PolicyDetailPage: React.FC = () => {
                       <BankOutlined /> {detail.sourceUnit}
                     </Text>
                   )}
-                  <Text type="secondary">
-                    <EyeOutlined /> {detail.viewNum ?? 0} 次浏览
-                  </Text>
                 </div>
 
                 {detail.zcContent?.trim() ? (
diff --git a/src/pages/JobPortal/Policy/index.tsx b/src/pages/JobPortal/Policy/index.tsx
index a2beda8..ba3091c 100644
--- a/src/pages/JobPortal/Policy/index.tsx
+++ b/src/pages/JobPortal/Policy/index.tsx
@@ -11,7 +11,6 @@ import {
 } from 'antd';
 import {
   CalendarOutlined,
-  EyeOutlined,
   FileTextOutlined,
   SearchOutlined,
   BankOutlined,
@@ -125,9 +124,6 @@ const PolicyListPage: React.FC = () => {
                                 <CalendarOutlined /> {item.publishTime}
                               </span>
                             )}
-                            <span>
-                              <EyeOutlined /> {item.viewNum ?? 0} 次浏览
-                            </span>
                           </div>
                         </div>
                       </List.Item>
diff --git a/src/pages/Jobfair/PublicJobFair/index.tsx b/src/pages/Jobfair/PublicJobFair/index.tsx
index 2bd85e0..d97f6bd 100644
--- a/src/pages/Jobfair/PublicJobFair/index.tsx
+++ b/src/pages/Jobfair/PublicJobFair/index.tsx
@@ -1,6 +1,6 @@
 import React, { useRef, useState, useEffect } from 'react';
 import { useAccess, history } from '@umijs/max';
-import { Button, message, Modal } from 'antd';
+import { Button, FormInstance, message, Modal } from 'antd';
 import { ActionType, PageContainer, ProColumns, ProTable } from '@ant-design/pro-components';
 import { PlusOutlined, DeleteOutlined, FormOutlined, ExportOutlined, EyeOutlined } from '@ant-design/icons';
 import { getDictValueEnum } from '@/services/system/dict';
@@ -17,6 +17,7 @@ import EditModal from './components/EditModal';
 
 const PublicJobFairList: React.FC = () => {
   const access = useAccess();
+  const formRef = useRef<FormInstance>();
   const actionRef = useRef<ActionType>();
   const [modalVisible, setModalVisible] = useState(false);
   const [currentRow, setCurrentRow] = useState<API.PublicJobFair.JobFairItem>();
@@ -44,10 +45,21 @@ const PublicJobFairList: React.FC = () => {
     });
   };
 
+  const buildListSearchParams = (values: Record<string, any>): API.PublicJobFair.ListParams => {
+    const { dateRange, current, pageSize, ...rest } = values || {};
+    const params = { ...rest } as API.PublicJobFair.ListParams;
+    if (dateRange?.[0] && dateRange?.[1]) {
+      params.startDate = dateRange[0];
+      params.endDate = dateRange[1];
+    }
+    return params;
+  };
+
   const handleExport = async () => {
     message.loading('正在导出...');
     try {
-      await exportPublicJobFair();
+      const searchVal = formRef.current?.getFieldsValue();
+      await exportPublicJobFair(buildListSearchParams(searchVal || {}));
       message.success('导出成功');
     } catch {
       message.error('导出失败');
@@ -55,6 +67,21 @@ const PublicJobFairList: React.FC = () => {
   };
 
   const columns: ProColumns<API.PublicJobFair.JobFairItem>[] = [
+    {
+      title: '时间范围',
+      dataIndex: 'dateRange',
+      hideInTable: true,
+      valueType: 'dateRange',
+      fieldProps: {
+        format: 'YYYY-MM-DD',
+      },
+      search: {
+        transform: (value) => ({
+          startDate: value[0],
+          endDate: value[1],
+        }),
+      },
+    },
     {
       title: '招聘会标题',
       dataIndex: 'jobFairTitle',
@@ -85,6 +112,12 @@ const PublicJobFairList: React.FC = () => {
       valueType: 'dateTime',
       hideInSearch: true,
     },
+    {
+      title: '创建时间',
+      dataIndex: 'createTime',
+      valueType: 'dateTime',
+      hideInSearch: true,
+    },
     {
       title: '操作',
       valueType: 'option',
@@ -136,6 +169,7 @@ const PublicJobFairList: React.FC = () => {
       <ProTable<API.PublicJobFair.JobFairItem>
         headerTitle="公共招聘会列表"
         actionRef={actionRef}
+        formRef={formRef}
         rowKey="jobFairId"
         columns={columns}
         scroll={{ x: 'max-content' }}
@@ -149,6 +183,8 @@ const PublicJobFairList: React.FC = () => {
             pageSize: params.pageSize,
             jobFairTitle: params.jobFairTitle,
             jobFairType: params.jobFairType,
+            startDate: params.startDate,
+            endDate: params.endDate,
           });
           return { data: res.rows, total: res.total, success: true };
         }}
diff --git a/src/pages/Management/List/index.tsx b/src/pages/Management/List/index.tsx
index 717dd9c..8b82290 100644
--- a/src/pages/Management/List/index.tsx
+++ b/src/pages/Management/List/index.tsx
@@ -7,11 +7,12 @@ import {
   exportCmsJob,
   exportJobApply,
   getCmsJobList,
+  importJobRow,
   updateCmsJobList,
 } from '@/services/Management/list';
 import { Button, FormInstance, message, Modal, Switch } from 'antd';
 import { ActionType, ProColumns, ProTable } from '@ant-design/pro-components';
-import { AlignLeftOutlined, BarChartOutlined, DeleteOutlined, FormOutlined, PlusOutlined,DownloadOutlined } from '@ant-design/icons';
+import { AlignLeftOutlined, BarChartOutlined, DeleteOutlined, FormOutlined, PlusOutlined, DownloadOutlined, UploadOutlined } from '@ant-design/icons';
 import EditManageRow from './edit';
 import { getDictValueEnum } from '@/services/system/dict';
 import DictTag from '@/components/DictTag';
@@ -76,6 +77,7 @@ function ManagementList() {
 
   const formTableRef = useRef<FormInstance>();
   const actionRef = useRef<ActionType>();
+  const fileInputRef = useRef<HTMLInputElement>(null);
 
   const [educationEnum, setEducationEnum] = useState<any>([]);
   const [experienceEnum, setExperienceEnum] = useState<any>([]);
@@ -120,6 +122,29 @@ function ManagementList() {
     }
   }
 
+  const handleBatchUpload = async (event: React.ChangeEvent<HTMLInputElement>) => {
+    const file = event.target.files?.[0];
+    if (!file) return;
+    const hide = message.loading('正在上传');
+    try {
+      const resp = await importJobRow(file);
+      hide();
+      if (resp.code === 200) {
+        message.success('批量上传成功');
+        actionRef.current?.reload();
+      } else {
+        message.error(resp.msg || '上传失败，请重试');
+      }
+    } catch (error) {
+      hide();
+      message.error('上传失败，请重试');
+    }
+    // 清空 input 以便重复选择同一文件
+    if (fileInputRef.current) {
+      fileInputRef.current.value = '';
+    }
+  };
+
   const columns: ProColumns<API.ManagementList.Manage>[] = [
     {
       title: '时间范围',
@@ -390,9 +415,24 @@ function ManagementList() {
             >
               <DownloadOutlined />录用人导出
             </Button>,
+            <Button
+              type="primary"
+              key="batchUpload"
+              hidden={!access.hasPerms('manage:List:add')}
+              onClick={() => fileInputRef.current?.click()}
+            >
+              <UploadOutlined /> 批量上传岗位
+            </Button>,
           ]}
         />
       </div>
+      <input
+        type="file"
+        ref={fileInputRef}
+        style={{ display: 'none' }}
+        accept=".xlsx,.xls"
+        onChange={handleBatchUpload}
+      />
       <EditManageRow
         open={modalVisible}
         mode={mode}
diff --git a/src/services/Management/list.ts b/src/services/Management/list.ts
index b165847..10b82c8 100644
--- a/src/services/Management/list.ts
+++ b/src/services/Management/list.ts
@@ -57,6 +57,16 @@ export async function exportCmsJobCandidates(ids: string) {
   });
 }
 
+export async function importJobRow(file: File) {
+  const formData = new FormData();
+  formData.append('file', file);
+  return request('/api/app/script/importRow/v2', {
+    method: 'POST',
+    // 不显式设置 Content-Type，交由浏览器按 multipart/form-data 边界自动设置
+    data: formData,
+  });
+}
+
 export async function getJobTrend(params) {
   return request(`/api/cms/jobTrend/list`, {
     method: 'GET',
diff --git a/src/services/company/list.ts b/src/services/company/list.ts
index 1079bd3..f8572cf 100644
--- a/src/services/company/list.ts
+++ b/src/services/company/list.ts
@@ -29,7 +29,7 @@ export async function putCmsCompanyList(params?: API.CompanyList.Params) {
 }
 
 export async function exportCmsCompanyList(params?: API.CompanyList.Params) {
-  return downLoadXlsx(`/cms/company/export`, { params }, `dict_data_${new Date().getTime()}.xlsx`);
+  return downLoadXlsx(`/api/cms/company/export`, { params }, `dict_data_${new Date().getTime()}.xlsx`);
 }
 
 /** 解析企业详情接口响应（兼容 data 包裹与平铺字段两种格式） */
diff --git a/src/types/company/list.d.ts b/src/types/company/list.d.ts
index 4c5be56..d9f3241 100644
--- a/src/types/company/list.d.ts
+++ b/src/types/company/list.d.ts
@@ -35,5 +35,7 @@ declare namespace API.CompanyList {
     industry?: string;
     scale?: string;
     code?: string;
+    startDate?: string;
+    endDate?: string;
   }
 }
diff --git a/src/types/jobfair/publicJobFair.d.ts b/src/types/jobfair/publicJobFair.d.ts
index 94cd161..50b50e8 100644
--- a/src/types/jobfair/publicJobFair.d.ts
+++ b/src/types/jobfair/publicJobFair.d.ts
@@ -8,6 +8,8 @@ declare namespace API.PublicJobFair {
     pageSize?: number;
     jobFairTitle?: string;
     jobFairType?: string;
+    startDate?: string;
+    endDate?: string;
   }
 
   /** 招聘会列表项 */
@@ -29,6 +31,7 @@ declare namespace API.PublicJobFair {
     longitude?: number;
     enterpriseNum?: string;
     boothNum?: string;
+    createTime?: string;
   }
 
   /** 招聘会列表响应 */