From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 9bd8aaa..6b45b0b 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -18,6 +18,7 @@
form.resetFields();
if (curSprite) {
form.setFieldsValue({
+ shelfType: Utils.SHELF_TYPE.STORE,
...curSprite.data
})
}
@@ -94,7 +95,8 @@
// execute where the form was finished
const confirmSettings = () => {
if (curSprite && curSprite?.data?.type) {
- curSprite.data = { ...curSprite.data, ...values }
+ curSprite.data = { ...curSprite.data, ...values };
+ Utils.showSheflType(curSprite);
}
message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '鎿嶄綔鎴愬姛' }));
}
@@ -135,12 +137,18 @@
<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>
{curSprite?.data?.type === Utils.SENSOR_TYPE.AGV && (
+ <>
+
+ </>
+ )}
+
+ {curSprite?.data?.type === Utils.SENSOR_TYPE.SHUTTLE && (
<>
</>
@@ -200,18 +208,17 @@
options={[
{
label: intl.formatMessage({ id: 'map.settings.shelf.store', defaultMessage: '搴撲綅' }),
- value: 0
+ value: Utils.SHELF_TYPE.STORE
},
{
label: intl.formatMessage({ id: 'map.settings.shelf.track', defaultMessage: '杞ㄩ亾' }),
- value: 3
+ value: Utils.SHELF_TYPE.TRACK
},
{
label: intl.formatMessage({ id: 'map.settings.shelf.diable', defaultMessage: '绂佺敤' }),
- value: 1
+ value: Utils.SHELF_TYPE.DISABLE
},
]}
- defaultValue={0}
/>
</Form.Item>
<Form.Item
--
Gitblit v1.9.1