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 | 109 ++++++++++++++++++++++++++++++++++--------------------
1 files changed, 69 insertions(+), 40 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/device.jsx b/zy-asrs-flow/src/pages/map/components/device.jsx
index d6392d5..0c1df85 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,14 +28,20 @@
transition: all 0.3s ease !important;
}
`,
- color: dark ? '#303030' : '#f0f0f0'
+ color: dark ? '#303030' : '#f0f0f0',
+ title: {
+ color: dark ? '#f0f0f0' : '#303030'
+ }
};
});
+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 point from '/public/img/map/point.svg'
const Device = (props) => {
+ const intl = useIntl();
const { styles } = useStyles();
const [dragging, setDragging] = useState(false);
const [dragSprite, setDragSprite] = useState(null);
@@ -44,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);
};
@@ -71,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>
@@ -80,13 +89,15 @@
<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, 'AGV')}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.SHUTTLE)}
/>
- <div>AGV</div>
+ <div className={styles.title}>
+ <FormattedMessage id='map.sensor.type.shuttle' defaultMessage='绌挎杞�' />
+ </div>
</Col>
<Col className={styles.mapCol} span={8} >
<Image
@@ -94,19 +105,25 @@
width='35px'
preview={false}
draggable="true"
- onDragStart={(e) => onDragStart(e, 'SHELF')}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.SHELF)}
/>
- <div>SHELF</div>
+ <div className={styles.title}>
+ <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, 'AGV')}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.POINT)}
/>
- <div>AGV</div>
+ <div className={styles.title}>
+ <FormattedMessage id='map.sensor.type.point' defaultMessage='瀹氫綅鐐�' />
+ </div>
</Col>
</Row>
<Row className={styles.mapRow}>
@@ -116,9 +133,23 @@
width='50px'
preview={false}
draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.AGV)}
/>
- <div>AGV</div>
+ <div className={styles.title}>
+ <FormattedMessage id='map.sensor.type.agv' defaultMessage='鏃犱汉灏忚溅' />
+ </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}>
+ <FormattedMessage id='map.sensor.type.shelf' defaultMessage='璐ф灦' />
+ </div>
</Col>
<Col className={styles.mapCol} span={8} >
<Image
@@ -126,19 +157,11 @@
width='50px'
preview={false}
draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.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>
+ <div className={styles.title}>
+ <FormattedMessage id='map.sensor.type.agv' defaultMessage='鏃犱汉灏忚溅' />
+ </div>
</Col>
</Row>
<Row className={styles.mapRow}>
@@ -148,9 +171,23 @@
width='50px'
preview={false}
draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.AGV)}
/>
- <div>AGV</div>
+ <div className={styles.title}>
+ <FormattedMessage id='map.sensor.type.agv' defaultMessage='鏃犱汉灏忚溅' />
+ </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}>
+ <FormattedMessage id='map.sensor.type.shelf' defaultMessage='璐ф灦' />
+ </div>
</Col>
<Col className={styles.mapCol} span={8} >
<Image
@@ -158,19 +195,11 @@
width='50px'
preview={false}
draggable="true"
- onDragStart={(e) => onDragStart(e, 'AGV')}
+ onDragStart={(e) => onDragStart(e, Utils.SENSOR_TYPE.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>
+ <div className={styles.title}>
+ <FormattedMessage id='map.sensor.type.agv' defaultMessage='鏃犱汉灏忚溅' />
+ </div>
</Col>
</Row>
</Drawer>
--
Gitblit v1.9.1