From 4797b16426fe7d784b46bf93ddc360e7278c72f1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 三月 2024 16:27:06 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/locales/en-US.ts | 2 ++
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 15 +++++++++++++--
zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx | 2 +-
zy-asrs-flow/src/pages/map/index.jsx | 4 ++--
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 3 ++-
5 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/locales/en-US.ts b/zy-asrs-flow/src/locales/en-US.ts
index 7e1627b..ad33668 100644
--- a/zy-asrs-flow/src/locales/en-US.ts
+++ b/zy-asrs-flow/src/locales/en-US.ts
@@ -19,6 +19,8 @@
'common.idcard':'ID Number',
'common.introduction':'Introduction',
'common.execute':'Execute',
+ 'common.success':'Success',
+ 'common.fail':'Fail',
'':'',
'':'',
'':'',
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 3bb598e..3d0cda3 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,
+ shelfNo: curSprite?.data?.shelfNo,
+ })
+ }
+ }, [props, form]);
const formValuesChange = (changeList) => {
if (curSprite && changeList && changeList.length > 0) {
@@ -76,6 +86,7 @@
break;
}
}
+ message.success(intl.formatMessage({ id: 'common.success', defaultMessage: '鎿嶄綔鎴愬姛' }));
}
props.onSubmit({ ...values }, confirmSettings);
diff --git a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
index 20cf43f..f81fb2c 100644
--- a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
@@ -70,7 +70,7 @@
copyGap: 0,
autoIncrement: false,
incrementValue: 'row',
- incrementMode: 'Ascending',
+ incrementMode: 'ascending',
}}
onFinish={handleFinish}
autoComplete="off"
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index 0231b6f..d77a77f 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapSettings.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 { Col, Form, Input, Row, message, 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'
@@ -104,6 +104,7 @@
switch (values.type) {
case Utils.SENSOR_TYPE.SHELF:
console.log(values);
+ console.log(curSprite);
break;
case Utils.SENSOR_TYPE.AGV:
break;
diff --git a/zy-asrs-flow/src/pages/map/index.jsx b/zy-asrs-flow/src/pages/map/index.jsx
index 1cecc5c..8e2a225 100644
--- a/zy-asrs-flow/src/pages/map/index.jsx
+++ b/zy-asrs-flow/src/pages/map/index.jsx
@@ -198,8 +198,8 @@
const settingsFinish = (values, fn) => {
fn();
- setSettingsVisible(false);
- setSpriteBySettings(null);
+ // setSettingsVisible(false);
+ // setSpriteBySettings(null);
}
return (
--
Gitblit v1.9.1