From c7a81b2a1d9d3e0e3809e5ecc11d2e64e51e3d2c Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 09 四月 2024 15:24:11 +0800 Subject: [PATCH] # --- zy-asrs-flow/public/img/map/pure.png | 0 zy-asrs-flow/public/img/map/shelf.png | 0 zy-asrs-flow/public/img/map/conveyor.png | 0 zy-asrs-flow/src/locales/en-US/map.ts | 1 + zy-asrs-flow/src/pages/map/components/device.jsx | 7 ++++--- zy-asrs-flow/src/pages/map/utils.js | 9 +++++++++ 6 files changed, 14 insertions(+), 3 deletions(-) diff --git a/zy-asrs-flow/public/img/map/conveyor.png b/zy-asrs-flow/public/img/map/conveyor.png new file mode 100644 index 0000000..fc5f988 --- /dev/null +++ b/zy-asrs-flow/public/img/map/conveyor.png Binary files differ diff --git a/zy-asrs-flow/public/img/map/pure.png b/zy-asrs-flow/public/img/map/pure.png new file mode 100644 index 0000000..1019f98 --- /dev/null +++ b/zy-asrs-flow/public/img/map/pure.png Binary files differ diff --git a/zy-asrs-flow/public/img/map/shelf.png b/zy-asrs-flow/public/img/map/shelf.png index 1019f98..528ed89 100644 --- a/zy-asrs-flow/public/img/map/shelf.png +++ b/zy-asrs-flow/public/img/map/shelf.png Binary files differ diff --git a/zy-asrs-flow/src/locales/en-US/map.ts b/zy-asrs-flow/src/locales/en-US/map.ts index f09995a..46ac1b3 100644 --- a/zy-asrs-flow/src/locales/en-US/map.ts +++ b/zy-asrs-flow/src/locales/en-US/map.ts @@ -26,6 +26,7 @@ 'map.sensor.type.shelf': 'Shelf', 'map.sensor.type.agv': 'Agv', 'map.sensor.type.point': 'Point', + 'map.sensor.type.conveyor': 'Conveyor', '': '', '': '', '': '', diff --git a/zy-asrs-flow/src/pages/map/components/device.jsx b/zy-asrs-flow/src/pages/map/components/device.jsx index 0c1df85..53b09da 100644 --- a/zy-asrs-flow/src/pages/map/components/device.jsx +++ b/zy-asrs-flow/src/pages/map/components/device.jsx @@ -38,6 +38,7 @@ import shuttle from '/public/img/map/shuttle.svg' import agv from '/public/img/map/agv.svg' import shelf from '/public/img/map/shelf.png' +import conveyor from '/public/img/map/conveyor.png' import point from '/public/img/map/point.svg' const Device = (props) => { @@ -141,14 +142,14 @@ </Col> <Col className={styles.mapCol} span={8} > <Image - src={shelf} + src={conveyor} width='35px' preview={false} draggable="true" - onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.SHELF)} + onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.CONVEYOR)} /> <div className={styles.title}> - <FormattedMessage id='map.sensor.type.shelf' defaultMessage='璐ф灦' /> + <FormattedMessage id='map.sensor.type.conveyor' defaultMessage='杈撻�佺嚎' /> </div> </Col> <Col className={styles.mapCol} span={8} > diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js index dbc434c..b518d46 100644 --- a/zy-asrs-flow/src/pages/map/utils.js +++ b/zy-asrs-flow/src/pages/map/utils.js @@ -6,6 +6,7 @@ import agv from '/public/img/map/agv.svg' import shelf from '/public/img/map/shelf.png' +import conveyor from '/public/img/map/conveyor.png' import point from '/public/img/map/point.svg' import shuttle from '/public/img/map/shuttle.svg' @@ -36,6 +37,7 @@ export const SENSOR_TYPE = Object.freeze({ SHELF: "SHELF", + CONVEYOR: "CONVEYOR", SHUTTLE: "SHUTTLE", POINT: "POINT", AGV: "AGV", @@ -43,6 +45,7 @@ export const SENSOR_ZINDEX = Object.freeze({ SHELF: 1, + CONVEYOR: 1, POINT: 1, TRAVEL_PATH: 80, SHUTTLE: 100, @@ -94,6 +97,12 @@ sprite.height = 60; sprite.zIndex = SENSOR_ZINDEX.SHELF; break; + case SENSOR_TYPE.CONVEYOR: + sprite = new PIXI.Sprite(PIXI.Texture.from(conveyor, { resourceOptions: { scale: 5 } })); + sprite.width = 112; + sprite.height = 63; + sprite.zIndex = SENSOR_ZINDEX.CONVEYOR; + break; case SENSOR_TYPE.POINT: sprite = new PIXI.Sprite(PIXI.Texture.from(point, { resourceOptions: { scale: 5 } })); sprite.width = 10; -- Gitblit v1.9.1