Commit 00b4129b by zhaochengxiang

优化意见

parent 22e48d1e
...@@ -84,6 +84,7 @@ const Basic = ({ item }) => { ...@@ -84,6 +84,7 @@ const Basic = ({ item }) => {
<div> <div>
<Descriptions column={3}> <Descriptions column={3}>
<Descriptions.Item label='任务名称'>{item?.jobName}</Descriptions.Item> <Descriptions.Item label='任务名称'>{item?.jobName}</Descriptions.Item>
<Descriptions.Item label='任务编号'>{item?.showJobNumber}</Descriptions.Item>
{/* <Descriptions.Item label='模型评审通过时间'>{item?.endTs?new Date(item?.endTs).toLocaleString():''}</Descriptions.Item> */} {/* <Descriptions.Item label='模型评审通过时间'>{item?.endTs?new Date(item?.endTs).toLocaleString():''}</Descriptions.Item> */}
<Descriptions.Item label='任务执行时间'>{item?.beginTs?new Date(item?.beginTs).toLocaleString():''}</Descriptions.Item> <Descriptions.Item label='任务执行时间'>{item?.beginTs?new Date(item?.beginTs).toLocaleString():''}</Descriptions.Item>
</Descriptions> </Descriptions>
...@@ -380,8 +381,8 @@ const PerfectMatch = ({ item }) => { ...@@ -380,8 +381,8 @@ const PerfectMatch = ({ item }) => {
render: (_, record) => record.modelModifiedTs?new Date(record.modelModifiedTs).toLocaleString():'' render: (_, record) => record.modelModifiedTs?new Date(record.modelModifiedTs).toLocaleString():''
}, },
{ {
title: '环境', title: '模型状态',
dataIndex: 'env', dataIndex: 'modelStatusName',
}, },
{ {
title: '元数据路径', title: '元数据路径',
...@@ -409,10 +410,6 @@ const PerfectMatch = ({ item }) => { ...@@ -409,10 +410,6 @@ const PerfectMatch = ({ item }) => {
dataIndex: 'metadataModifiedTs', dataIndex: 'metadataModifiedTs',
render: (_, record) => record.metadataModifiedTs?new Date(record.metadataModifiedTs).toLocaleString():'' render: (_, record) => record.metadataModifiedTs?new Date(record.metadataModifiedTs).toLocaleString():''
}, },
{
title: '模型状态',
dataIndex: 'modelStatusName',
},
] ]
const getList = () => { const getList = () => {
...@@ -641,8 +638,8 @@ const PartialMatch = ({ item }) => { ...@@ -641,8 +638,8 @@ const PartialMatch = ({ item }) => {
render: (_, record) => record.modelModifiedTs?new Date(record.modelModifiedTs).toLocaleString():'' render: (_, record) => record.modelModifiedTs?new Date(record.modelModifiedTs).toLocaleString():''
}, },
{ {
title: '环境', title: '模型状态',
dataIndex: 'env', dataIndex: 'modelStatusName',
}, },
{ {
title: '元数据路径', title: '元数据路径',
...@@ -691,10 +688,6 @@ const PartialMatch = ({ item }) => { ...@@ -691,10 +688,6 @@ const PartialMatch = ({ item }) => {
) )
} }
}, },
{
title: '模型状态',
dataIndex: 'modelStatusName',
},
] ]
const getList = () => { const getList = () => {
...@@ -1048,22 +1041,22 @@ const NotMatch = ({ item }) => { ...@@ -1048,22 +1041,22 @@ const NotMatch = ({ item }) => {
<Row gutter={15}> <Row gutter={15}>
<Col span={12}> <Col span={12}>
<div className='flex mb-3' style={{ justifyContent: 'space-between', alignItems: 'center' }}> <div className='flex mb-3' style={{ justifyContent: 'space-between', alignItems: 'center' }}>
<h4 style={{ marginBottom: 0 }}>未匹配元数据列表</h4> <h4 style={{ marginBottom: 0 }}>未匹配模型列表</h4>
<Catalog <Catalog
placeholder='请选择元数据目录' placeholder='请选择模型目录'
loading={loadingMetadataCatalog} data={metadataCatalog} value={args.metadataPath} loading={loadingModelCatalog} data={modelCatalog} value={args.modelPath}
onChange={(val) => { onChange={(val) => {
setArgsByParams({ metadataPath: val, metadataPage: 1 }) setArgsByParams({ modelPath: val, modelPage: 1 })
}} }}
/> />
</div> </div>
<Table <Table
loading={loadingMetadata} loading={loadingModel}
columns={metadataCols??[]} columns={modelCols??[]}
dataSource={metadatas??[]} dataSource={models??[]}
pageNum={args.metadataPage} pageSize={args.metadataSize} total={metadataTotal} pageNum={args.modelPage} pageSize={args.modelSize} total={modelTotal}
onPaginate={(page, size) => { onPaginate={(page, size) => {
setArgsByParams({ metadataPage: page, metadataSize: size }) setArgsByParams({ modelPage: page, modelSize: size })
}} }}
shouldRowContextMenu={(record) => { shouldRowContextMenu={(record) => {
return false return false
...@@ -1072,22 +1065,22 @@ const NotMatch = ({ item }) => { ...@@ -1072,22 +1065,22 @@ const NotMatch = ({ item }) => {
</Col> </Col>
<Col span={12}> <Col span={12}>
<div className='flex mb-3' style={{ justifyContent: 'space-between', alignItems: 'center' }}> <div className='flex mb-3' style={{ justifyContent: 'space-between', alignItems: 'center' }}>
<h4 style={{ marginBottom: 0 }}>未匹配模型列表</h4> <h4 style={{ marginBottom: 0 }}>未匹配元数据列表</h4>
<Catalog <Catalog
placeholder='请选择模型目录' placeholder='请选择元数据目录'
loading={loadingModelCatalog} data={modelCatalog} value={args.modelPath} loading={loadingMetadataCatalog} data={metadataCatalog} value={args.metadataPath}
onChange={(val) => { onChange={(val) => {
setArgsByParams({ modelPath: val, modelPage: 1 }) setArgsByParams({ metadataPath: val, metadataPage: 1 })
}} }}
/> />
</div> </div>
<Table <Table
loading={loadingModel} loading={loadingMetadata}
columns={modelCols??[]} columns={metadataCols??[]}
dataSource={models??[]} dataSource={metadatas??[]}
pageNum={args.modelPage} pageSize={args.modelSize} total={modelTotal} pageNum={args.metadataPage} pageSize={args.metadataSize} total={metadataTotal}
onPaginate={(page, size) => { onPaginate={(page, size) => {
setArgsByParams({ modelPage: page, modelSize: size }) setArgsByParams({ metadataPage: page, metadataSize: size })
}} }}
shouldRowContextMenu={(record) => { shouldRowContextMenu={(record) => {
return false return false
......
...@@ -480,6 +480,7 @@ const ModelRangeItem = ({ value, onChange }) => { ...@@ -480,6 +480,7 @@ const ModelRangeItem = ({ value, onChange }) => {
<TreeSelect <TreeSelect
multiple multiple
loading={loading} loading={loading}
treeNodeFilterProp='title'
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
treeData={treeData1} treeData={treeData1}
value={treeSelectedKeys??[]} value={treeSelectedKeys??[]}
...@@ -724,6 +725,7 @@ const MetadataRangeItem = ({ value, onChange }) => { ...@@ -724,6 +725,7 @@ const MetadataRangeItem = ({ value, onChange }) => {
<TreeSelect <TreeSelect
multiple multiple
loading={loadingTreeData} loading={loadingTreeData}
treeNodeFilterProp='title'
value={treeSelectedKeys??[]} value={treeSelectedKeys??[]}
onChange={onTreeChange} onChange={onTreeChange}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment