Browse Source

优化表格样式

feature/rail
LiLongLong 5 months ago
parent
commit
3de97cde71
  1. 4
      src/pages/measure/components/MeasureConfig.tsx
  2. 39
      src/pages/measure/components/MeasureDetail.tsx

4
src/pages/measure/components/MeasureConfig.tsx

@ -14,8 +14,8 @@ export default function MeasureConfig() {
console.log("Received values of form: ", values);
//判断是否连接了设备
if(!deviceState.isConnect){
// message.error('设备尚未连接或连接失败,请重新连接')
// return;
message.error('设备尚未连接或连接失败,请重新连接')
return;
}
createMeasure({
operatorName: values["username"],

39
src/pages/measure/components/MeasureDetail.tsx

@ -37,6 +37,13 @@ export default function MeasureDetail() {
const columns: TableColumnsType<DetailTable> = [
{
title: '序号',
dataIndex: 'seq',
render:(_, record, index)=>{
return index + 1
}
},
{
title: '测量名称',
dataIndex: 'name',
},
@ -72,21 +79,21 @@ export default function MeasureDetail() {
title: '时间',
dataIndex: 'createTime',
},
{
title: '操作',
dataIndex: 'op',
width:180,
align:'center',
render:(_, record)=>{
return <div>
<Button type="link" onClick={()=>onDel(record)}></Button>
<br/>
<Button type="link" onClick={()=>onShowDetail(record)}></Button>
<br/>
<Button type="link" onClick={()=>onDetaiResult(record)}></Button>
</div>
}
},
// {
// title: '操作',
// dataIndex: 'op',
// width:180,
// align:'center',
// render:(_, record)=>{
// return <div>
// <Button type="link" onClick={()=>onDel(record)}>删除</Button>
// <br/>
// <Button type="link" onClick={()=>onShowDetail(record)}>导出测量数据</Button>
// <br/>
// <Button type="link" onClick={()=>onDetaiResult(record)}>导出分析结果</Button>
// </div>
// }
// },
];
const [tableData, setTableData] = useState<DetailTable[]>([])
@ -260,6 +267,8 @@ export default function MeasureDetail() {
rowKey="id"
dataSource={tableData && tableData.map(item => ({ ...item, key: item.name }))}
pagination={false}
scroll={{ y: 550 }}
/>
<div className="float-right">
<Pagination onChange={onPageChange} current={pageNum} pageSizeOptions={[5,10,20,30]} defaultCurrent={pageNum} defaultPageSize={pageSize} total={total}/>

Loading…
Cancel
Save