From 6d9ca1c086859b6a6f0fd931c4b9f44c0d9e5969 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 14 十月 2024 14:28:56 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/constants.js | 6 ++++-- zy-acs-flow/src/map/http.js | 2 +- zy-acs-flow/src/map/tool.js | 1 + zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js index f576428..2256db6 100644 --- a/zy-acs-flow/src/map/constants.js +++ b/zy-acs-flow/src/map/constants.js @@ -9,17 +9,19 @@ export const DEVICE_TYPE = Object.freeze({ SHELF: "SHELF", STATION: 'STATION', - AGV: "AGV", CHARGE: 'CHARGE', DIRECTION: 'DIRECTION', + + AGV: "AGV", POINT: "POINT", }) export const DEVICE_Z_INDEX = Object.freeze({ SHELF: 1, STATION: 1, - AGV: 2, CHARGE: 1, DIRECTION: 1, + + AGV: 2, POINT: 2, }) diff --git a/zy-acs-flow/src/map/http.js b/zy-acs-flow/src/map/http.js index b6cf66b..fd8a205 100644 --- a/zy-acs-flow/src/map/http.js +++ b/zy-acs-flow/src/map/http.js @@ -76,7 +76,7 @@ mapContainer.children.forEach(child => { if (child.data?.uuid) { const { type, uuid, no, ...property } = child.data; - if (type !== DEVICE_TYPE.AGV) { + if (type !== DEVICE_TYPE.AGV && type !== DEVICE_TYPE.POINT) { sprites.push({ // graph positionX: child.position.x, diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js index 3abcf46..427a36b 100644 --- a/zy-acs-flow/src/map/tool.js +++ b/zy-acs-flow/src/map/tool.js @@ -74,6 +74,7 @@ // sprite.height = 63; sprite.zIndex = DEVICE_Z_INDEX.DIRECTION; break; + case DEVICE_TYPE.POINT: sprite = new PIXI.Sprite(PIXI.Texture.from(point, { resourceOptions: { scale: 1 } })); // sprite.width = 112; diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java index e872748..88cb6e8 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/common/constant/MapItemType.java @@ -5,8 +5,9 @@ SHELF, STATION, CHARGE, - AGV, DIRECTION, + + AGV, POINT, ; -- Gitblit v1.9.1