dev_1.0.1
tangjie 2026-07-07 11:30:42 +08:00
parent d343838f4d
commit b60243f58e
1 changed files with 8 additions and 8 deletions

View File

@ -131,7 +131,7 @@ function EquipInfoPage(props) {
<Select.Option value="物理仪器">物理仪器</Select.Option> <Select.Option value="物理仪器">物理仪器</Select.Option>
</ControlWrapper.Select> </ControlWrapper.Select>
</Form.Item>, </Form.Item>,
<Form.Item key="deviceType" name="deviceType"> <Form.Item key="deviceTypeName" name="deviceTypeName">
<ControlWrapper.Select <ControlWrapper.Select
label="设备类型" label="设备类型"
placeholder="请选择" placeholder="请选择"
@ -154,12 +154,12 @@ function EquipInfoPage(props) {
</ControlWrapper.Select> </ControlWrapper.Select>
</Form.Item>, </Form.Item>,
]} ]}
onReset={() => { onReset={(value) => {
router.query = { ...router.query, current: 1, size: 10 }; router.query = { ...value, current: 1, size: 10 };
handleSearch(); handleSearch();
}} }}
onFinish={() => { onFinish={(value) => {
router.query = { ...router.query, current: 1, size: 10 }; router.query = { ...value, current: 1, size: 10 };
handleSearch(); handleSearch();
}} }}
/> />
@ -174,7 +174,7 @@ function EquipInfoPage(props) {
}, },
{ title: "设备型号", dataIndex: "deviceModel" }, { title: "设备型号", dataIndex: "deviceModel" },
{ title: "仪器类型", dataIndex: "instrumentTypeName" }, { title: "仪器类型", dataIndex: "instrumentTypeName" },
{ title: "设备类型", dataIndex: "deviceType" }, { title: "设备类型", dataIndex: "deviceTypeName" },
{ {
title: "厂家", title: "厂家",
dataIndex: "manufacturer", dataIndex: "manufacturer",
@ -391,7 +391,7 @@ function EquipFormModal({
</Col> </Col>
<Col span={12}> <Col span={12}>
<Form.Item <Form.Item
name="deviceType" name="deviceTypeName"
label="设备类型" label="设备类型"
rules={[{ required: true, message: "请选择设备类型" }]} rules={[{ required: true, message: "请选择设备类型" }]}
> >
@ -528,7 +528,7 @@ function EquipViewModal({ open, currentId, equipInfoGet, onCancel }) {
{info.instrumentTypeName} {info.instrumentTypeName}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="设备类型"> <Descriptions.Item label="设备类型">
{info.deviceType} {info.deviceTypeName}
</Descriptions.Item> </Descriptions.Item>
<Descriptions.Item label="厂家">{info.manufacturer}</Descriptions.Item> <Descriptions.Item label="厂家">{info.manufacturer}</Descriptions.Item>
<Descriptions.Item label="设备流量说明" span={2}> <Descriptions.Item label="设备流量说明" span={2}>