From 1fd26e6df86242fb9e9dd8f851c86000aa6695a3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 09 四月 2024 15:45:26 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/conveyor/index.jsx | 60 ++++++++++++++++++++
zy-asrs-flow/src/pages/map/drawer/index.jsx | 10 +++
zy-asrs-flow/src/pages/map/components/configSettings.jsx | 6 ++
zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx | 48 ++++++++++++++++
zy-asrs-flow/src/pages/map/components/mapSettings.jsx | 9 +++
zy-asrs-flow/src/pages/map/utils.js | 9 +--
6 files changed, 136 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/components/configSettings.jsx b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
index 02a1727..ddbfd55 100644
--- a/zy-asrs-flow/src/pages/map/components/configSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/configSettings.jsx
@@ -298,6 +298,12 @@
</>
)}
+ {curSprite?.data?.type === Utils.SENSOR_TYPE.CONVEYOR && (
+ <>
+
+ </>
+ )}
+
{curSprite?.data?.type === Utils.SENSOR_TYPE.POINT && (
<>
<Form.Item
diff --git a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
index 61e2dd2..4704d39 100644
--- a/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapCopySettings.jsx
@@ -251,6 +251,54 @@
</>
)}
+ {autoIncrement && curSprite?.data?.type === Utils.SENSOR_TYPE.CONVEYOR && (
+ <>
+ <Col span={24}>
+ <Form.Item
+ name='incrementValue'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment-value', defaultMessage: '鑷闀垮��' })}
+ labelCol={{ span: 8 }}
+ initialValue='no'
+ >
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.no', defaultMessage: '缂栧彿' }),
+ value: 'no'
+ },
+ ]}
+ onChange={(value) => {
+ }}
+ />
+ </Form.Item>
+ </Col>
+ <Col span={24}>
+ <Form.Item
+ name='incrementMode'
+ label={intl.formatMessage({ id: 'map.settings.sub.copy.increment.mode', defaultMessage: '澧為暱鏂瑰紡' })}
+ labelCol={{ span: 8 }}
+ >
+ <Segmented
+ block
+ options={[
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.ascend', defaultMessage: '鍗囧簭' }),
+ value: 'ascending'
+ },
+ {
+ label: intl.formatMessage({ id: 'map.settings.sub.copy.descend', defaultMessage: '闄嶅簭' }),
+ value: 'descending'
+ },
+ ]}
+ onChange={(value) => {
+ }}
+ />
+ </Form.Item>
+ </Col>
+ </>
+ )}
+
{autoIncrement && curSprite?.data?.type === Utils.SENSOR_TYPE.SHELF && (
<>
<Col span={24}>
diff --git a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
index 47d17a2..261e041 100644
--- a/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
+++ b/zy-asrs-flow/src/pages/map/components/mapSettings.jsx
@@ -154,6 +154,15 @@
copiedSprite.data.no = Utils.pureNumStr(copiedSprite.data.vertical) + '-' + Utils.pureNumStr(copiedSprite.data.horizontal);
}
break;
+ case Utils.SENSOR_TYPE.CONVEYOR:
+ if (values.incrementValue === 'no') {
+ if (values.incrementMode === 'descending') {
+ copiedSprite.data.no = Number(curSprite.data.no) - i - 1;
+ } else {
+ copiedSprite.data.no = Number(curSprite.data.no) + i + 1;
+ }
+ }
+ break;
case Utils.SENSOR_TYPE.SHUTTLE:
if (values.incrementValue === 'no') {
if (values.incrementMode === 'descending') {
diff --git a/zy-asrs-flow/src/pages/map/drawer/conveyor/index.jsx b/zy-asrs-flow/src/pages/map/drawer/conveyor/index.jsx
new file mode 100644
index 0000000..4fa72cc
--- /dev/null
+++ b/zy-asrs-flow/src/pages/map/drawer/conveyor/index.jsx
@@ -0,0 +1,60 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { Card, Form, Button } from 'antd';
+import { FormattedMessage, useIntl, useModel } from '@umijs/max';
+import { createStyles } from 'antd-style';
+import * as Utils from '../../utils'
+import Http from '@/utils/http';
+import ShowJson from '../showJson';
+
+const useStyles = createStyles(({ token, css }) => {
+
+})
+
+const ConveyorDrawer = (props) => {
+ const intl = useIntl();
+ const { styles } = useStyles();
+ const [activeTabKey, setActiveTabKey] = useState('json');
+
+ const contentList = {
+ json: (
+ <ShowJson
+ data={props.curSprite.data}
+ />
+ ),
+ };
+
+ return (
+ <>
+ <Card
+ className='drawer-card'
+ hoverable
+ bordered={false}
+ type='inner'
+ tabList={[
+ {
+ key: 'json',
+ tab: intl.formatMessage({ id: 'map.drawer.json', defaultMessage: 'JSON' }),
+ },
+ ]}
+ activeTabKey={activeTabKey}
+ onTabChange={(key) => {
+ setActiveTabKey(key)
+ }}
+ tabProps={{
+ centered: true,
+ size: 'large',
+ type: "card",
+ style: {
+ }
+ }}
+ style={{
+ height: '100%'
+ }}
+ >
+ {contentList[activeTabKey]}
+ </Card>
+ </>
+ )
+}
+
+export default ConveyorDrawer;
\ No newline at end of file
diff --git a/zy-asrs-flow/src/pages/map/drawer/index.jsx b/zy-asrs-flow/src/pages/map/drawer/index.jsx
index 17ac267..2bc812b 100644
--- a/zy-asrs-flow/src/pages/map/drawer/index.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/index.jsx
@@ -4,6 +4,7 @@
import { createStyles } from 'antd-style';
import * as Utils from '../utils'
import ShelfDrawer from './shelf';
+import ConveyorDrawer from './conveyor';
import AgvDrawer from './agv';
import PointDrawer from './point'
import ShuttleDrawer from './shuttle'
@@ -57,6 +58,15 @@
/>
</>
)}
+ {props.curSprite?.data?.type === Utils.SENSOR_TYPE.CONVEYOR && (
+ <>
+ <ConveyorDrawer
+ curSprite={curSprite}
+ curFloor={curFloor}
+ setDrawerTitle={setDrawerTitle}
+ />
+ </>
+ )}
{props.curSprite?.data?.type === Utils.SENSOR_TYPE.SHUTTLE && (
<>
<ShuttleDrawer
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index b518d46..4578c9a 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -346,14 +346,11 @@
}
export const copySprite = (sprite) => {
- // const copiedSprite = new PIXI.Sprite(sprite.texture);
const copiedSprite = generateSprite(sprite.data.type)
initSprite(copiedSprite);
- setTimeout(() => {
- copiedSprite.position.set(sprite.position.x, sprite.position.y);
- copiedSprite.scale.set(sprite.scale.x, sprite.scale.y);
- copiedSprite.rotation = sprite.rotation;
- }, 50);
+ copiedSprite.position.set(sprite.position.x, sprite.position.y);
+ copiedSprite.scale.set(sprite.scale.x, sprite.scale.y);
+ copiedSprite.rotation = sprite.rotation;
copiedSprite.data = deepCopy(sprite.data);
copiedSprite.data.uuid = generateID();
if (copiedSprite.data.type === SENSOR_TYPE.SHELF) {
--
Gitblit v1.9.1