diff --git a/src/pages/measure/components/MeasureConfig.tsx b/src/pages/measure/components/MeasureConfig.tsx index ba14474..a0ced0d 100644 --- a/src/pages/measure/components/MeasureConfig.tsx +++ b/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"], diff --git a/src/pages/measure/components/MeasureDetail.tsx b/src/pages/measure/components/MeasureDetail.tsx index 58ea74f..2b0487d 100644 --- a/src/pages/measure/components/MeasureDetail.tsx +++ b/src/pages/measure/components/MeasureDetail.tsx @@ -37,6 +37,13 @@ export default function MeasureDetail() { const columns: TableColumnsType = [ { + 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
- -
- -
- -
- } - }, + // { + // title: '操作', + // dataIndex: 'op', + // width:180, + // align:'center', + // render:(_, record)=>{ + // return
+ // + //
+ // + //
+ // + //
+ // } + // }, ]; const [tableData, setTableData] = useState([]) @@ -260,6 +267,8 @@ export default function MeasureDetail() { rowKey="id" dataSource={tableData && tableData.map(item => ({ ...item, key: item.name }))} pagination={false} + scroll={{ y: 550 }} + />