From 1cd63e45d43f29e1aa5c72a0e0cade384642613c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 15 三月 2024 14:17:20 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 3bb598e..f1e5220 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -1,5 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
-import { Col, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
+import { message, Form, Input, Row, Checkbox, Slider, Select, Drawer, Space, Button, InputNumber, Card } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
@@ -15,7 +15,17 @@
const { curSprite, configForm: form } = props;
useEffect(() => {
- }, []);
+ form.resetFields();
+ if (curSprite) {
+ form.setFieldsValue({
+
+ // shelf
+ row: curSprite?.data?.row,
+ bay: curSprite?.data?.bay,
+ no: curSprite?.data?.no,
+ })
+ }
+ }, [props, form]);
const formValuesChange = (changeList) => {
if (curSprite && changeList && changeList.length > 0) {
@@ -27,11 +37,11 @@
const bay = form.getFieldValue('bay')
if (value && bay) {
form.setFieldsValue({
- shelfNo: Utils.pureNumStr(value) + '-' + Utils.pureNumStr(bay)
+ no: Utils.pureNumStr(value) + '-' + Utils.pureNumStr(bay)
});
} else {
form.setFieldsValue({
- shelfNo: ''
+ no: ''
});
}
break;
@@ -39,11 +49,11 @@
const row = form.getFieldValue('row')
if (value && row) {
form.setFieldsValue({
- shelfNo: Utils.pureNumStr(row) + '-' + Utils.pureNumStr(value)
+ no: Utils.pureNumStr(row) + '-' + Utils.pureNumStr(value)
});
} else {
form.setFieldsValue({
- shelfNo: ''
+ no: ''
});
}
break;
@@ -66,16 +76,18 @@
if (curSprite && curSprite?.data?.type) {
switch (curSprite.data.type) {
case Utils.SENSOR_TYPE.SHELF:
- curSprite.data.shelfNo = values.shelfNo;
+ curSprite.data.no = values.no; // *
curSprite.data.row = values.row;
curSprite.data.bay = values.bay;
break;
case Utils.SENSOR_TYPE.AGV:
+ curSprite.data.no = values.no; // *
break;
default:
break;
}
}
+ message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '鎿嶄綔鎴愬姛' }));
}
props.onSubmit({ ...values }, confirmSettings);
@@ -114,7 +126,7 @@
<span>{curSprite?.data?.type}</span>
</Form.Item>
<Form.Item
- label={intl.formatMessage({ id: 'map.settings.uuid', defaultMessage: '缂栧彿' })}
+ label={intl.formatMessage({ id: 'map.settings.uuid', defaultMessage: '鍦板浘鍙�' })}
>
<span>{curSprite?.data?.uuid}</span>
</Form.Item>
@@ -132,7 +144,7 @@
label={intl.formatMessage({ id: 'map.settings.shelf.row', defaultMessage: '鎺�' })}
rules={[
{
- required: true,
+ required: false,
},
]}
>
@@ -147,7 +159,7 @@
label={intl.formatMessage({ id: 'map.settings.shelf.bay', defaultMessage: '鍒�' })}
rules={[
{
- required: true,
+ required: false,
},
]}
>
@@ -157,25 +169,26 @@
}}
/>
</Form.Item>
- <Form.Item
- name='shelfNo'
- label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '璐ф灦鍙�' })}
- rules={[
- {
- required: true,
- },
- ]}
- >
- <Input
- style={{
- width: '50%',
- }}
- />
- </Form.Item>
</>
)}
<Form.Item
+ name='no'
+ label={intl.formatMessage({ id: 'map.settings.no', defaultMessage: '缂栧彿' })}
+ rules={[
+ {
+ required: false,
+ },
+ ]}
+ >
+ <Input
+ style={{
+ width: '50%',
+ }}
+ />
+ </Form.Item>
+
+ <Form.Item
wrapperCol={{
offset: 4,
span: 16,
--
Gitblit v1.9.1