From 9d0acfb65c80c4948c305ca01338f894b87346a0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 08 四月 2024 09:44:37 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/components/device.jsx | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/device.jsx b/zy-asrs-flow/src/pages/map/components/device.jsx
index 6cca50e..0c1df85 100644
--- a/zy-asrs-flow/src/pages/map/components/device.jsx
+++ b/zy-asrs-flow/src/pages/map/components/device.jsx
@@ -35,9 +35,10 @@
};
});
+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 { Util } from '@antv/g6';
+import point from '/public/img/map/point.svg'
const Device = (props) => {
const intl = useIntl();
@@ -49,7 +50,7 @@
const onDragStart = (e, type) => {
setDragging(true);
setDragSpriteType(type);
- const sprite = PIXI.Sprite.from(e.target);
+ const sprite = Utils.generateSprite(type);
setDragSprite(sprite);
};
@@ -76,6 +77,9 @@
rootStyle={{ position: "absolute" }}
mask={false}
width={378}
+ style={{
+ opacity: .8
+ }}
extra={
<Space>
<Button onClick={() => props.onCancel()}><FormattedMessage id='common.cancel' defaultMessage='鍙栨秷' /></Button>
@@ -85,14 +89,14 @@
<Row className={styles.mapRow}>
<Col className={styles.mapCol} span={8} >
<Image
- src={agv}
+ src={shuttle}
width='50px'
preview={false}
draggable="true"
- onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.AGV)}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.SHUTTLE)}
/>
<div className={styles.title}>
- <FormattedMessage id='map.sensor.type.agv' defaultMessage='鏃犱汉灏忚溅' />
+ <FormattedMessage id='map.sensor.type.shuttle' defaultMessage='绌挎杞�' />
</div>
</Col>
<Col className={styles.mapCol} span={8} >
@@ -107,16 +111,18 @@
<FormattedMessage id='map.sensor.type.shelf' defaultMessage='璐ф灦' />
</div>
</Col>
- <Col className={styles.mapCol} span={8} >
+ <Col className={styles.mapCol} span={8}>
<Image
- src={agv}
+ src={point}
+ style={{
+ }}
width='50px'
preview={false}
draggable="true"
- onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.AGV)}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.POINT)}
/>
<div className={styles.title}>
- <FormattedMessage id='map.sensor.type.agv' defaultMessage='鏃犱汉灏忚溅' />
+ <FormattedMessage id='map.sensor.type.point' defaultMessage='瀹氫綅鐐�' />
</div>
</Col>
</Row>
--
Gitblit v1.9.1