From f786be09c7ed79c8887ec413ac19e1caa08a16e7 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 14 三月 2024 16:27:16 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US/map.ts | 1
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 34 +++++++++--------
zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx | 49 +++++++++++++++++++++---
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 9 ++++
4 files changed, 70 insertions(+), 23 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts
index 47bc65e..00d8837 100644
--- a/zy-asrs-flow/src/locales/en-US/map.ts
+++ b/zy-asrs-flow/src/locales/en-US/map.ts
@@ -34,6 +34,7 @@
'map.settings.config.param': 'Config Parameters',
'': '',
'': '',
+ 'map.settings.no': 'No.',
'map.settings.shelf.no': 'Shelf No',
'map.settings.shelf.row': 'Row',
'map.settings.shelf.bay': 'Bay',
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 67b9487..f1e5220 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -81,6 +81,7 @@
curSprite.data.bay = values.bay;
break;
case Utils.SENSOR_TYPE.AGV:
+ curSprite.data.no = values.no; // *
break;
default:
break;
@@ -125,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>
@@ -168,25 +169,26 @@
}}
/>
</Form.Item>
- <Form.Item
- name='no'
- label={intl.formatMessage({ id: 'map.settings.shelf.no', defaultMessage: '璐ф灦鍙�' })}
- rules={[
- {
- required: false,
- },
- ]}
- >
- <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,
diff --git a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
index 64767ad..779cc64 100644
--- a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
@@ -54,6 +54,12 @@
}
const handleFinish = (values) => {
+ console.log({
+ ...values
+ , ...props.values
+ , autoIncrement: autoIncrement
+ , type: curSprite?.data?.type
+ });
props.submit({
...values
, ...props.values
@@ -88,7 +94,6 @@
initialValues={{
copyGap: 0,
autoIncrement: false,
- incrementValue: 'row',
incrementMode: 'ascending',
}}
onFinish={handleFinish}
@@ -153,15 +158,44 @@
<>
<Col span={24}>
<Form.Item
- name='id'
- label={intl.formatMessage({ id: 'map.settings.sub.copy.id', defaultMessage: '搴忓彿' })}
+ name='incrementValue'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '鑷闀垮��' })}
+ labelCol={{ span: 8 }}
+ initialValue='no'
+ >
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.no', defaultMessage: '缂栧彿' }),
+ value: 'no'
+ },
+ ]}
+ onChange={(value) => {
+ }}
+ />
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ name='incrementMode'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '澧為暱鏂瑰紡' })}
labelCol={{ span: 8 }}
>
- <InputNumber
- style={{
- width: '60%',
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.ascend', defaultMessage: '鍗囧簭' }),
+ value: 'ascending'
+ },
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.descend', defaultMessage: '闄嶅簭' }),
+ value: 'descending'
+ },
+ ]}
+ onChange={(value) => {
}}
- min={0}
/>
</Form.Item>
</Col>
@@ -175,6 +209,7 @@
name='incrementValue'
label={intl.formatMessage({ id: 'map.settings.sub.copy.shelf.increment-value', defaultMessage: '鑷闀垮��' })}
labelCol={{ span: 8 }}
+ initialValue='row'
>
<Segmented
block
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index 073a9c8..d71a3e1 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
@@ -122,6 +122,15 @@
}
break;
case Utils.SENSOR_TYPE.AGV:
+
+ if (values.incrementValue === 'no') {
+ console.log(curSprite.data.no);
+ if (values.incrementMode === 'descending') {
+ copiedSprite.data.no = Number(curSprite.data.no) - i - 1;
+ } else {
+ copiedSprite.data.no = Number(curSprite.data.no) + i + 1;
+ }
+ }
break;
default:
break;
--
Gitblit v1.9.1