From 48325cefa42aa408210249a9675624b5bc71ff15 Mon Sep 17 00:00:00 2001 From: lapuda <577732344@qq.com> Date: Wed, 22 Jul 2026 15:24:31 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20update=20terminology=20from=20"?= =?UTF-8?q?=E6=88=B7=E5=A4=96=E6=8B=9B=E8=81=98=E4=BC=9A"=20to=20"?= =?UTF-8?q?=E7=BA=BF=E4=B8=8B=E6=8B=9B=E8=81=98=E4=BC=9A"=20across=20the?= =?UTF-8?q?=20application=20and=20improve=20job=20position=20urgency=20dis?= =?UTF-8?q?play?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .codegraph/.gitignore | 21 +++++-------------- config/proxy.ts | 2 +- config/routes.ts | 4 ++-- src/pages/JobPortal/JobFair/Detail/index.tsx | 14 +++++++++++-- src/pages/JobPortal/JobFair/index.tsx | 12 +++++------ .../Outdoorfair/components/EditModal.tsx | 2 +- src/pages/Jobfair/Outdoorfair/index.tsx | 4 ++-- .../components/CompanySelectModal.tsx | 13 +++++++++--- src/services/jobportal/jobFair.ts | 3 ++- src/types/company/list.d.ts | 2 ++ 10 files changed, 43 insertions(+), 34 deletions(-) diff --git a/.codegraph/.gitignore b/.codegraph/.gitignore index 9de0f16..d20c0fe 100644 --- a/.codegraph/.gitignore +++ b/.codegraph/.gitignore @@ -1,16 +1,5 @@ -# CodeGraph data files -# These are local to each machine and should not be committed - -# Database -*.db -*.db-wal -*.db-shm - -# Cache -cache/ - -# Logs -*.log - -# Hook markers -.dirty +# CodeGraph data files — local to each machine, not for committing. +# Ignore everything in .codegraph/ except this file itself, so transient +# files (the database, daemon.pid, sockets, logs) never show up in git. +* +!.gitignore diff --git a/config/proxy.ts b/config/proxy.ts index 730ada7..c0a834b 100644 --- a/config/proxy.ts +++ b/config/proxy.ts @@ -18,7 +18,7 @@ export default { '/api/': { // 要代理的地址 // target: 'http://39.98.44.136:6024/api/shihezi/', // 线上环境 - target: 'http://test.xjshzly.longbiosphere.com/api/shihezi/', // 线上环境 + target: 'https://test.xjshzly.longbiosphere.com/api/shihezi/', // 测试环境 // target: 'http://wykj.cdwsx.com/api',// 后端 // target: 'http://ks.zhaopinzao8dian.com/api/ks', // 配置了这个可以从 http 代理到 https diff --git a/config/routes.ts b/config/routes.ts index 35ccb17..d709c22 100644 --- a/config/routes.ts +++ b/config/routes.ts @@ -264,7 +264,7 @@ export default [ component: './Jobfair/PublicJobFair/Signups', }, { - name: '户外招聘会管理', + name: '线下招聘会管理', path: '/jobfair/outdoor-fair', component: './Jobfair/Outdoorfair', }, @@ -279,7 +279,7 @@ export default [ component: './Jobfair/Venueinfo/Detail', }, { - name: '户外招聘会详情', + name: '线下招聘会详情', path: '/jobfair/outdoor-fair/detail', component: './Jobfair/Outdoorfair/Detail', }, diff --git a/src/pages/JobPortal/JobFair/Detail/index.tsx b/src/pages/JobPortal/JobFair/Detail/index.tsx index 28dbc1e..c605bd1 100644 --- a/src/pages/JobPortal/JobFair/Detail/index.tsx +++ b/src/pages/JobPortal/JobFair/Detail/index.tsx @@ -183,7 +183,7 @@ const PortalJobFairDetailPage: React.FC = () => {
- {channel === 'outdoor' ? '户外招聘会' : '线上招聘会'} + {channel === 'outdoor' ? '线下招聘会' : '线上招聘会'} {detail.jobFairTitle}
@@ -280,7 +280,17 @@ const PortalJobFairDetailPage: React.FC = () => { onClick={() => handlePositionClick(position)} >
- {position.jobTitle || '未命名岗位'} + + {position.isUrgent === 1 && ( + <Tag + color="red" + style={{ marginRight: 8, fontSize: 12, lineHeight: '20px' }} + > + 急聘 + </Tag> + )} + {position.jobTitle || '未命名岗位'} + {formatSalary(position)} diff --git a/src/pages/JobPortal/JobFair/index.tsx b/src/pages/JobPortal/JobFair/index.tsx index a986582..7cef9b9 100644 --- a/src/pages/JobPortal/JobFair/index.tsx +++ b/src/pages/JobPortal/JobFair/index.tsx @@ -43,7 +43,7 @@ const PAGE_SIZE = 9; const fairTabs: Array<{ key: JobFairChannel; label: string }> = [ { key: 'online', label: '线上招聘会' }, - { key: 'outdoor', label: '户外招聘会' }, + { key: 'outdoor', label: '线下招聘会' }, ]; function formatDateTime(value?: string) { @@ -232,7 +232,7 @@ const PortalJobFairPage: React.FC = () => {
招聘会 - 汇集线上与户外招聘会信息，选择日期即可查看当天的活动安排。 + 汇集线上与线下招聘会信息，选择日期即可查看当天的活动安排。
@@ -309,14 +309,14 @@ const PortalJobFairPage: React.FC = () => {
- {renderSummary(`本月${channel === 'outdoor' ? '户外' : ''}招聘会`, monthFairs)} - {renderSummary(`本季度${channel === 'outdoor' ? '户外' : ''}招聘会`, quarterFairs)} + {renderSummary(`本月${channel === 'outdoor' ? '线下' : ''}招聘会`, monthFairs)} + {renderSummary(`本季度${channel === 'outdoor' ? '线下' : ''}招聘会`, quarterFairs)}
- {channel === 'outdoor' ? '户外招聘会' : '线上招聘会'} + {channel === 'outdoor' ? '线下招聘会' : '线上招聘会'} 共 {total} 场
@@ -339,7 +339,7 @@ const PortalJobFairPage: React.FC = () => { >
- {channel === 'outdoor' ? '户外招聘会' : '线上招聘会'} + {channel === 'outdoor' ? '线下招聘会' : '线上招聘会'} {status && {status.label}}
diff --git a/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx b/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx index cd5d6bf..e33d7c6 100644 --- a/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx +++ b/src/pages/Jobfair/Outdoorfair/components/EditModal.tsx @@ -141,7 +141,7 @@ const EditModal: React.FC = ({ return ( { const handleDelete = async (id: number) => { Modal.confirm({ title: '确认删除', - content: '确定要删除该户外招聘会吗？', + content: '确定要删除该线下招聘会吗？', onOk: async () => { const res = await deleteOutdoorFair(id); if (res.code === 200) { @@ -432,7 +432,7 @@ const OutdoorFairList: React.FC = () => { return ( - headerTitle="户外招聘会管理列表" + headerTitle="线下招聘会管理列表" actionRef={actionRef} rowKey="id" columns={columns} diff --git a/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx b/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx index f3cac71..fa6e5cc 100644 --- a/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx +++ b/src/pages/Jobfair/PublicJobFair/components/CompanySelectModal.tsx @@ -11,7 +11,12 @@ interface CompanySelectModalProps { onSuccess: () => void; } -const CompanySelectModal: React.FC = ({ open, jobFairId, onCancel, onSuccess }) => { +const CompanySelectModal: React.FC = ({ + open, + jobFairId, + onCancel, + onSuccess, +}) => { const actionRef = useRef(); const [selectedRowKeys, setSelectedRowKeys] = useState([]); const [loading, setLoading] = useState(false); @@ -70,9 +75,11 @@ const CompanySelectModal: React.FC = ({ open, jobFairId }} request={async (params) => { const res = await getCmsCompanyList({ + current: params.current, + pageSize: params.pageSize, name: params.name, - } as any); - return { data: res.rows, total: res.total, success: true }; + }); + return { data: res.rows, total: res.total, success: res.code === 200 }; }} toolBarRender={false} /> diff --git a/src/services/jobportal/jobFair.ts b/src/services/jobportal/jobFair.ts index 91da573..040b27b 100644 --- a/src/services/jobportal/jobFair.ts +++ b/src/services/jobportal/jobFair.ts @@ -109,6 +109,7 @@ export interface PortalJobFairPosition { jobLocation?: string; jobAddress?: string; vacancies?: number | string; + isUrgent?: number; } interface PortalJobFairCompanyWithJobs { @@ -189,7 +190,7 @@ export async function getPortalJobFairDetail(channel: JobFairChannel, jobFairId: msg: response.msg, data: { jobFairId: fair.jobFairId || String(fair.id ?? jobFairId), - jobFairTitle: fair.jobFairTitle || fair.title || '户外招聘会', + jobFairTitle: fair.jobFairTitle || fair.title || '线下招聘会', jobFairAddress: fair.jobFairAddress || fair.address || fair.venueName, jobFairType: fair.jobFairType || fair.fairType || 'outdoor', jobFairStartTime: fair.jobFairStartTime || fair.holdTime, diff --git a/src/types/company/list.d.ts b/src/types/company/list.d.ts index 3d2a274..900e033 100644 --- a/src/types/company/list.d.ts +++ b/src/types/company/list.d.ts @@ -33,6 +33,8 @@ declare namespace API.CompanyList { } export interface Params { + current?: number; + pageSize?: number; createTime?: string; companyId?: number; name?: string;