Merge pull request '测试合并' (#7) from dev into master

react-ui/config/defaultSettings.ts

@@ -18,7 +18,7 @@ const Settings: ProLayoutProps & {
   colorWeak: false,
   title: '复杂智能软件',
   pwa: true,
-  logo: 'https://gw.alipayobjects.com/zos/rmsportal/KDpgvguMpGfqaHPjicRK.svg',
+  logo: '/assets/images/left-top-logo.png',
   iconfontUrl: '',  
   token: {
     // 参见ts声明，demo 见文档，通过token 修改样式

react-ui/config/proxy.ts

@@ -15,7 +15,8 @@ export default {
     // localhost:8000/api/** -> https://preview.pro.ant.design/api/**
     '/api/': {
       // 要代理的地址
-      // target: 'http://172.20.32.181:31205',
+      // target: 'ci4s-gateway-service.ci4s-test.svc:8082',
+      // target: 'http://172.20.32.98:8082',
       target: 'http://172.20.32.150:8082',
       // 配置了这个可以从 http 代理到 https
       // 依赖 origin 的功能可能需要这个，比如 cookie

react-ui/config/routes.ts

@@ -105,6 +105,33 @@ export default [
       },
     ]
   },
+  {
+    name: 'dataset',
+    path: '/dataset',
+    routes: [
+      {
+        name: '数据集管理',
+        path: '/dataset/datasetIndex',
+        component: './Dataset/index',
+      },
+      {
+        name: '数据集简介',
+        path: '/dataset/datasetIntro/:id',
+        component: './Dataset/datasetIntro',
+      },
+      {
+        name: '模型管理',
+        path: '/dataset/modelIndex',
+        component: './Model/index',
+        
+      },
+      {
+        name: '模型简介',
+        path: '/dataset/modelIntro/:id',
+        component: './Model/modelIntro',
+      },
+    ]
+  },
   {
     name: 'monitor',
     path: '/monitor',