diff --git a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/converter/DatasetConverter.java b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/converter/DatasetConverter.java index faa668f7..2982b49a 100644 --- a/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/converter/DatasetConverter.java +++ b/backend/services/data-management-service/src/main/java/com/datamate/datamanagement/interfaces/converter/DatasetConverter.java @@ -78,7 +78,7 @@ default Map> getDistribution(List dataset for (DatasetFile datasetFile : datasetFiles) { List tags = datasetFile.analyzeTag(); if (CollectionUtils.isEmpty(tags)) { - return distribution; + continue; } for (FileTag tag : tags) { Map tagValueMap = distribution.getOrDefault(tag.getFromName(), new HashMap<>()); diff --git a/frontend/src/pages/DataManagement/dataset.const.tsx b/frontend/src/pages/DataManagement/dataset.const.tsx index a2bc1f0e..d5b70901 100644 --- a/frontend/src/pages/DataManagement/dataset.const.tsx +++ b/frontend/src/pages/DataManagement/dataset.const.tsx @@ -17,6 +17,7 @@ import { FileImage, FileText, Video, + Film, FileCode, MessageCircleMore, ImagePlus, @@ -45,7 +46,7 @@ export const datasetTypeMap: Record< label: "文本", order: 1, icon: ScanText, - iconColor: "blue", + iconColor: "#A78BFA", children: [ DatasetSubType.TEXT_DOCUMENT, DatasetSubType.TEXT_WEB, @@ -58,7 +59,7 @@ export const datasetTypeMap: Record< label: "图像", order: 2, icon: Image, - iconColor: "green", + iconColor: "#38BDF8", children: [DatasetSubType.IMAGE_IMAGE, DatasetSubType.IMAGE_CAPTION], description: "用于处理和分析图像数据的数据集", }, @@ -67,7 +68,7 @@ export const datasetTypeMap: Record< label: "音频", order: 3, icon: Music, - iconColor: "orange", + iconColor: "#F59E0B", children: [DatasetSubType.AUDIO_AUDIO, DatasetSubType.AUDIO_JSONL], description: "用于处理和分析音频数据的数据集", }, @@ -75,8 +76,8 @@ export const datasetTypeMap: Record< value: DatasetType.VIDEO, label: "视频", order: 3, - icon: Video, - iconColor: "purple", + icon: Film, + iconColor: "#22D3EE", children: [DatasetSubType.VIDEO_VIDEO, DatasetSubType.VIDEO_JSONL], description: "用于处理和分析视频数据的数据集", }, @@ -206,6 +207,7 @@ export function mapDataset(dataset: AnyObject): Dataset { createdAt: formatDateTime(dataset.createdAt) || "--", updatedAt: formatDateTime(dataset?.updatedAt) || "--", icon: IconComponent ? : , + iconColor: iconColor, status: datasetStatusMap[dataset.status], statistics: [ { label: "文件数", value: dataset.fileCount || 0 }, diff --git a/frontend/src/pages/RatioTask/Create/CreateRatioTask.tsx b/frontend/src/pages/RatioTask/Create/CreateRatioTask.tsx index 5598f011..67b40c76 100644 --- a/frontend/src/pages/RatioTask/Create/CreateRatioTask.tsx +++ b/frontend/src/pages/RatioTask/Create/CreateRatioTask.tsx @@ -7,6 +7,7 @@ import { useNavigate } from "react-router"; import SelectDataset from "@/pages/RatioTask/Create/components/SelectDataset.tsx"; import BasicInformation from "@/pages/RatioTask/Create/components/BasicInformation.tsx"; import RatioConfig from "@/pages/RatioTask/Create/components/RatioConfig.tsx"; +import {formatDate} from "@/utils/unit.ts"; export default function CreateRatioTask() { const navigate = useNavigate(); @@ -37,10 +38,11 @@ export default function CreateRatioTask() { } const totals = String(values.totalTargetCount); const config = ratioTaskForm.ratioConfigs.map((c) => { + const dateRange = c.dateRange ? [formatDate(c.dateRange[0]), formatDate(c.dateRange[1])] : [] return { datasetId: c.source, counts: String(c.quantity ?? 0), - filterConditions: { label: c.labelFilter, dateRange: String(c.dateRange ?? 0)}, + filterConditions: { label: c.labelFilter, dateRange: dateRange}, }; }); diff --git a/frontend/src/pages/RatioTask/Create/components/RatioConfig.tsx b/frontend/src/pages/RatioTask/Create/components/RatioConfig.tsx index fcb58d21..23c438cb 100644 --- a/frontend/src/pages/RatioTask/Create/components/RatioConfig.tsx +++ b/frontend/src/pages/RatioTask/Create/components/RatioConfig.tsx @@ -6,6 +6,7 @@ import { Select, Table, InputNumber, + DatePicker } from "antd"; import { BarChart3 } from "lucide-react"; import type { Dataset } from "@/pages/DataManagement/dataset.model.ts"; @@ -31,7 +32,7 @@ interface RatioConfigItem { percentage: number; source: string; // dataset id labelFilter?: LabelFilter; - dateRange?: number; + dateRange?: [Date | null, Date | null] | null; } interface RatioConfigProps { @@ -303,20 +304,18 @@ const RatioConfig: FC = ({ title: "标签更新时间", dataIndex: "dateRange", key: "dateRange", - render: (_: any, record: RatioConfigItem) => ( -