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/drawer/shelf/view.jsx | 91 +++++++++++++++++++++++++++++++++++++--------
1 files changed, 74 insertions(+), 17 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
index 94cd383..d020f2a 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -1,4 +1,5 @@
import React, { useState, useRef, useEffect } from 'react';
+import * as THREE from 'three'
import { Spin, Descriptions, Button } from 'antd';
import { FormattedMessage, useIntl, useModel } from '@umijs/max';
import { LoadingOutlined } from '@ant-design/icons';
@@ -55,36 +56,92 @@
}
}
+const fetchShelfInfo = async (locNo) => {
+ const res = await Http.doGet('/api/map/shelf/info', { locNo: locNo });
+ if (res?.data && shelfThree) {
+ shelfThree.generateMesh((loader, addObject) => {
+ const promises = [];
+ const singleHeight = 123;
+ for (const item of res.data) {
+ const { lev } = Utils.parseLocNo(item.locNo);
+ promises.push(new Promise((resolve) => {
+ loader.load('model/04.fbx', (mesh) => {
+ mesh.position.set(0, singleHeight * (lev - 1), 0);
+ mesh.scale.set(5, 5, 5);
+ mesh.name = item.locNo;
+ mesh.traverse(function (child) {
+ if (child.isMesh) {
+ if (child.name === '璐ф灦') {
+ child.material.color.set(0x4680BF);
+ }
+ let palletVisible = true, cargoVisible = true;
+ switch (item.locSts) {
+ case 'D':
+ cargoVisible = false;
+ break;
+ case 'O':
+ palletVisible = false;
+ cargoVisible = false;
+ break;
+ default:
+ break;
+ }
+ if (child.name === '鎵樼洏') {
+ child.visible = palletVisible;
+ child.material.color.set(0xBEBEBE);
+ }
+ if (child.name === '涓嶈鍒�') {
+ child.visible = cargoVisible;
+ child.material.color.set(0xE8B67E);
+ }
+ child.name = item.locNo
+ child.castShadow = true;
+ child.receiveShadow = true;
+ }
+ });
+ addObject(mesh);
+ resolve();
+ })
+ }));
+ }
+
+ Promise.all(promises).then(() => {
+ shelfThree.setNewSelectedMesh(locNo);
+ shelfThree.rePerspective(singleHeight * res.data.length);
+ }).catch(error => {
+ console.error(error);
+ });
+ })
+ }
+}
+
const ShelfView = (props) => {
const intl = useIntl();
const { styles } = useStyles();
const refContainer = useRef();
+
+ const { data, curFloor, curLocNo, setCurLocNo } = props;
const [loading, setLoading] = React.useState(false);
- const [shelfList, setShelfList] = React.useState([]);
-
-
-
useEffect(() => {
- // locNo data
- const fetchShelfInfo = async (locNo) => {
- const res = await Http.doGet('/api/map/shelf/info', { locNo: locNo });
- if (res?.data) {
- console.log(res.data);
- }
- }
- fetchShelfInfo(props.locNo);
+ // init curLocNo
+ const originLocNo = data.no + '-' + curFloor;
+ setCurLocNo(originLocNo);
- // 3d
- setLoading(true);
endThree();
+ setLoading(true);
+
setTimeout(() => {
- setLoading(false);
startThree(refContainer.current);
+ shelfThree.handleClick = (objName) => {
+ setCurLocNo(objName);
+ };
+ fetchShelfInfo(originLocNo);
+ setLoading(false);
}, 300)
return endThree;
- }, [props.data.uuid]);
+ }, [data]);
return (
<>
@@ -109,7 +166,7 @@
{
key: '1',
label: intl.formatMessage({ id: 'map.loc.no', defaultMessage: '搴撲綅鍙�' }),
- children: props.locNo,
+ children: curLocNo,
},
{
key: '2',
--
Gitblit v1.9.1