#
luxiaotao1123
2024-04-09 c7a81b2a1d9d3e0e3809e5ecc11d2e64e51e3d2c
#
4个文件已修改
2个文件已添加
17 ■■■■ 已修改文件
zy-asrs-flow/public/img/map/conveyor.png 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/public/img/map/pure.png 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/public/img/map/shelf.png 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/locales/en-US/map.ts 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/components/device.jsx 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/src/pages/map/utils.js 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-flow/public/img/map/conveyor.png
zy-asrs-flow/public/img/map/pure.png
zy-asrs-flow/public/img/map/shelf.png

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',
    '': '',
    '': '',
    '': '',
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} >
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;