Merge remote-tracking branch 'origin/dev' into dev

react-ui/config/defaultSettings.ts

@@ -19,7 +19,7 @@ const Settings: ProLayoutProps & {
   title: '智能软件开发平台',
   pwa: true,
   logo: '/assets/images/left-top-logo.png',
-  iconfontUrl: '//at.alicdn.com/t/c/font_4511326_2511riex401.js',
+  iconfontUrl: '//at.alicdn.com/t/c/font_4511326_1cmi0j3dj1x.js',
   token: {
     // 参见ts声明，demo 见文档，通过token 修改样式
     //https://procomponents.ant.design/components/layout#%E9%80%9A%E8%BF%87-token-%E4%BF%AE%E6%94%B9%E6%A0%B7%E5%BC%8F

react-ui/config/routes.ts

@@ -68,30 +68,31 @@ export default [
     routes: [
       {
         name: '流水线',
-        path: '',
+        path: '/pipeline/pipelineText',
         component: './Pipeline/index',
       },
       {
         name: '训练',
-        path: 'pytorchtext/:id/:name',
+        path: '/pipeline/pytorchtext/:id/:name',
         component: './Pipeline/editPipeline/index',
       },
+      {
+        name: '实验',
+        path: '/pipeline/experimentText',
+        component: './Experiment/index',
+      },
+      {
+        name: '实验训练',
+        path: '/pipeline/experimentPytorchtext/:workflowId/:id',
+        component: './Experiment/experimentText/index',
+      },
     ],
   },
   {
     name: 'experiment',
     path: '/experiment',
     routes: [
-      {
-        name: '实验',
-        path: '',
-        component: './Experiment/index',
-      },
-      {
-        name: '实验训练',
-        path: 'pytorchtext/:workflowId/:id',
-        component: './Experiment/experimentText/index',
-      },
+      
     ],
   },
   {
@@ -168,6 +169,52 @@ export default [
       },
     ],
   },
+  
+  {
+    name: 'workspace',
+    path: '/workspace',
+    routes: [
+      {
+        name: '工作空间',
+        path: '',
+        component: './missingPage.jsx',
+      },
+    ],
+  },
+  {
+    name: 'modelDseployment',
+    path: '/modelDseployment',
+    routes: [
+      {
+        name: '模型部署',
+        path: '',
+        component: './missingPage.jsx',
+      },
+    ],
+  },
+  
+  {
+    name: 'appsDeployment',
+    path: '/appsDeployment',
+    routes: [
+      {
+        name: '应用开发',
+        path: '',
+        component: './missingPage.jsx',
+      },
+    ],
+  },
+  {
+    name: 'see',
+    path: '/see',
+    routes: [
+      {
+        name: '监控运维',
+        path: '',
+        component: './missingPage.jsx',
+      },
+    ],
+  },
   {
     name: 'monitor',
     path: '/monitor',

react-ui/src/global.less

@@ -59,10 +59,11 @@ body {
   padding-top: 40px;
 }
 .ant-table-wrapper .ant-table-container table > thead > tr:first-child > *:first-child,
-.ant-table-wrapper .ant-table-container table > tbody > tr:first-child {
+.ant-table-wrapper .ant-table-tbody>tr>td:first-child {
   padding: 0 30px;
 }
 
+
 .ant-pro-global-header-logo-mix {
   width: 257px;
   height: 75px;

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

@@ -256,7 +256,7 @@ function Experiment() {
   };
   const routerToText = (e, item, record) => {
     e.stopPropagation();
-    navgite({ pathname: `/experiment/pytorchtext/${record.workflow_id}/${item.id}` });
+    navgite({ pathname: `/pipeline/experimentPytorchtext/${record.workflow_id}/${item.id}` });
   };
 
   const handleTensorboard = async (experimentIn) => {

react-ui/src/pages/missingPage.jsx

@@ -0,0 +1,10 @@
+import missingPage from '@/assets/img/missing-back.png';
+
+const MissingPage = () => (
+  <div style={{ width: '100%', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
+    <img src={missingPage} style={{ width: '575px', margin: '278px 0  44px 0' }} alt="" />
+    <span style={{ color: '#575757', fontSize: '16px' }}>页面开发中，敬请期待......</span>
+  </div>
+);
+
+export default MissingPage;