package.json

@@ -15,7 +15,6 @@
     "axios": "^1.11.0",
     "i18next": "^25.3.2",
     "i18next-browser-languagedetector": "^8.2.0",
-    "lodash": "^4.17.21",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "react-i18next": "^15.6.0",
@@ -24,7 +23,6 @@
   },
   "devDependencies": {
     "@eslint/js": "^9.30.1",
-    "@types/lodash": "^4.17.20",
     "@types/node": "^24.0.14",
     "@types/react": "^19.1.8",
     "@types/react-dom": "^19.1.6",

src/api/data-generation/index.ts

@@ -23,21 +23,18 @@ export const dataGenerationApi = {
     return request.post(`${baseUrl}`, params);
   },
   stopTask: (params: {
-    task_id: number | string;
+    task_id: number;
   }) => {
     return request.post(`${baseUrl}/${params.task_id}/stop`);
   },
   deleteTask: (params: {
-    task_id: number | string;
+    task_id: number;
   }) => {
     return request.delete(`${baseUrl}/${params.task_id}`);
   },
   getLogs: (params: {
-    task_id: number | string;
+    task_id: number;
   }) => {
     return request.get(`${baseUrl}/${params.task_id}/logs`);
   },
-  getOptions: () => {
-    return request.get(`${baseUrl}/options`);
-  },
 };

src/api/dataset/index.ts

@@ -13,7 +13,7 @@ export const datasetApi = {
     },
     createDataset: (params: {
         name: string;
-        description?: string;
+        description: string;
     }) => {
         return request.post(`${baseUrl}`, params);
     },

src/views/data-generation/components/CreateTaskModal.tsx

@@ -1,4 +1,3 @@
-import { datasetApi } from "@/api/dataset";
 import {
   Button,
   Divider,
@@ -6,7 +5,6 @@ import {
   Form,
   Input,
   InputNumber,
-  message,
   Modal,
   Select,
   Space,
@@ -14,18 +12,11 @@ import {
 } from "antd";
 import React, { useEffect } from "react";
 
-// 生成简短的UUID
-const generateShortUUID = () => {
-  return Math.random().toString(36).substring(2, 8);
-};
-
 interface CreateTaskModalProps {
   visible: boolean;
   onCancel: () => void;
   onConfirm: (values: any) => void; // 修改onConfirm的类型以接收表单值
   datasetList: { id: number; name: string; description: string }[] | undefined;
-  taskTypeOptions?: { value: string; label: string }[];
-  onDatasetCreate?: () => void;
 }
 
 const CreateTaskModal: React.FC<CreateTaskModalProps> = ({
@@ -33,45 +24,11 @@ const CreateTaskModal: React.FC<CreateTaskModalProps> = ({
   onCancel,
   onConfirm,
   datasetList,
-  taskTypeOptions,
-  onDatasetCreate
 }) => {
   const [form] = Form.useForm();
   const [datasetName, setDatasetName] = React.useState("");
   const [loading, setLoading] = React.useState(false);
 
-  // 监听表单字段变化，自动生成数据集名称
-  useEffect(() => {
-    const simulator = form.getFieldValue('simulator');
-    const taskType = form.getFieldValue('task_type');
-    const camera = form.getFieldValue('camera');
-    
-    if (simulator && taskType && camera) {
-      const uuid = generateShortUUID();
-      const generatedName = `${simulator}-${taskType}-${camera}-${uuid}`;
-      setDatasetName(generatedName);
-    }
-  }, [form]);
-
-  // 监听表单字段变化
-  const handleFormChange = () => {
-    const taskType = form.getFieldValue('task_type');
-    const camera = form.getFieldValue('camera');
-    
-    if (taskType && camera) {
-      const uuid = generateShortUUID();
-      const generatedName = `${taskType}-${camera}-${uuid}`;
-      setDatasetName(generatedName);
-    }
-  };
-  const simulationOptions = [
-    { value: "robotwin", label: "robotwin" },
-  ];
-  const cameraTypeOptions = [
-    { value: "D435", label: "D435" },
-    { value: "D515", label: "D515" },
-  ];
-
   const handleOk = async () => {
     try {
       const values = await form.validateFields();
@@ -84,18 +41,7 @@ const CreateTaskModal: React.FC<CreateTaskModalProps> = ({
 
   const handleCreateDataset = async () => {
     setLoading(true);
-    try {
+    
-      await datasetApi.createDataset({
-        name: datasetName,
-      });
-      message.success("创建数据集成功");
-      setLoading(false);
-      setDatasetName("");
-      onDatasetCreate?.();
-    } catch (error) {
-      setLoading(false);
-      message.error("创建数据集失败");
-    }
   };
 
   return (
@@ -104,16 +50,21 @@ const CreateTaskModal: React.FC<CreateTaskModalProps> = ({
       closable={false}
       open={visible}
       onCancel={onCancel}
-      onOk={handleOk}
+      onOk={handleOk} // 修改为handleOk
       destroyOnHidden
     >
-      <Form form={form} layout="vertical" onValuesChange={handleFormChange}>
+      <Form form={form} layout="vertical">
+        <Form.Item label="任务名称" name="task_name">
+          <Input placeholder="请输入任务名称（可选）" />
+        </Form.Item>
         <Form.Item
           label="仿真器"
           name="simulator"
           rules={[{ required: true, message: "请选择仿真器!" }]}
         >
-          <Select placeholder="请选择仿真器" options={simulationOptions}>
+          <Select placeholder="请选择仿真器">
+            <Select.Option value="robotwin">robotwin</Select.Option>
+            {/* 可以根据实际情况添加更多仿真器选项 */}
           </Select>
         </Form.Item>
         <Form.Item
@@ -121,7 +72,11 @@ const CreateTaskModal: React.FC<CreateTaskModalProps> = ({
           name="task_type"
           rules={[{ required: true, message: "请选择任务类型!" }]}
         >
-          <Select placeholder="请选择任务类型" options={taskTypeOptions}>
+          <Select placeholder="请选择任务类型">
+            <Select.Option value="beat_block_hammer">
+              beat_block_hammer
+            </Select.Option>
+            {/* 可以根据实际情况添加更多任务类型选项 */}
           </Select>
         </Form.Item>
         <Form.Item
@@ -129,7 +84,9 @@ const CreateTaskModal: React.FC<CreateTaskModalProps> = ({
           name="camera"
           rules={[{ required: true, message: "请选择相机类型!" }]}
         >
-          <Select placeholder="请选择相机类型" options={cameraTypeOptions}>
+          <Select placeholder="请选择相机类型">
+            <Select.Option value="D435">D435</Select.Option>
+            {/* 可以根据实际情况添加更多相机类型选项 */}
           </Select>
         </Form.Item>
         <Form.Item
@@ -144,9 +101,6 @@ const CreateTaskModal: React.FC<CreateTaskModalProps> = ({
             placeholder="请输入轨迹条数 (1-10000)"
           />
         </Form.Item>
-        <Form.Item label="任务名称" name="task_name">
-          <Input placeholder="请输入任务名称（可选）" />
-        </Form.Item>
         <Form.Item
           label="数据集"
           name="dataset_id"

src/views/data-generation/index.tsx

@@ -1,5 +1,5 @@
 import ColLayout from "@/components/ColLayout";
-import { Button, Flex, message, Pagination, Popconfirm, Table } from "antd";
+import { Button, Flex, Pagination, Table } from "antd";
 import { createStyles } from "antd-style";
 import ButtonGroup from "antd/es/button/button-group";
 import Search from "antd/es/input/Search";
@@ -9,8 +9,6 @@ import { datasetApi } from "@/api/dataset";
 import useToken from "antd/es/theme/useToken";
 import { dataGenerationApi } from "@/api/data-generation";
 import { preciseInterval } from "@/utils";
-import dayjs from "dayjs";
-import { debounce } from "lodash";
 
 // 假设的任务类型接口，如果已存在请忽略
 interface TaskItem {
@@ -19,7 +17,7 @@ interface TaskItem {
   type: string;
   create_time: string;
   update_time: string;
-  id: number | string;
+  // 其他可能的字段
 }
 
 interface DataGenerationPageProps {}
@@ -39,10 +37,6 @@ const DataGenerationPage: React.FC<DataGenerationPageProps> = () => {
   const [, token] = useToken();
   const PollyRef = useRef<any>(null);
   const refreshTime = 5000;
-  const [taskTypeOptions, setTaskTypeOptions] = useState<
-    { value: string; label: string }[]
-  >([]);
-  const [searchKeyword, setSearchKeyword] = useState<string>("");
 
   const HeaderSlot = (
     <div>
@@ -72,7 +66,7 @@ const DataGenerationPage: React.FC<DataGenerationPageProps> = () => {
   const columns = [
     {
       title: "任务名称",
-      dataIndex: "task_name",
+      dataIndex: "name",
       key: "name",
     },
     {
@@ -82,126 +76,78 @@ const DataGenerationPage: React.FC<DataGenerationPageProps> = () => {
     },
     {
       title: "任务类型",
-      dataIndex: "task_type",
+      dataIndex: "type",
       key: "type",
     },
     {
       title: "任务创建时间",
-      dataIndex: "created_at",
+      dataIndex: "create_time",
-      key: "created_at",
+      key: "create_time",
-      render: (text: string) => dayjs(text).format("YYYY-MM-DD HH:mm:ss"),
     },
     {
       title: "任务更新时间",
-      dataIndex: "updated_at",
+      dataIndex: "update_time",
-      key: "updated_at",
+      key: "update_time",
-      render: (text: string) => dayjs(text).format("YYYY-MM-DD HH:mm:ss"),
     },
     {
       title: "操作",
       key: "action",
       render: (_: any, record: TaskItem) => (
-        <span>
+        <ButtonGroup>
           {record.status === "running" ? ( // 假设 "running" 表示执行中
-            <Flex gap={16}>
+            <>
-              <Popconfirm
+              <Button type="primary">停止</Button>
-                title="确定停止吗？"
-                onConfirm={() => onOperate?.("stop", record)}
-              >
-                <Button type="primary" danger>
-                  停止
-                </Button>
-              </Popconfirm>
               <Button type="primary">日志</Button>
-            </Flex>
+            </>
           ) : (
-            <Flex gap={16}>
+            <>
-              <Button type="primary" danger>删除</Button>
+              <Button type="primary">删除</Button>
               <Button type="primary">日志</Button>
-            </Flex>
+            </>
           )}
-        </span>
+        </ButtonGroup>
       ),
     },
   ];
 
-  const onOperate = async (type: "stop" | "delete", record: TaskItem) => {
+  const getDatasetList = async (
-    try {
-      if (type === "stop") {
-        await dataGenerationApi.stopTask({ task_id: record.id });
-      } else if (type === "delete") {
-        await dataGenerationApi.deleteTask({ task_id: record.id });
-      }
-      setSearchKeyword('');
-      setPage(1);
-      getTaskList(1, pageSize, '');
-      message.success("操作成功");
-    } catch (error) {
-      console.error(error);
-    }
-  };
-
-  const getDatasetList = async () => {
-    const { data } = await datasetApi.getDatasetList({
-      current_page: 1,
-      page_size: 100,
-    });
-    setDatasetList(data.items);
-  };
-
-  const getTaskList = async (
     page: number,
     pageSize: number,
-    keyword?: string
   ) => {
+    const { data } = await datasetApi.getDatasetList({
+      current_page: page,
+      page_size: pageSize,
+    });
+    setDatasetList(data.list);
+  };
+
+  const getTaskList = async (page: number, pageSize: number, keyword?: string) => {
     const { data } = await dataGenerationApi.getTaskList({
       current_page: page,
       page_size: pageSize,
-      search_keyword: keyword,
+      search_keyword: keyword
     });
     setDataSource(data.items);
     setTotal(data.total);
   };
 
-  const getOptions = async () => {
-    const { data } = await dataGenerationApi.getOptions();
-    setTaskTypeOptions(
-      data.options.robotwin.task_types.map((item: any) => ({
-        value: item,
-        label: item,
-      }))
-    );
-  };
-
   const clearPolling = () => {
     PollyRef.current?.cancel();
     PollyRef.current = null;
   };
 
-  const startPolling = (page: number, pageSize: number, keyword?: string) => {
+  const startPolling = () => {
     PollyRef.current = preciseInterval(() => {
-      getTaskList(page, pageSize, keyword);
+      getTaskList(page, pageSize);
     }, refreshTime);
   };
 
   useEffect(() => {
     clearPolling();
-    getDatasetList();
+    getDatasetList(1, 10000)
-    getOptions();
+    startPolling();
   }, []);
 
-  const debounceStartPolling = debounce(
-    (page: number, pageSize: number, keyword?: string) => {
-      clearPolling();
-      startPolling(page, pageSize, keyword);
-    },
-    500
-  );
-
-  useEffect(() => {
-    debounceStartPolling(page, pageSize, searchKeyword);
-  }, [page, pageSize, searchKeyword]);
-
   return (
     <>
       <ColLayout HeaderSlot={HeaderSlot} FooterSlot={FooterSlot}>
@@ -209,10 +155,7 @@ const DataGenerationPage: React.FC<DataGenerationPageProps> = () => {
           <Flex justify="space-between" align="center" className="operate">
             <Search
               placeholder="请输入任务名称模糊搜索"
-              onSearch={(value) => {
+              onSearch={(value) => getTaskList(page, pageSize, value)}
-                setSearchKeyword(value);
-                getTaskList(page, pageSize, value);
-              }}
               style={{ width: "300px" }}
             />
             <ButtonGroup>
@@ -233,8 +176,6 @@ const DataGenerationPage: React.FC<DataGenerationPageProps> = () => {
           onCancel={() => setCreateTaskModalVisible(false)}
           onConfirm={() => setCreateTaskModalVisible(false)}
           datasetList={datasetList}
-          taskTypeOptions={taskTypeOptions}
-          onDatasetCreate={() => getDatasetList()}
         ></CreateTaskModal>
       )}
     </>

src/views/dataset/components/DatasetCard.tsx

@@ -5,7 +5,6 @@ import useToken from "antd/es/theme/useToken";
 import React, { useEffect, useRef, useState } from "react";
 import DatasetForm, { DatasetFormRef } from "./DatasetForm";
 import { Dataset } from "@/types/dataset";
-import dayjs from "dayjs";
 
 interface DatasetCardProps {
   DatasetDetail: Dataset;
@@ -28,12 +27,9 @@ const DatasetCard: React.FC<DatasetCardProps> = ({
           className="dataset_card_header"
           justify="space-between"
           align="center"
-          wrap={false}
         >
-          <Tooltip title={DatasetDetail.name}>
+          <span>{DatasetDetail.name}</span>
-            <span className="ellipsis" style={{flex: 1}}>{DatasetDetail.name}</span>
+          <span>{DatasetDetail.data_count} / 条 数据</span>
-          </Tooltip>
-          <span style={{ maxWidth: '180px' }}>{`${DatasetDetail.data_count} / 条 数据`}</span>
         </Flex>
         <div className="dataset_card_content">
           <div className="dataset_card_content_description">
@@ -49,7 +45,7 @@ const DatasetCard: React.FC<DatasetCardProps> = ({
           </div>
           <div className="dataset_card_content_description">
             <p className="description">创建时间：</p>
-            <p className="ellipsis">{dayjs(DatasetDetail.created_at).format('YYYY-MM-DD HH:mm:ss')}</p>
+            <p className="ellipsis">{DatasetDetail.created_at}</p>
           </div>
         </div>
         <Flex
@@ -118,7 +114,6 @@ const useStyles = createStyles(({ token }) => {
         color: token.colorText,
         width: "100%",
         marginBottom: "16px",
-        overflow: "hidden",
       },
       "& .dataset_card_content": {
         "& .dataset_card_content_description": {

src/views/dataset/index.tsx

@@ -1,7 +1,7 @@
 import ColLayout from "@/components/ColLayout";
-import React, { Fragment, useEffect, useRef, useState } from "react";
+import React, { useEffect, useRef, useState } from "react";
 import DatasetCard from "./components/DatasetCard";
-import { Empty, Flex, Form, Input, message, Pagination, Spin } from "antd";
+import { Form, Input, message, Pagination, Spin } from "antd";
 import { datasetApi } from "@/api/dataset";
 import { preciseInterval } from "@/utils";
 import useToken from "antd/es/theme/useToken";
@@ -22,7 +22,21 @@ const DatasetPage: React.FC<DatasetPageProps> = (props: DatasetPageProps) => {
   const refreshTime = 5000;
   const [searchKeyword, setSearchKeyword] = useState("");
   const [operateFormVisible, setOperateFormVisible] = useState(false);
-  const [datasetList, setDatasetList] = useState<Dataset[]>([]);
+  const [datasetList, setDatasetList] = useState<Dataset[]>([
+    {
+      id: 1,
+      name: "数据集1",
+      description: "数据集1描述",
+      task_count: 1,
+      simulator: "simulator1",
+      task: "task1",
+      camera: "camera1",
+      storage_time: "2024-01-01",
+      created_at: "2024-01-01",
+      updated_at: "2024-01-01",
+      data_count: 1,
+    },
+  ]);
   const [loading, setLoading] = useState(false);
 
   const HeaderSlot = (
@@ -51,7 +65,7 @@ const DatasetPage: React.FC<DatasetPageProps> = (props: DatasetPageProps) => {
           getDatasetList(newPage, newPageSize);
           PollyRef.current = preciseInterval(() => {
             getDatasetList(newPage, newPageSize);
-          }, 5000);
+          }, refreshTime);
         }}
         showSizeChanger
       ></Pagination>
@@ -65,14 +79,28 @@ const DatasetPage: React.FC<DatasetPageProps> = (props: DatasetPageProps) => {
   ) => {
     try {
       setLoading(true);
-      const { data } = await datasetApi.getDatasetList({
+      //   const { data } = await datasetApi.getDatasetList({
-        current_page: page,
+      //     current_page: page,
-        page_size: pageSize,
+      //     page_size: pageSize,
-        search_keyword: name,
+      //     search_keyword: name,
-      });
+      //   });
-      setTotal(data.total);
+      //   setTotal(data.total);
+      setDatasetList([
+        {
+          id: 1,
+          name: "数据集1",
+          description: "数据集1描述",
+          task_count: 1,
+          simulator: "simulator1",
+          task: "task1",
+          camera: "camera1",
+          storage_time: "2024-01-01",
+          created_at: "2024-01-01",
+          updated_at: "2024-01-01",
+          data_count: 1,
+        },
+      ]);
       setLoading(false);
-      setDatasetList(data?.items || []);
     } catch (error) {
       message.error("获取数据集列表失败");
       setLoading(false);
@@ -133,7 +161,7 @@ const DatasetPage: React.FC<DatasetPageProps> = (props: DatasetPageProps) => {
     getDatasetList(page, pageSize);
     PollyRef.current = preciseInterval(() => {
       getDatasetList(page, pageSize);
-    }, 5000);
+    }, refreshTime);
     return () => {
       clearPolling();
     };
@@ -141,24 +169,18 @@ const DatasetPage: React.FC<DatasetPageProps> = (props: DatasetPageProps) => {
 
   return (
     <ColLayout HeaderSlot={HeaderSlot} FooterSlot={FooterSlot}>
+      {loading ? (
+        <Spin />
+      ) : (
         <div
           className={styles.container}
           onClick={() => setOperateFormVisible(false)}
         >
-        <Search
+          <Search className="search" placeholder="请输入数据集名称" onChange={(e) => {
-          className="search"
-          placeholder="请输入数据集名称"
-          onChange={(e) => {
             setSearchKeyword(e.target.value);
-            getDatasetList(page, pageSize, e.target.value);
+            getDatasetList(page, pageSize, e.target.value)
-          }}
+          }} />
-        />
-        {datasetList.length === 0 ? (
-          <Empty />
-        ) : (
-          <Flex wrap gap={16}>
           {datasetList.map((item) => (
-              <Fragment key={item.id}>
             <DatasetCard
               key={item.id}
               DatasetDetail={item}
@@ -166,11 +188,9 @@ const DatasetPage: React.FC<DatasetPageProps> = (props: DatasetPageProps) => {
                 handleOperate(type, dataset as Dataset)
               }
             ></DatasetCard>
-              </Fragment>
           ))}
-          </Flex>
-        )}
         </div>
+      )}
     </ColLayout>
   );
 };
@@ -183,7 +203,7 @@ const useStyles = createStyles(({ token }) => {
         "& .search": {
             width: "300px",
             marginBottom: token.margin,
-      },
+        }
     },
   };
 });

vite.config.ts

@@ -10,13 +10,4 @@ export default defineConfig({
       "@": join(__dirname, "./src"),
     },
   },
-  server: { 
-    proxy: {
-      "/api": {
-        target: "http://120.48.128.161:30030",
-        changeOrigin: true,
-        rewrite: (path) => path.replace(/^\/api/, ""),
-      },
-    },
-  },
 })