Browse Source

chore: merge

pull/259/head
zhaowei 8 months ago
parent
commit
531beedac6
5 changed files with 13 additions and 14 deletions
  1. +5
    -5
      react-ui/src/pages/Experiment/components/AddExperimentModal/index.tsx
  2. +2
    -2
      react-ui/src/pages/Pipeline/index.jsx
  3. +3
    -3
      react-ui/src/pages/Workspace/components/QuickStart/index.tsx
  4. +1
    -1
      react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less
  5. +2
    -3
      react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx

+ 5
- 5
react-ui/src/pages/Experiment/components/AddExperimentModal/index.tsx View File

@@ -95,8 +95,8 @@ function AddExperimentModal({
}; };


const layout = { const layout = {
labelCol: { span: 4 },
wrapperCol: { span: 20 },
labelCol: { span: 5 },
wrapperCol: { span: 19 },
}; };


const paramLayout = { const paramLayout = {
@@ -181,13 +181,13 @@ function AddExperimentModal({
/> />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="选择流水线"
label="选择流水线模板"
name="workflow_id" name="workflow_id"
rules={[{ required: true, message: '请选择流水线' }]}
rules={[{ required: true, message: '请选择流水线模板' }]}
> >
<Select <Select
disabled={workflowDisabled} disabled={workflowDisabled}
placeholder="请选择流水线"
placeholder="请选择流水线模板"
onChange={handleWorkflowChange} onChange={handleWorkflowChange}
> >
{Array.isArray(workflowList) {Array.isArray(workflowList)


+ 2
- 2
react-ui/src/pages/Pipeline/index.jsx View File

@@ -190,7 +190,7 @@ const Pipeline = () => {
}), }),
}, },
{ {
title: '流水线名称',
title: '流水线模板名称',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
width: '50%', width: '50%',
@@ -199,7 +199,7 @@ const Pipeline = () => {
}), }),
}, },
{ {
title: '流水线描述',
title: '流水线模板描述',
dataIndex: 'description', dataIndex: 'description',
key: 'description', key: 'description',
width: '50%', width: '50%',


+ 3
- 3
react-ui/src/pages/Workspace/components/QuickStart/index.tsx View File

@@ -54,7 +54,7 @@ function QuickStart() {
> >
<WorkFlow <WorkFlow
content="为开发者提供数据智能标注与数据回流服务" content="为开发者提供数据智能标注与数据回流服务"
buttonText="数据准备"
buttonText="数据标注"
buttonTop={20} buttonTop={20}
x={left} x={left}
y={309} y={309}
@@ -71,7 +71,7 @@ function QuickStart() {
<WorkFlow <WorkFlow
content="为开发者提供定制化编辑器,开发者可根据自己需求选择配置,保存编译器中的调试环境为镜像供训练使用" content="为开发者提供定制化编辑器,开发者可根据自己需求选择配置,保存编译器中的调试环境为镜像供训练使用"
tips="可视化建模Designer" tips="可视化建模Designer"
buttonText="流水线"
buttonText="流水线模板"
buttonTop={20} buttonTop={20}
x={left + 1 * (192 + space)} x={left + 1 * (192 + space)}
y={276} y={276}
@@ -88,7 +88,7 @@ function QuickStart() {
<WorkFlow <WorkFlow
content="支持异构硬件(CPU/GPU)的模型加载,高吞吐,低延迟;支持大规模复杂模型的一键部署,实时弹性扩缩容;提供完整的运维监控体系。" content="支持异构硬件(CPU/GPU)的模型加载,高吞吐,低延迟;支持大规模复杂模型的一键部署,实时弹性扩缩容;提供完整的运维监控体系。"
tips="模型在线服务" tips="模型在线服务"
buttonText="模型在线部署"
buttonText="服务"
buttonTop={20} buttonTop={20}
x={left + 3 * (192 + space) + 60 + space} x={left + 3 * (192 + space) + 60 + space}
y={263} y={263}


+ 1
- 1
react-ui/src/pages/Workspace/components/WorkspaceIntro/index.less View File

@@ -2,7 +2,7 @@
display: flex; display: flex;
align-items: center; align-items: center;
margin-bottom: 16px; margin-bottom: 16px;
padding: 0 30px;
padding: 20px 30px;
background-image: url(@/assets/img/workspace-intro.png); background-image: url(@/assets/img/workspace-intro.png);
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: top right; background-position: top right;


+ 2
- 3
react-ui/src/pages/Workspace/components/WorkspaceIntro/index.tsx View File

@@ -1,4 +1,3 @@
import { Button } from 'antd';
import styles from './index.less'; import styles from './index.less';


function WorkspaceIntro() { function WorkspaceIntro() {
@@ -10,7 +9,7 @@ function WorkspaceIntro() {
智能材料科研平台是用于材料研究和开发的技术平台,它旨在提供实验数据收集、分析和可视化等功能, 智能材料科研平台是用于材料研究和开发的技术平台,它旨在提供实验数据收集、分析和可视化等功能,
以支持材料工程师、科学家和研究人员在材料设计、性能评估和工艺优化方面的工作 以支持材料工程师、科学家和研究人员在材料设计、性能评估和工艺优化方面的工作
</div> </div>
<div className={styles['workspace-intro__buttons']}>
{/* <div className={styles['workspace-intro__buttons']}>
<Button <Button
type="primary" type="primary"
style={{ marginRight: '20px' }} style={{ marginRight: '20px' }}
@@ -40,7 +39,7 @@ function WorkspaceIntro() {
> >
分子材料自主实验系统 分子材料自主实验系统
</Button> </Button>
</div>
</div> */}
</div> </div>
<div className={styles['workspace-intro__right']}> <div className={styles['workspace-intro__right']}>
<img <img


Loading…
Cancel
Save