From 7684b4f7ae7d3cedac2bb67800db76b93e46e407 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期一, 22 七月 2024 14:14:34 +0800
Subject: [PATCH] 钢化模块根据angle的值判断是否旋转
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 34 ++++++++---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 121 +++++++++++++++++++++++++++++-----------
2 files changed, 111 insertions(+), 44 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index ee84543..d22626b 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -22,54 +22,107 @@
const handleMessage = (data) => {
// 杩涚倝涓�
if(data.intoGlass!=null){
- adjustedRects.value = data.intoGlass[0].map(rect => ({
+ adjustedRects.value = data.intoGlass[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ if (rect.angle === 90) {
+ adjustedWidth = rect.height * 0.3;
+ adjustedHeight = rect.width * 0.3;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ } else {
+ adjustedWidth = rect.width * 0.3;
+ adjustedHeight = rect.height * 0.3;
+ adjustedWidtha = rect.width;
+ adjustedHeighta = rect.height;
+ }
+ return {
...rect,
xcoordinate: rect.xCoordinate * 0.3,
ycoordinate: rect.yCoordinate * 0.3,
- width: rect.width * 0.2,
- height: rect.height * 0.2,
- widtha: rect.width,
- heighta: rect.height,
- }));
- }
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+ });
+ }
if(data.intoGlass2!=null){
- adjustedRects2.value = data.intoGlass2[0].map(rect => ({
+ adjustedRects2.value = data.intoGlass2[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ if (rect.angle === 90) {
+ adjustedWidth = rect.height * 0.3;
+ adjustedHeight = rect.width * 0.3;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ } else {
+ adjustedWidth = rect.width * 0.3;
+ adjustedHeight = rect.height * 0.3;
+ adjustedWidtha = rect.width;
+ adjustedHeighta = rect.height;
+ }
+ return {
...rect,
xcoordinate: rect.xCoordinate * 0.3,
ycoordinate: rect.yCoordinate * 0.3,
- width: rect.width * 0.2,
- height: rect.height * 0.2,
- widtha: rect.width,
- heighta: rect.height,
- }));
- }
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+ });
+ }
// 杩涚倝鍓�
if(data.waitingGlass!=null){
- adjustedRectsa.value = data.waitingGlass[0].map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- x: rect.xCoordinate * 0.4,
- y: rect.yCoordinate * 0.4,
- width: rect.width * 0.4,
- height: rect.height * 0.4,
- widtha: rect.width,
- heighta: rect.height,
- state: rect.state,
- }));
- }
+ adjustedRectsa.value = data.waitingGlass[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ if (rect.angle === 90) {
+ adjustedWidth = rect.height * 0.4;
+ adjustedHeight = rect.width * 0.4;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ } else {
+ adjustedWidth = rect.width * 0.4;
+ adjustedHeight = rect.height * 0.4;
+ adjustedWidtha = rect.width;
+ adjustedHeighta = rect.height;
+ }
+ return {
+ ...rect,
+ x: rect.xCoordinate * 0.4,
+ y: rect.yCoordinate * 0.4,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+});
+ }
// 宸插嚭鐐�
if(data.outGlass!=null){
- adjustedRectsb.value = data.outGlass[0].map(rect => ({
+ adjustedRectsb.value = data.outGlass[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ if (rect.angle === 90) {
+ adjustedWidth = rect.height * 0.4;
+ adjustedHeight = rect.width * 0.4;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ } else {
+ adjustedWidth = rect.width * 0.4;
+ adjustedHeight = rect.height * 0.4;
+ adjustedWidtha = rect.width;
+ adjustedHeighta = rect.height;
+ }
+ return {
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
x: rect.xCoordinate * 0.4,
y: rect.yCoordinate * 0.4,
- width: rect.width * 0.4,
- height: rect.height * 0.4,
- widtha: rect.width,
- heighta: rect.height,
- state: rect.state
- }));
- console.log(data.outGlass[0]);
- }
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+});
+ }
};
onMounted(() => {
initializeWebSocket(socketUrl, handleMessage);
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index ee0d270..c152ac3 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -30,16 +30,30 @@
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
if(data.overGlass!=null){
- adjustedRects.value = data.overGlass[0].map(rect => ({
- ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- xcoordinate: rect.xCoordinate * 0.4, // 灏唜鍊奸櫎浠�3
- ycoordinate: rect.yCoordinate * 0.4,
- width: rect.width * 0.4,
- height: rect.height * 0.4,
- widtha: rect.width,
- heighta: rect.height,
- }));
- }
+ adjustedRects.value = data.overGlass[0].map(rect => {
+ let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta;
+ if (rect.angle === 90) {
+ adjustedWidth = rect.height * 0.3;
+ adjustedHeight = rect.width * 0.3;
+ adjustedWidtha = rect.height;
+ adjustedHeighta = rect.width;
+ } else {
+ adjustedWidth = rect.width * 0.3;
+ adjustedHeight = rect.height * 0.3;
+ adjustedWidtha = rect.width;
+ adjustedHeighta = rect.height;
+ }
+ return {
+ ...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
+ xcoordinate: rect.xCoordinate * 0.3,
+ ycoordinate: rect.yCoordinate * 0.3,
+ width: adjustedWidth,
+ height: adjustedHeight,
+ widtha: adjustedWidtha,
+ heighta: adjustedHeighta,
+ };
+});
+ }
};
onMounted(() => {
// fetchFlowCardId();
--
Gitblit v1.8.0