From 8df06dd41635d73b6d7623ec97b456f2dd9288e8 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 20 三月 2024 13:59:36 +0800
Subject: [PATCH] #
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapItem.java | 8 ++++++++
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 10 ++++++----
zy-asrs-flow/src/pages/map/utils.js | 11 ++++++++---
3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 01697ee..8a693a4 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -18,11 +18,13 @@
form.resetFields();
if (curSprite) {
form.setFieldsValue({
-
+ no: curSprite.data?.no,
// shelf
- row: curSprite?.data?.row,
- bay: curSprite?.data?.bay,
- no: curSprite?.data?.no,
+ row: curSprite.data?.row,
+ bay: curSprite.data?.bay,
+ // point
+ vertical: curSprite.data?.vertical,
+ horizontal: curSprite.data?.horizontal,
})
}
}, [props, form]);
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index d00398a..b089a48 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -348,6 +348,9 @@
sprite.data.uuid = item.uuid;
sprite.data.no = item.no;
+ // dynamical data
+ Object.assign(sprite.data, item.property);
+
// graph
sprite.position.set(item.positionX, item.positionY);
sprite.scale.set(item.scaleX, item.scaleY);
@@ -370,11 +373,13 @@
let mapItemList = [];
mapContainer?.children.forEach(child => {
if (child.data?.uuid) {
+ const { type, uuid, no, ...property } = child.data;
mapItemList.push({
// data
- type: child.data.type,
- uuid: child.data.uuid,
- no: child.data.no,
+ type: type,
+ uuid: uuid,
+ no: no,
+ property: property,
// graph
positionX: child.position.x,
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapItem.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapItem.java
index 009a761..20bd4ef 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapItem.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/map/entity/MapItem.java
@@ -2,11 +2,15 @@
import lombok.Data;
+import java.util.Map;
+
/**
* Created by vincent on 3/15/2024
*/
@Data
public class MapItem {
+
+ // data ------------------------------------------
private String type;
@@ -14,6 +18,10 @@
private String no;
+ // dynamical data
+ private Map<String, Object> property;
+
+ // graph -----------------------------------------
private Double positionX;
--
Gitblit v1.9.1