- setParams(p => ({
- ...p,
- analysisCategory: key as 'industry' | 'salary' | 'area',
- selectedIndustry: key === 'industry' && availableIndustries.length > 0 ? availableIndustries[0] : p.selectedIndustry,
- selectedSalaryRange: key === 'salary' && availableSalaryRanges.length > 0 ? availableSalaryRanges[0] : p.selectedSalaryRange
- }))}
- >
-
-
-
-
- {params.analysisCategory === 'industry' && (
-
- )}
-
- {params.analysisCategory === 'salary' && (
-
- )}
-
- {params.analysisCategory !== 'area' && (
-
-
-
- {currentData.length > 0 ? (
-
- ) : (
-
- )}
-
-
-
- )}
+ {/* 行业趋势图表 - 全宽显示 */}
+
+ setParams((p) => ({ ...p, selectedIndustry: value }))}
+ />
+
-
-
- {areaLoading ? (
-
- ) : areaData.length > 0 ? (
-
-
-
- ) : (
-
- )}
-
+ {/* 区域分析和薪资趋势 - 中等屏幕下分成两列 */}
+
+
+
+
+
+ setParams((p) => ({ ...p, selectedSalaryRange: value }))
+ }
+ />
+
+
+ {/* 工作经验和学历要求 - 中等屏幕下分成两列 */}
+
+
+ setParams((p) => ({ ...p, selectedWorkYearRange: value }))
+ }
+ />
+
+
+
@@ -673,4 +567,4 @@ const IndustryTrendPage: React.FC = () => {
);
};
-export default IndustryTrendPage;
\ No newline at end of file
+export default IndustryTrendPage;
diff --git a/src/pages/Analysis/Industrytrend/utils.ts b/src/pages/Analysis/Industrytrend/utils.ts
index fd325e1..5d29e8f 100644
--- a/src/pages/Analysis/Industrytrend/utils.ts
+++ b/src/pages/Analysis/Industrytrend/utils.ts
@@ -158,4 +158,75 @@ export const convertSalaryData: ApiDataConverter = (apiData: any) => {
console.error('薪资数据转换错误:', error);
return [];
}
+};
+
+export const convertWorkYearData: ApiDataConverter = (apiData: any) => {
+ if (!apiData) return [];
+ try {
+ if (Array.isArray(apiData)) {
+ return apiData.map(item => ({
+ date: item.time || item.date || '',
+ category: item.name || item.category || '未知经验要求',
+ value: Number(item.data || item.value || 0) // 确保数值不为null/undefined
+ }));
+ }
+ if (typeof apiData === 'object') {
+ const result: IndustryDataItem[] = [];
+ Object.entries(apiData).forEach(([date, items]) => {
+ if (Array.isArray(items)) {
+ items.forEach((item: any) => {
+ result.push({
+ date: date || '',
+ category: item.name || item.category || '未知经验要求',
+ value: Number(item.data || item.value || 0) // 确保数值不为null/undefined
+ });
+ });
+ }
+ });
+ return result;
+ }
+ return [];
+ } catch (error) {
+ console.error('工作经验数据转换错误:', error);
+ return [];
+ }
+};
+export const convertEducationData: ApiDataConverter = (apiData: any) => {
+ if (!apiData) return [];
+ try {
+ const result: any[] = [];
+
+ // 处理嵌套的月份数据
+ if (typeof apiData === 'object' && !Array.isArray(apiData)) {
+ Object.entries(apiData).forEach(([date, items]) => {
+ if (Array.isArray(items)) {
+ items.forEach((item: any) => {
+ if (!item) return; // 跳过空项
+ result.push({
+ date: date || '', // 确保日期不为undefined
+ category: item.name || item.category || '不限', // 默认值
+ value: Number(item.data || item.value || 0), // 确保数值有效
+ originalData: item
+ });
+ });
+ }
+ });
+ return result;
+ }
+
+ // 处理数组格式的响应
+ if (Array.isArray(apiData)) {
+ return apiData.map(item => ({
+ date: item.time || item.date || '',
+ category: item.name || item.category || '不限',
+ value: Number(item.data || item.value || 0),
+ originalData: item
+ }));
+ }
+
+ return [];
+ } catch (error) {
+ console.error('学历数据转换错误:', error);
+ return [];
+ }
};
\ No newline at end of file
diff --git a/src/services/analysis/industry.ts b/src/services/analysis/industry.ts
index 209ddc2..00fc63e 100644
--- a/src/services/analysis/industry.ts
+++ b/src/services/analysis/industry.ts
@@ -1,11 +1,12 @@
import { request } from '@umijs/max';
-
+// 行业
export async function getIndustryTrend(params?: API.Analysis.IndustryParams) {
return request
('/api/cms/statics/industry', {
method: 'GET',
params
});
}
+// 区域热力图
export async function getIndustryAreaTrend(params: any) {
try {
const response = await request('/api/cms/statics/industryArea', {
@@ -23,10 +24,24 @@ export async function getIndustryAreaTrend(params: any) {
throw error;
}
}
-
+// 薪资
export async function getSalaryTrend(params?: API.Analysis.IndustryParams) {
return request('/api/cms/statics/salary', {
method: 'GET',
params
});
+}
+// 工作年限
+export async function getWorkYearTrend(params?: API.Analysis.IndustryParams) {
+ return request('/api/cms/statics/workYear', {
+ method: 'GET',
+ params
+ });
+}
+// 学历趋势
+export async function getEducationTrend(params?: API.Analysis.IndustryParams) {
+ return request('/api/cms/statics/education', {
+ method: 'GET',
+ params
+ });
}
\ No newline at end of file
diff --git a/src/types/analysis/industry.d.ts b/src/types/analysis/industry.d.ts
index e7005c0..9da12d0 100644
--- a/src/types/analysis/industry.d.ts
+++ b/src/types/analysis/industry.d.ts
@@ -6,7 +6,8 @@ export type AnalysisType = '岗位发布数量' | '招聘增长率';
export type QuarterFormat = `${number}-${'Q1'|'Q2'|'Q3'|'Q4'|'第一季度'|'第二季度'|'第三季度'|'第四季度'}`;
export type AnalysisCategory = 'industry' | 'area' | 'salary';
export type SalaryRange = '3k-5k' | '5k-8k' | '8k-10k' | '10k+';
-
+export type WorkYearRange = '应届' | '1-3年' | '3-5年' | '5年以上';
+export type EducationLevel = '大专' | '本科' | '硕士' | '博士' | '不限';
export interface IndustryDataItem {
date: string;
category: string;
@@ -26,6 +27,7 @@ export interface IndustryTrendParams {
}
export interface IndustryTrendState extends IndustryTrendParams {
+ selectedWorkYearRange(): unknown;
selectedIndustry: string;
}
From 19ef39061ea79f2c43a8e8c596fa35ef0cdff2d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8F=B2=E5=85=B8=E5=8D=93?=
Date: Wed, 24 Sep 2025 12:54:02 +0800
Subject: [PATCH 7/7] =?UTF-8?q?flat:=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Application/ModelManagement/index.tsx | 303 ++++++++++++++++++
.../ModelManagement/modelStyle.less | 19 ++
src/services/analysis/industry.ts | 99 +++---
3 files changed, 374 insertions(+), 47 deletions(-)
create mode 100644 src/pages/Application/ModelManagement/index.tsx
create mode 100644 src/pages/Application/ModelManagement/modelStyle.less
diff --git a/src/pages/Application/ModelManagement/index.tsx b/src/pages/Application/ModelManagement/index.tsx
new file mode 100644
index 0000000..defdd1c
--- /dev/null
+++ b/src/pages/Application/ModelManagement/index.tsx
@@ -0,0 +1,303 @@
+import React, { Fragment } from 'react';
+import { Collapse, InputNumber, Select } from 'antd';
+import style from './modelStyle.less';
+
+export default function ModelManagement() {
+ const text = `
+ A dog is a type of domesticated animal.
+ Known for its loyalty and faithfulness,
+ it can be found as a welcome guest in many households across the world.
+`;
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/pages/Application/ModelManagement/modelStyle.less b/src/pages/Application/ModelManagement/modelStyle.less
new file mode 100644
index 0000000..69239ab
--- /dev/null
+++ b/src/pages/Application/ModelManagement/modelStyle.less
@@ -0,0 +1,19 @@
+.cards {
+ display: grid;
+ grid-template-columns: repeat(4, 1fr);
+ grid-row-gap: 30px;
+
+ .card {
+ display: flex;
+ align-items: center;
+ margin-right: 80px;
+
+ .label {
+ margin-right: 10px;
+ white-space: nowrap;
+ }
+
+ .input {
+ }
+ }
+}
diff --git a/src/services/analysis/industry.ts b/src/services/analysis/industry.ts
index 00fc63e..b9abfe8 100644
--- a/src/services/analysis/industry.ts
+++ b/src/services/analysis/industry.ts
@@ -1,47 +1,52 @@
-import { request } from '@umijs/max';
-// 行业
-export async function getIndustryTrend(params?: API.Analysis.IndustryParams) {
- return request('/api/cms/statics/industry', {
- method: 'GET',
- params
- });
-}
-// 区域热力图
-export async function getIndustryAreaTrend(params: any) {
- try {
- const response = await request('/api/cms/statics/industryArea', {
- method: 'GET',
- params,
- headers: {
- 'Content-Type': 'application/json'
- }
- });
-
- console.log('接口原始响应:', response); // 调试日志
- return response; // 兼容不同后端响应格式
- } catch (error) {
- console.error('接口请求异常:', error);
- throw error;
- }
-}
-// 薪资
-export async function getSalaryTrend(params?: API.Analysis.IndustryParams) {
- return request('/api/cms/statics/salary', {
- method: 'GET',
- params
- });
-}
-// 工作年限
-export async function getWorkYearTrend(params?: API.Analysis.IndustryParams) {
- return request('/api/cms/statics/workYear', {
- method: 'GET',
- params
- });
-}
-// 学历趋势
-export async function getEducationTrend(params?: API.Analysis.IndustryParams) {
- return request('/api/cms/statics/education', {
- method: 'GET',
- params
- });
-}
\ No newline at end of file
+import { request } from '@umijs/max';
+
+// 行业
+export async function getIndustryTrend(params?: API.Analysis.IndustryParams) {
+ return request('/api/cms/statics/industry', {
+ method: 'GET',
+ params,
+ });
+}
+
+// 区域热力图
+export async function getIndustryAreaTrend(params: any) {
+ try {
+ const response = await request('/api/cms/statics/industryArea', {
+ method: 'GET',
+ params,
+ headers: {
+ 'Content-Type': 'application/json',
+ },
+ });
+
+ console.log('接口原始响应:', response); // 调试日志
+ return response; // 兼容不同后端响应格式
+ } catch (error) {
+ console.error('接口请求异常:', error);
+ throw error;
+ }
+}
+
+// 薪资
+export async function getSalaryTrend(params?: API.Analysis.IndustryParams) {
+ return request('/api/cms/statics/salary', {
+ method: 'GET',
+ params,
+ });
+}
+
+// 工作年限
+export async function getWorkYearTrend(params?: API.Analysis.IndustryParams) {
+ return request('/api/cms/statics/workYear', {
+ method: 'GET',
+ params,
+ });
+}
+
+// 学历趋势
+export async function getEducationTrend(params?: API.Analysis.IndustryParams) {
+ return request('/api/cms/statics/education', {
+ method: 'GET',
+ params,
+ });
+}