merge

react-ui/src/pages/Experiment/index.jsx

@@ -69,6 +69,7 @@ function Experiment() {
           return { ...item, key: item.id };
         }),
       );
+
       setTotal(res.data.totalElements);
     }
   };
@@ -82,6 +83,7 @@ function Experiment() {
   // 获取实验实例
   const getQueryByExperiment = (val) => {
     getQueryByExperimentId(val).then((ret) => {
+      console.log(val);
       setExpandedRowKeys(val);
       if (ret && ret.data && ret.data.length > 0) {
         try {
@@ -159,6 +161,7 @@ function Experiment() {
   };
   const expandChange = (e, record) => {
     clearExperimentInTimers();
+    console.log(e, record);
     if (record.id === expandedRowKeys) {
       setExpandedRowKeys(null);
     } else {
@@ -517,6 +520,7 @@ function Experiment() {
                   : ''}
               </div>
             ),
+
             onExpand: (e, a) => {
               expandChange(e, a);
             },

react-ui/src/pages/Model/personalData.jsx

@@ -6,11 +6,7 @@ import KFIcon from '@/components/KFIcon';
 import { addModel, deleteModel, getAssetIcon, getModelList } from '@/services/dataset/index.js';
 import { modalConfirm } from '@/utils/ui';
 import { UploadOutlined } from '@ant-design/icons';
-<<<<<<< HEAD
-import { Button, Form, Input, Modal, Pagination, Radio, Select, Upload, message } from 'antd';
-=======
-import { Button, Form, Input, Modal, Pagination, Select, Upload } from 'antd';
->>>>>>> 4065c42374905b323a937377ae9ab5f05d6ee297
+import { Button, Form, Input, Modal, Pagination, Select, Upload, message } from 'antd';
 import moment from 'moment';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';