From 92e49fa8e8f32a3e78b1cc2420fa708aee612fb2 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 29 三月 2024 16:16:24 +0800
Subject: [PATCH] #
---
zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js | 17 ++++++-----------
zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx | 8 ++++----
zy-asrs-flow/src/pages/map/utils.js | 4 ++++
3 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
index 0ed9899..ffd67a0 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/shelfThree.js
@@ -97,7 +97,7 @@
controls.minPolarAngle = 0; // 鏈�灏忎刊浠拌搴︼紙鍚戜笅鐪嬶級
controls.maxPolarAngle = Math.PI / 2.1; // 鏈�澶т刊浠拌搴︼紙鍚戜笂鐪嬶級
controls.rotateSpeed = 0.6; // 瑙嗚绉诲姩閫熷害鍑忔參
- controls.autoRotate = true; // 鑷姩鏃嬭浆
+ controls.autoRotate = false; // 鑷姩鏃嬭浆
controls.target = new THREE.Vector3(0, 250, 0) // 灞忓箷涓績鐐� 骞虫浛 camera鐨刲ookAt
return controls;
@@ -125,7 +125,6 @@
let that = this;
const raycaster = new THREE.Raycaster();
const mouse = new THREE.Vector2();
-
this.dom.addEventListener("dblclick", (event) => {
})
this.dom.addEventListener("click", (event) => {
@@ -137,22 +136,18 @@
x = event.clientX;
y = event.clientY;
}
+ let rect = this.dom.getBoundingClientRect();
+ mouse.x = ((x - rect.left) / rect.width) * 2 - 1;
+ mouse.y = -((y - rect.top) / rect.height) * 2 + 1;
event.preventDefault();
- // mouse.x = (x / this.getFullWidth()) * 2 - 1;
- // mouse.y = -(y / this.getFullHeight()) * 2 + 1;
- mouse.x = (x / window.innerWidth) * 2 - 1;
- mouse.y = -(y / window.innerHeight) * 2 + 1;
raycaster.setFromCamera(mouse, that.camera);
let intersects = raycaster.intersectObjects(that.objects, true);
- console.log(intersects);
if (intersects.length === 0) {
return;
}
let objName = intersects[0].object.name;
- if (objName.startsWith("locNo")) {
- if (this.handleClick) {
- this.handleClick(objName, x, y);
- }
+ if (objName && this.handleClick) {
+ this.handleClick(objName, x, y);
}
}, false);
}
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 6b5e680..f7a4433 100644
--- a/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
+++ b/zy-asrs-flow/src/pages/map/drawer/shelf/view.jsx
@@ -80,6 +80,7 @@
const shelfMesh = new THREE.Mesh(new THREE.BoxGeometry(100, 40, 100), new THREE.MeshStandardMaterial({
color: '#006266',
}));
+ shelfMesh.name = item.locNo;
shelfMesh.position.set(0, 20 + 100 * (lev - 1), 0);
addObject(shelfMesh)
@@ -87,6 +88,7 @@
const palletMesh = new THREE.Mesh(new THREE.BoxGeometry(100, 60, 100), new THREE.MeshStandardMaterial({
color: '#2c2c54',
}));
+ palletMesh.name = item.locNo;
palletMesh.position.set(0, 70 + 100 * (lev - 1), 0);
addObject(palletMesh)
}
@@ -96,11 +98,9 @@
setTimeout(() => {
startThree(refContainer.current);
-
- shelfThree.handleClick = (str) => {
- console.log(str);
+ shelfThree.handleClick = (locNo) => {
+ setCurLocNo(locNo);
}
-
fetchShelfInfo(props.locNo);
setLoading(false);
}, 300)
diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index b85af4e..8701f9b 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -578,4 +578,8 @@
bay: locParseArr?.[1],
lev: locParseArr?.[2],
}
+}
+
+export const generateLocNo = (row, bay, lev) => {
+ return row + '-' + bay + '-' + lev;
}
\ No newline at end of file
--
Gitblit v1.9.1