From bf5d7a4cf94a0ce396e65666d229f685d7790ccc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 14 十月 2024 14:10:12 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/constants.js | 4 ++--
zy-acs-flow/src/map/http.js | 2 +-
zy-acs-flow/public/map/point.svg | 0
zy-acs-flow/src/map/tool.js | 7 +++++++
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 1 +
5 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/zy-acs-flow/public/map/code.svg b/zy-acs-flow/public/map/point.svg
similarity index 100%
rename from zy-acs-flow/public/map/code.svg
rename to zy-acs-flow/public/map/point.svg
diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js
index 8e70c04..f576428 100644
--- a/zy-acs-flow/src/map/constants.js
+++ b/zy-acs-flow/src/map/constants.js
@@ -18,8 +18,8 @@
export const DEVICE_Z_INDEX = Object.freeze({
SHELF: 1,
STATION: 1,
- AGV: 1,
+ AGV: 2,
CHARGE: 1,
DIRECTION: 1,
- POINT: 1
+ POINT: 2,
})
diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js
index a9f8d4a..324ae77 100644
--- a/zy-acs-flow/src/map/http.js
+++ b/zy-acs-flow/src/map/http.js
@@ -24,7 +24,7 @@
}).then((res) => {
const { code, msg, data: { common, point } } = res.data;
if (code === 200) {
- const mapItemList = eval(common);
+ const mapItemList = [...eval(common), ...eval(point)];
mapItemList.forEach(item => {
if (item.type !== DEVICE_TYPE.AGV) {
const sprite = Tool.generateSprite(item.type);
diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js
index 5a8e868..09434c5 100644
--- a/zy-acs-flow/src/map/tool.js
+++ b/zy-acs-flow/src/map/tool.js
@@ -9,6 +9,7 @@
import charge from '/map/charge.svg';
import station from '/map/station.svg';
import direction from '/map/direction.svg';
+import point from '/map/point.svg';
let app, mapContainer, themeMode;
let selectedSprite, effectTick, effectHalfCircle, effectRectangle;
@@ -73,6 +74,12 @@
// sprite.height = 63;
sprite.zIndex = DEVICE_Z_INDEX.DIRECTION;
break;
+ case DEVICE_TYPE.POINT:
+ sprite = new PIXI.Sprite(PIXI.Texture.from(point, { resourceOptions: { scale: .7 } }));
+ // sprite.width = 112;
+ // sprite.height = 63;
+ sprite.zIndex = DEVICE_Z_INDEX.POINT;
+ break
default:
break;
}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 7512db7..3f47a97 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -69,6 +69,7 @@
MapItem mapItem = new MapItem();
mapItem.setType(MapItemType.POINT.toString());
mapItem.setNo(code.getData());
+ mapItem.setUuid(code.getUuid());
mapItem.setPositionX(code.getX());
mapItem.setPositionY(code.getY());
mapCodeItems.add(mapItem);
--
Gitblit v1.9.1