From 09261811fd480a3528ba254ed5d30a064f29f501 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 10 十月 2024 09:21:11 +0800 Subject: [PATCH] # --- zy-acs-flow/src/map/constants.js | 2 ++ zy-acs-flow/src/i18n/en.js | 1 + zy-acs-flow/public/map/station.svg | 13 +++++++++++++ zy-acs-flow/src/map/tool.js | 11 +++++++++-- zy-acs-flow/src/i18n/zh.js | 1 + zy-acs-flow/src/map/Device.jsx | 2 ++ 6 files changed, 28 insertions(+), 2 deletions(-) diff --git a/zy-acs-flow/public/map/station.svg b/zy-acs-flow/public/map/station.svg new file mode 100644 index 0000000..9ec9ba9 --- /dev/null +++ b/zy-acs-flow/public/map/station.svg @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> +<svg id="_鍥惧眰_2" data-name="鍥惧眰 2" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 70.25 25.48"> + <defs> + <style> + .cls-1 { + fill: #e0e3e2; + } + </style> + </defs> + <g id="_鍥惧眰_1-2" data-name="鍥惧眰 1"> + <rect class="cls-1" width="70.25" height="25.48"/> + </g> +</svg> \ No newline at end of file diff --git a/zy-acs-flow/src/i18n/en.js b/zy-acs-flow/src/i18n/en.js index 62cf589..667522c 100644 --- a/zy-acs-flow/src/i18n/en.js +++ b/zy-acs-flow/src/i18n/en.js @@ -624,6 +624,7 @@ title: 'Icons', shelf: 'SHELF', charge: 'CHARGE', + station: 'STATION', direction: 'DIRECTION', }, }, diff --git a/zy-acs-flow/src/i18n/zh.js b/zy-acs-flow/src/i18n/zh.js index 1eb23d2..dc0095a 100644 --- a/zy-acs-flow/src/i18n/zh.js +++ b/zy-acs-flow/src/i18n/zh.js @@ -623,6 +623,7 @@ title: '鍥炬爣搴�', shelf: '璐ф灦', charge: '鍏呯數妗�', + station: '杈撻�佺嚎', direction: '鏂瑰悜', }, }, diff --git a/zy-acs-flow/src/map/Device.jsx b/zy-acs-flow/src/map/Device.jsx index cdece93..d4f634f 100644 --- a/zy-acs-flow/src/map/Device.jsx +++ b/zy-acs-flow/src/map/Device.jsx @@ -8,11 +8,13 @@ import shelf from '/map/shelf.svg'; import charge from '/map/charge.svg'; +import station from '/map/station.svg'; import direction from '/map/direction.svg'; const items = [ { src: shelf, label: 'page.map.devices.shelf', type: 'SHELF', scale: 1 }, { src: charge, label: 'page.map.devices.charge', type: 'CHARGE', scale: .7 }, + { src: station, label: 'page.map.devices.station', type: 'STATION', scale: 1 }, { src: direction, label: 'page.map.devices.direction', type: 'DIRECTION', scale: 1 }, ]; diff --git a/zy-acs-flow/src/map/constants.js b/zy-acs-flow/src/map/constants.js index b7b90ae..9d41518 100644 --- a/zy-acs-flow/src/map/constants.js +++ b/zy-acs-flow/src/map/constants.js @@ -4,6 +4,7 @@ SHELF: "SHELF", AGV: "AGV", CHARGE: 'CHARGE', + STATION: 'STATION', DIRECTION: 'DIRECTION', POINT: "POINT", }) @@ -12,6 +13,7 @@ SHELF: 1, AGV: 1, CHARGE: 1, + STATION: 1, DIRECTION: 1, POINT: 1 }) diff --git a/zy-acs-flow/src/map/tool.js b/zy-acs-flow/src/map/tool.js index 321c14f..4d3a804 100644 --- a/zy-acs-flow/src/map/tool.js +++ b/zy-acs-flow/src/map/tool.js @@ -7,6 +7,7 @@ import shelf from '/map/shelf.svg'; import charge from '/map/charge.svg'; +import station from '/map/station.svg'; import direction from '/map/direction.svg'; let app, mapContainer; @@ -50,10 +51,16 @@ // sprite.height = 60; sprite.zIndex = DEVICE_Z_INDEX.CHARGE; break; + case DEVICE_TYPE.STATION: + sprite = new PIXI.Sprite(PIXI.Texture.from(station, { resourceOptions: { scale: 1 } })); + // sprite.width = 112; + // sprite.height = 63; + sprite.zIndex = DEVICE_Z_INDEX.STATION; + break; case DEVICE_TYPE.DIRECTION: sprite = new PIXI.Sprite(PIXI.Texture.from(direction, { resourceOptions: { scale: 1 } })); - sprite.width = 112; - sprite.height = 63; + // sprite.width = 112; + // sprite.height = 63; sprite.zIndex = DEVICE_Z_INDEX.DIRECTION; break; default: -- Gitblit v1.9.1