From 28f9d6aadef16cafb888ff6bcc97f99bde971d8d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期五, 10 五月 2024 13:58:20 +0800 Subject: [PATCH] # --- src/components/agv.jsx | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/components/agv.jsx b/src/components/agv.jsx index 7f1b19a..9c74ec6 100644 --- a/src/components/agv.jsx +++ b/src/components/agv.jsx @@ -20,10 +20,10 @@ if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) { return -forkDis; } - if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) { + if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) { return forkDis; } - if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) { + if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) { return forkDis; } return forkDis; @@ -86,10 +86,22 @@ return finger1 && finger2 && finger3 && finger4; } -const forkLengthFn = (param) => { - if (param < 0) { +const forkLengthFn = (forkLen, loaderAngle) => { + if (loaderAngle > 360 - 10 || loaderAngle < 0 + 10) { + + } + if (loaderAngle > 180 - 10 && loaderAngle < 180 + 10) { + + } + if (loaderAngle > 90 - 10 && loaderAngle < 90 + 10) { + + } + if (loaderAngle > 270 - 10 && loaderAngle < 270 + 10) { + + } + if (forkLen < 0) { return -800 * 0.077; - } else if (param > 0) { + } else if (forkLen > 0) { return 800 * 0.077; } else { return 0; @@ -100,9 +112,6 @@ const { agvNo, position, trayList, hasBox, finger1, finger2, finger3, finger4 } = props; const theta = -props.theta; const height = props.height * 0.0655; - // const forkLength = props.forkLength * 0.077; - const forkLength = forkLengthFn(props.forkLength); - const loaderTheta = Number(props.loaderTheta?.toFixed(1)); const [groupPos, setGroupPos] = useState({ x: 0, y: 0, z: 0 }); const [groupTheta, setGroupTheta] = useState(0); @@ -162,7 +171,7 @@ } // loader theta - const loaderTargetTheta = Common.normalizeAngle(loaderTheta + 90); + const loaderTargetTheta = Common.normalizeAngle(Number(props.loaderTheta?.toFixed(1)) + 90); if (loaderAngle !== loaderTargetTheta && props.loaderTheta !== null) { new TWEEN.Tween({ value: loaderAngle }) .to({ value: loaderTargetTheta }, INTERVAL_TIME) @@ -176,6 +185,8 @@ } // fork lenght + // const forkLength = props.forkLength * 0.077; + const forkLength = forkLengthFn(props.forkLength, loaderTargetTheta); if (forkDis !== forkLength && props.forkLength !== null) { const targetForkDis = getCorrectForkDis(Common.positiveAngle(loaderTargetTheta), forkLength); new TWEEN.Tween({ value: forkDis }) -- Gitblit v1.9.1