From 3c788ea8129322b5779b8070fd019f814465ba51 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期二, 26 三月 2024 16:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/Four-Way-Rack' into Four-Way-Rack
---
/dev/null | 3 -
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 2
zy-asrs-flow/src/pages/map/components/device.jsx | 24 -----------
zy-asrs-flow/src/pages/map/utils.js | 50 +++++++++++++++---------
4 files changed, 33 insertions(+), 46 deletions(-)
diff --git a/zy-asrs-flow/public/img/map/shuttle2.svg b/zy-asrs-flow/public/img/map/shuttle2.svg
deleted file mode 100644
index 5923b6f..0000000
--- a/zy-asrs-flow/public/img/map/shuttle2.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="29.98" height="25.253" viewBox="0 0 482 406">
- <image id="鍥惧眰_1" data-name="鍥惧眰 1" width="482" height="406" xlink:href="data:img/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAZCAYAAAAmNZ4aAAAFM0lEQVRIiZWWW6hUVRjH/+uy98yePXP2zLl7y7IHU8kiStKkJAyjqCSKol6EIB96EcFefOhFooiyCB/qISh66tESpOwmpHgJJFMxEU2TTh4858ycPfu61vpi7dGjx3P1GxYbZl1+67us/1oMIFi7e8VpbHz2W4TNGhgYPIji2+md3jiACPr9SOPtoKTfrTK+UykBMILgBi0DZIaDs5vT01yi4UeQt694A9YmAmg2LBBlVF3cw7bu2CiwZ7/ceuJ8Y5fnstiCQQzdPSOQbg5j+JS5U8ATG2AGxAg0C1wZkq7jyKV9Drxy7PYt+EfWKnbzQNr2i/mGpkJxPVozmvWeM158p/txxsgYUBgbGM1I5SXKlUA2HiBvVwFuJifrRshpFo8ne89m9XxiHDcg5UCNB4DMEMVoaCNcBpiCR+BK87ynSiPzAs8XbojB5QQ/aGLc6N3dNb2t4iqtDVO2X3CIMDYyycTH8wbPC267tECcK7/clW15Z1sLiwaVGA+5sN21qsHQVYGdHzRevSPwXHAuNeJ2HWPDVb6kcUX09ymUfDunM96tAD3dhLJL/I7Bs8IJ4ELDcRTIAGGboewAUcyuzwPaEYMxc1T17HCbUxDnoKrHwPmcx36STXjMOIPKVXfSTgbAWD6PuSM6oaVhU4m/LhJyBQjBADVP8LIVZ5HEPnp7/34d8L4eWDaINM5gNBVezWaBrSXGsOcQIY8SeA7BpPMEr9/4PYgyq3K7Vm14AtVuD9KVkI6E67ngkoPM9DG0+5JlF6PXIvzyxQFkUQQBzKrvE2CdceSJqJaDWiPor+Hy6ctYsmoxvC4PzatNXPuvWazE+PTu202mUQoGTQQXijg4nxsttRbQxlCeKjJaY8X6+6BzhfZYG4e+OQyuDfygAnOb17aqueCo+CVEYQrSuYwitlwCv3NOc2Z6ynGyYS1Xy8iVwfhYhLd2PId7Vy7GeDOaNI5zjizLi//dkoPPPvrOryE9Lkz7y1bCtpDhsdWMmcCTjpP1IugP0BppY9/nB9DTW8OCpX0wRBCOmNRKngOtDc6cvIQkzlANfDz6whp4df54pqJFjHg76DaQnkK9RxfN8RSCbl2k4uZxYgxlv4SzR87hx69+xbr1y/HSG08W4WyNtYv+Wy1LVeHpps2P4MqFYWS5gnAlYISQXpKkmkfHjpcw0EuFaFjzPcLwKEOS8GQCbIskbMY4uvc4nn9xDdY+tbooqridToHiuoDYCCllOvlmDG5J2rF1r5pdS3L/tfc+bewSUoegziXBGMlMiWpFlD6Z5HESJRhY2MBDa5fj4A8n8cDDy9A/WEeazqwn9kK2UVG5xtCFYajclCRjb3KhjkqP7Qajir24OhDikjNWdpNhWTxT0NFeWzBpppCkGTa/sg6joyGSJJvW41tNliSSMNHH9h4/UqtXFHfd7UTEXDdPyDCjtWSdi4KRkPkizuiYhOEg5MQ5o3LNg5AC9a4qAvviaMxYlBPm2+UazJ7zkHO2iRMLrYjbvaaJh2rQBEOCKKx1nlOWbwQkqQqUCVe3RtpdF/+4hLHhFo78dgbnB+tFtc5lpbKDsBXbJnWmH4vDZIgM9TT6W+rUiWeOnTu1Mt7w9D70Dg5BKadQNQuX2sQfNvqC7VXfx8j5f1HrKuPgz38WR2WuEBc5vp6igYV1ny3u3m/QERaiGu665+xhh/J1lDpg9pk7kWxAcjd/+cE196NvYdCKo5RZ2O0qNR/jHUktitUtSRofyytR6+iq+qKfakrXxptxBZxZUdVgAP4Haoh4MJBNMtAAAAAASUVORK5CYII="/>
-</svg>
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 14417e9..206a29f 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -18,6 +18,7 @@
form.resetFields();
if (curSprite) {
form.setFieldsValue({
+ shelfType: Utils.SHELF_TYPE.STORE,
...curSprite.data
})
}
@@ -212,7 +213,6 @@
value: Utils.SHELF_TYPE.DISABLE
},
]}
- defaultValue={0}
/>
</Form.Item>
<Form.Item
diff --git a/zy-asrs-flow/src/pages/map/components/device.jsx b/zy-asrs-flow/src/pages/map/components/device.jsx
index e1ac85f..0c1df85 100644
--- a/zy-asrs-flow/src/pages/map/components/device.jsx
+++ b/zy-asrs-flow/src/pages/map/components/device.jsx
@@ -50,29 +50,7 @@
const onDragStart = (e, type) => {
setDragging(true);
setDragSpriteType(type);
-
- let image = new window.Image();
- switch (type) {
- case Utils.SENSOR_TYPE.SHUTTLE:
- image.src = shuttle;
- break;
- case Utils.SENSOR_TYPE.AGV:
- image.src = agv;
- break;
- case Utils.SENSOR_TYPE.SHELF:
- image.src = shuttle;
- break;
- case Utils.SENSOR_TYPE.POINT:
- image.src = point;
- break;
- default:
- break;
- }
- image.width = 300;
- image.height = 300;
- const texture = PIXI.Texture.from(image);
- const sprite = new PIXI.Sprite(texture);
- // const sprite = PIXI.Sprite.from(e.target);
+ const sprite = Utils.generateSprite(type);
setDragSprite(sprite);
};
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index c1770b7..229b0b6 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -3,6 +3,7 @@
import Http from '@/utils/http';
import { message } from 'antd';
import { API_TIMEOUT } from '@/config/setting'
+
import agv from '/public/img/map/agv.svg'
import shelf from '/public/img/map/shelf.png'
import point from '/public/img/map/point.svg'
@@ -60,6 +61,35 @@
mapX: (x - rect.left) / mapContainer.scale.x - mapContainer.x / mapContainer.scale.x,
mapY: (y - rect.top) / mapContainer.scale.y - mapContainer.y / mapContainer.scale.y
}
+}
+
+export const generateSprite = (sensorType) => {
+ let sprite;
+ switch (sensorType) {
+ case SENSOR_TYPE.SHUTTLE:
+ sprite = new PIXI.Sprite(PIXI.Texture.from(shuttle, { resourceOptions: { scale: 5 } }));
+ sprite.width = 50;
+ sprite.height = 50;
+ break;
+ case SENSOR_TYPE.AGV:
+ sprite = new PIXI.Sprite(PIXI.Texture.from(agv, { resourceOptions: { scale: 5 } }));
+ sprite.width = 50;
+ sprite.height = 50;
+ break;
+ case SENSOR_TYPE.SHELF:
+ sprite = new PIXI.Sprite(PIXI.Texture.from(shelf, { resourceOptions: { scale: 5 } }));
+ sprite.width = 60;
+ sprite.height = 60;
+ break;
+ case SENSOR_TYPE.POINT:
+ sprite = new PIXI.Sprite(PIXI.Texture.from(point, { resourceOptions: { scale: 5 } }));
+ sprite.width = 10;
+ sprite.height = 10;
+ break;
+ default:
+ break;
+ }
+ return sprite;
}
export const initSprite = (sprite, type) => {
@@ -359,25 +389,7 @@
await Http.doPostPromise('api/map/list', { floor: curFloor }, (res) => {
const mapItemList = eval(res.data);
mapItemList.forEach(item => {
- let sprite;
- switch (item.type) {
- case SENSOR_TYPE.SHUTTLE:
- sprite = PIXI.Sprite.from({ source: shuttle, scaleMode: PIXI.SCALE_MODES.HIGH });
- break;
- case SENSOR_TYPE.SHELF:
- sprite = PIXI.Sprite.from(shelf);
- break;
- case SENSOR_TYPE.AGV:
- sprite = new PIXI.Sprite(PIXI.Texture.from(agv, { resourceOptions: { scale: 5 } }));
- sprite.width = 50;
- sprite.height = 50;
- break;
- case SENSOR_TYPE.POINT:
- sprite = PIXI.Sprite.from(point);
- break;
- default:
- break;
- }
+ const sprite = generateSprite(item.type);
if (sprite) {
initSprite(sprite, item.type);
// data
--
Gitblit v1.9.1