From 5233bf4fb5aa89636cb932be8d3b3e819f78a94c Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期三, 13 三月 2024 15:04:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zy-asrs-flow/src/pages/map/components/device.jsx | 206 ++++++++++++++++++++++++++-------------------------
1 files changed, 104 insertions(+), 102 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/device.jsx b/zy-asrs-flow/src/pages/map/components/device.jsx
index 89fc6b9..72a6818 100644
--- a/zy-asrs-flow/src/pages/map/components/device.jsx
+++ b/zy-asrs-flow/src/pages/map/components/device.jsx
@@ -3,7 +3,7 @@
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import * as PIXI from 'pixi.js';
import { createStyles } from 'antd-style';
-import './index.css'
+import * as Utils from '../utils'
const useStyles = createStyles(({ token, css }) => {
let dark = token.colorBgBase === '#000';
@@ -28,12 +28,16 @@
transition: all 0.3s ease !important;
}
`,
- color: dark ? '#303030' : '#f0f0f0'
+ color: dark ? '#303030' : '#f0f0f0',
+ title: {
+ color: dark ? '#f0f0f0' : '#303030'
+ }
};
});
import agv from '/public/img/map/agv.svg'
-import { set } from 'lodash';
+import shelf from '/public/img/map/shelf.png'
+import { Util } from '@antv/g6';
const Device = (props) => {
const { styles } = useStyles();
@@ -44,7 +48,7 @@
const onDragStart = (e, type) => {
setDragging(true);
setDragSpriteType(type);
- const sprite = PIXI.Sprite.from(agv);
+ const sprite = PIXI.Sprite.from(e.target);
setDragSprite(sprite);
};
@@ -77,104 +81,102 @@
</Space>
}
>
- <Card className={styles.mapCard}>
- <Row className={styles.mapRow}>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- </Row>
- <Row className={styles.mapRow}>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- </Row>
- <Row className={styles.mapRow}>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- <Col className={styles.mapCol} span={8} >
- <Image
- src={agv}
- width='50px'
- preview={false}
- draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
- />
- <div>AGV</div>
- </Col>
- </Row>
- </Card>
+ <Row className={styles.mapRow}>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.AGV)}
+ />
+ <div className={styles.title}>AGV</div>
+ </Col>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={shelf}
+ width='35px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.SHELF)}
+ />
+ <div className={styles.title}>SHELF</div>
+ </Col>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, 'AGV')}
+ />
+ <div>AGV</div>
+ </Col>
+ </Row>
+ <Row className={styles.mapRow}>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, 'AGV')}
+ />
+ <div>AGV</div>
+ </Col>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, 'AGV')}
+ />
+ <div>AGV</div>
+ </Col>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, 'AGV')}
+ />
+ <div>AGV</div>
+ </Col>
+ </Row>
+ <Row className={styles.mapRow}>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, 'AGV')}
+ />
+ <div>AGV</div>
+ </Col>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, 'AGV')}
+ />
+ <div>AGV</div>
+ </Col>
+ <Col className={styles.mapCol} span={8} >
+ <Image
+ src={agv}
+ width='50px'
+ preview={false}
+ draggable="true"
+ onDragStart={(e) => onDragStart(e, 'AGV')}
+ />
+ <div>AGV</div>
+ </Col>
+ </Row>
</Drawer>
</>
)
--
Gitblit v1.9.1