From f454bde2b085b53b39429c598cd47294f9239834 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 15:51:00 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/utils.js | 49 ++++++++++++++++++++++++++++++-------------------
1 files changed, 30 insertions(+), 19 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index 3e975be..64df894 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -440,23 +440,28 @@
await Http.doPostPromise('api/map/list', { floor: curFloor }, (res) => {
const mapItemList = eval(res.data);
mapItemList.forEach(item => {
- const sprite = generateSprite(item.type);
- if (sprite) {
- initSprite(sprite, item.type);
- // data
- sprite.data.uuid = item.uuid;
- sprite.data.no = item.no;
+ if (!(
+ item.type === SENSOR_TYPE.SHUTTLE
+ || item.type === SENSOR_TYPE.AGV
+ )) {
+ const sprite = generateSprite(item.type);
+ if (sprite) {
+ initSprite(sprite, item.type);
+ // data
+ sprite.data.uuid = item.uuid;
+ sprite.data.no = item.no;
- // dynamical data
- Object.assign(sprite.data, item.property);
+ // dynamical data
+ Object.assign(sprite.data, item.property);
- showSheflType(sprite);
- // graph
- sprite.position.set(item.positionX, item.positionY);
- sprite.scale.set(item.scaleX, item.scaleY);
- sprite.rotation = rotationParseNum(item.rotation);
+ showSheflType(sprite);
+ // graph
+ sprite.position.set(item.positionX, item.positionY);
+ sprite.scale.set(item.scaleX, item.scaleY);
+ sprite.rotation = rotationParseNum(item.rotation);
- mapContainer.addChild(sprite);
+ mapContainer.addChild(sprite);
+ }
}
})
@@ -613,7 +618,7 @@
return row + '-' + bay + '-' + lev;
}
-export const updateMapStatusInRealTime = (data, curFloorGetter) => {
+export const updateMapStatusInRealTime = (data, curFloorGetter, setCurSPrite) => {
const curFloor = curFloorGetter();
if (isNullOfUndefined(curFloor)) { return; }
const mapVo = JSON.parse(data);
@@ -622,7 +627,7 @@
// path
drawPreTravelPath(shuttleVo.preTravelPath, shuttleVo.shuttleNo, curFloor);
// shuttle
- showShuttle(shuttleVo.shuttleNo, shuttleVo.curLocNo, curFloor);
+ showShuttle(shuttleVo.shuttleNo, shuttleVo.curLocNo, curFloor, setCurSPrite);
}
}
@@ -658,13 +663,19 @@
mapContainer.addChild(pathLine);
}
-export const showShuttle = (shuttleNo, curLocNo, curFloor) => {
+export const showShuttle = (shuttleNo, curLocNo, curFloor, setCurSPrite) => {
if (!curLocNo) { return }
const { row, bay, lev } = parseLocNo(curLocNo);
if (Number(lev) !== curFloor) { return }
- const shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleNo);
- if (!shuttle) { return }
+ let shuttle = querySprite(SENSOR_TYPE.SHUTTLE, shuttleNo);
+ if (!shuttle) {
+ shuttle = generateSprite(SENSOR_TYPE.SHUTTLE);
+ initSprite(shuttle, SENSOR_TYPE.SHUTTLE);
+ shuttle.data.no = shuttleNo;
+ mapContainer.addChild(shuttle);
+ viewFeature(shuttle, setCurSPrite);
+ }
const shelf = querySprite(SENSOR_TYPE.SHELF, row + '-' + bay);
if (!shelf) { return }
--
Gitblit v1.9.1