Merge branch 'dev-check' of https://gitlink.org.cn/ci4s/ci4sManagement-cloud into dev-check

react-ui/src/pages/Workspace/components/AssetsManagement/index.less

@@ -37,7 +37,18 @@
   &__summary {
     display: flex;
     flex-direction: column;
-    width: 33.33%;
+    width: 40%;
+    text-align: left;
+
+    &:nth-child(3n+2) {
+      text-align: center;
+       width: 30%;
+    }
+
+    &:nth-child(3n) {
+      text-align: right;
+       width: 30%;
+    }
 
     &__title {
       margin-bottom: 12px;

react-ui/src/pages/Workspace/components/AssetsManagement/index.tsx

@@ -16,7 +16,7 @@ function AssetsManagement() {
       };
       const [res] = await to(getWorkspaceAssetCountReq(params));
       if (res && res.data) {
-        const { dataset, image, model, workflow } = res.data;
+        const { dataset, image, model, workflow, codeConfig, service } = res.data;
         const items = [
           {
             title: '数据集',
@@ -42,6 +42,14 @@ function AssetsManagement() {
             title: '流水线模版',
             value: workflow,
           },
+          {
+            title: '代码配置',
+            value: codeConfig,
+          },
+          {
+            title: '服务',
+            value: service,
+          },
         ];
         setAssetCounts(items);
       }
@@ -53,7 +61,7 @@ function AssetsManagement() {
   return (
     <div className={styles['assets-management']}>
       <Flex justify="space-between">
-        <div className={styles['assets-management__title']}>AI资产</div>
+        <div className={styles['assets-management__title']}>多形态资源库</div>
         <Select
           size="small"
           value={type}
@@ -67,11 +75,11 @@ function AssetsManagement() {
         />
       </Flex>
       {/* <div className={styles['assets-management__increase']}>今日新增数量：5</div> */}
-      <Flex gap="22px 0" wrap="wrap" style={{ marginTop: '40px' }}>
+      <Flex gap="22px 0" wrap="wrap" style={{ marginTop: '40px', padding: '0 8px' }}>
         {assetCounts.map((item, index) => (
           <div className={styles['assets-management__summary']} key={index}>
             <div className={styles['assets-management__summary__title']}>{item.title}</div>
-            <div className={styles['assets-management__summary__value']}>{item.value}</div>
+            <div className={styles['assets-management__summary__value']}>{item.value ?? '-'}</div>
           </div>
         ))}
       </Flex>

react-ui/src/pages/Workspace/components/ExperimentTable/index.less

@@ -1,6 +1,6 @@
 .experiment-table {
   flex: 1;
-  min-width: 378px;
+  min-width: 460px;
   height: 140px;
   padding: 12px;
   background: @workspace-background;
@@ -32,7 +32,7 @@
   }
 
   &__status {
-    width: 15%;
+    width: 25%;
   }
 
   &__duration {
@@ -40,11 +40,11 @@
   }
 
   &__date {
-    width: calc(60% - 60px);
+    width: 40%;
   }
 
   &__operation {
-    width: 60px;
+    width: 10%;
 
     :global {
       .ant-btn-link {

react-ui/src/pages/Workspace/components/QuickStart/index.tsx

@@ -55,7 +55,7 @@ function QuickStart() {
           <WorkFlow
             content="为开发者提供数据智能标注与数据回流服务"
             buttonText="数据标注"
-            buttonTop={40}
+            buttonTop={20}
             x={left}
             y={309}
             onClick={() => navigate('/datasetPreparation/datasetAnnotation')}
@@ -80,7 +80,7 @@ function QuickStart() {
           <WorkFlow
             content="开发者可以在这里运行流水线模板，产生实验实例，对比实验训练过程与产生的实验训练数据"
             buttonText="实验"
-            buttonTop={40}
+            buttonTop={20}
             x={left + 2 * (192 + space)}
             y={295}
             onClick={() => navigate('/pipeline/experiment')}

react-ui/src/pages/Workspace/components/TotalStatistics/index.less

@@ -3,16 +3,16 @@
   align-items: center;
   justify-content: center;
   height: 140px;
-  padding: 0 16px;
+  padding: 0 35px;
 
-  // 媒体查询
-  @media screen and (max-width: 1600px) {
-    flex: auto;
-  }
+  // // 媒体查询
+  // @media screen and (max-width: 1600px) {
+  //   flex: auto;
+  // }
 
   &__icon {
-    width: 63px;
-    margin-right: 16px;
+    width: 80px;
+    margin-right: 20px;
   }
 
   &__title {

react-ui/src/pages/Workspace/components/UserPoints/index.less

@@ -7,6 +7,7 @@
   height: 228px;
   padding: 0 20px;
   .backgroundFullImage(url(@/assets/img/user-points-bg.png));
+   margin-bottom: 16px;
 
   &__label {
     margin-top: 60px;

react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx

@@ -4,9 +4,9 @@ function WorkspaceIntro() {
   return (
     <div className={styles['workspace-intro']}>
       <div className={styles['workspace-intro__left']}>
-        <div className={styles['workspace-intro__title']}>自主实验平台</div>
+        <div className={styles['workspace-intro__title']}>智能材料科研平台</div>
         <div className={styles['workspace-intro__content']}>
-          材料领域的自主实验系统是一种用于材料研究和开发的技术平台，它旨在提供实验数据收集、分析和可视化等功能，
+          智能材料科研平台是用于材料研究和开发的技术平台，它旨在提供实验数据收集、分析和可视化等功能，
           以支持材料工程师、科学家和研究人员在材料设计、性能评估和工艺优化方面的工作
         </div>
         {/* <div className={styles['workspace-intro__buttons']}>

react-ui/src/pages/Workspace/index.less

@@ -27,7 +27,7 @@
 
       &__statistics {
         flex: none;
-        min-width: 431px;
+        // min-width: 500px;
         background: linear-gradient(
           123.08deg,
           rgba(138, 138, 138, 0.06) 1.32%,
@@ -35,10 +35,10 @@
         );
         border-radius: 4px;
 
-        // 媒体查询
-        @media screen and (max-width: 1600px) {
-          flex: 1;
-        }
+        // // 媒体查询
+        // @media screen and (max-width: 1600px) {
+        //   flex: 1;
+        // }
       }
     }
   }

react-ui/src/pages/Workspace/index.tsx

@@ -12,7 +12,6 @@ import QuickStart from './components/QuickStart';
 // import RobotFrame from './components/RobotFrame';
 import TotalStatistics from './components/TotalStatistics';
 import UserPoints from './components/UserPoints';
-import UserSpace from './components/UserSpace';
 import WorkspaceIntro from './components/WorkspaceIntro';
 import styles from './index.less';
 
@@ -67,7 +66,6 @@ function Workspace() {
                 count={overviewData?.runningExperimentInsCount}
               />
             </Flex>
-
             <ExperitableTable
               tableData={overviewData?.latestExperimentInsList || []}
             ></ExperitableTable>
@@ -76,12 +74,12 @@ function Workspace() {
             )}
           </div>
         </div>
-        <UserPoints />
       </Flex>
       <div className={styles['workspace__quick-start']}>
         <QuickStart></QuickStart>
         <div className={styles['workspace__user']}>
-          <UserSpace users={users}></UserSpace>
+          <UserPoints />
+          {/* <UserSpace users={users}></UserSpace> */}
           <AssetsManagement></AssetsManagement>
         </div>
       </div>