From 25a60deec43281af10320d00fea76561361e7f9e Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 23 八月 2024 14:48:59 +0800
Subject: [PATCH] 被覆盖代码恢复
---
UI-Project/src/views/PurchaseReturn/purchaseReturn.vue | 206 ++++++++-------------------------------------------
1 files changed, 33 insertions(+), 173 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
index dd35c4e..d329c50 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseReturn.vue
@@ -85,60 +85,11 @@
};
const socketUrl = `ws://${WebSocketHost}:${host}/api/temperingGlass/api/talk/temperingGlass`;
const handleMessage = (data) => {
- // if (data.intoGlass2 && data.intoGlass2.length > 0) {
- // const newRects = data.intoGlass2[0].map(rect => {
- // const scaleFactor = 794.67/5087;
- // let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
- // let newX = rect.yCoordinate;
- // if (rect.width < rect.height) {
- // widtha = rect.height;
- // heighta = rect.width;
- // }else {
- // widtha = rect.width;
- // heighta = rect.height;
- // }
- // if (rect.angle === 0) {
- // adjustedWidth = widtha * scaleFactor;
- // adjustedHeight = heighta * 0.1;
- // // adjustedWidtha = widtha;
- // // adjustedHeighta = heighta;
- // newX = 5087 - (rect.yCoordinate + widtha);
- // } else {
- // adjustedWidth = heighta * scaleFactor;
- // adjustedHeight = widtha * 0.1;
- // // adjustedWidtha = widtha;
- // // adjustedHeighta = heighta;
- // newX = 5087 - (rect.yCoordinate + heighta);
- // }
- // return {
- // ...rect,
- // xcoordinate: newX * scaleFactor,
- // ycoordinate: rect.xCoordinate * 0.1,
- // width: adjustedWidth,
- // height: adjustedHeight,
- // widtha: rect.width,
- // heighta: rect.height,
- // }
- // });
- // // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- // adjustedRects2.value = adjustedRects2.value.map(oldRect => {
- // const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- // if (newRect) {
- // return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- // }
- // return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- // }).concat(newRects.filter(r => !adjustedRects2.value.some(o => o.glassId === r.glassId)));
- // }
- // else {
- // adjustedRects2.value = ''
- // }
if (data.intoGlass2 && data.intoGlass2.length > 0) {
// 鎻愬彇鏂扮殑鐭╁舰ID
const newGlassIds = new Set(data.intoGlass2[0].map(rect => rect.glassId));
-
// 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
const existingRects = adjustedRects2.value.filter(rect => newGlassIds.has(rect.glassId));
-
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.intoGlass2[0].map(rect => {
const scaleFactor = 794.67/5087;
@@ -174,7 +125,6 @@
heighta: rect.height,
}
});
-
// 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
adjustedRects2.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
@@ -187,64 +137,11 @@
else if (data.intoGlass2 == null) {
adjustedRects2.value = []
}
-
-
-
-
- // if (data.intoGlass && data.intoGlass.length > 0) {
- // const newRects = data.intoGlass[0].map(rect => {
- // const scaleFactor = 794.67/5087;
- // let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
- // let newX = rect.yCoordinate;
- // if (rect.width < rect.height) {
- // widtha = rect.height;
- // heighta = rect.width;
- // }else {
- // widtha = rect.width;
- // heighta = rect.height;
- // }
- // if (rect.angle === 0) {
- // adjustedWidth = widtha * scaleFactor;
- // adjustedHeight = heighta * 0.1;
- // // adjustedWidtha = widtha;
- // // adjustedHeighta = heighta;
- // newX = 5087 - (rect.yCoordinate + widtha);
- // } else {
- // adjustedWidth = heighta * scaleFactor;
- // adjustedHeight = widtha * 0.1;
- // // adjustedWidtha = widtha;
- // // adjustedHeighta = heighta;
- // newX = 5087 - (rect.yCoordinate + heighta);
- // }
- // return {
- // ...rect,
- // xcoordinate: newX * scaleFactor,
- // ycoordinate: rect.xCoordinate * 0.1,
- // width: adjustedWidth,
- // height: adjustedHeight,
- // widtha: rect.width,
- // heighta: rect.height,
- // }
- // });
- // // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- // adjustedRects1.value = adjustedRects1.value.map(oldRect => {
- // const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- // if (newRect) {
- // return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- // }
- // return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- // }).concat(newRects.filter(r => !adjustedRects1.value.some(o => o.glassId === r.glassId)));
- // }
- // else {
- // adjustedRects1.value = ''
- // }
if (data.intoGlass && data.intoGlass.length > 0) {
// 鎻愬彇鏂扮殑鐭╁舰ID
const newGlassIds = new Set(data.intoGlass[0].map(rect => rect.glassId));
-
// 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
const existingRects = adjustedRects1.value.filter(rect => newGlassIds.has(rect.glassId));
-
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.intoGlass[0].map(rect => {
const scaleFactor = 794.67/5087;
@@ -280,7 +177,6 @@
heighta: rect.height,
}
});
-
// 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
adjustedRects1.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
@@ -293,65 +189,11 @@
else if (data.overGlass == null) {
adjustedRects1.value = []
}
-
-
-
-
-
- // if (data.waitingGlass && data.waitingGlass.length > 0) {
- // const newRects = data.waitingGlass[0].map(rect => {
- // const scaleFactor = 1621.78/5190;
- // let adjustedWidth, adjustedHeight, adjustedWidtha, adjustedHeighta,widtha,heighta;;
- // let newX = rect.yCoordinate;
- // if (rect.width < rect.height) {
- // widtha = rect.height;
- // heighta = rect.width;
- // }else {
- // widtha = rect.width;
- // heighta = rect.height;
- // }
- // if (rect.angle === 0) {
- // adjustedWidth = widtha * scaleFactor;
- // adjustedHeight = heighta * 0.16;
- // // adjustedWidtha = widtha;
- // // adjustedHeighta = heighta;
- // newX = 5190 - (rect.yCoordinate + widtha);
- // } else {
- // adjustedWidth = heighta * scaleFactor;
- // adjustedHeight = widtha * 0.16;
- // // adjustedWidtha = widtha;
- // // adjustedHeighta = heighta;
- // newX = 5190 - (rect.yCoordinate + heighta);
- // }
- // return {
- // ...rect,
- // x: newX * scaleFactor,
- // y: rect.xCoordinate * 0.16,
- // width: adjustedWidth,
- // height: adjustedHeight,
- // widtha: rect.width,
- // heighta: rect.height,
- // }
- // });
- // // 鍚堝苟鏂版棫鐭╁舰锛屼繚鐣� isActive 鐘舵��
- // adjustedRectsa.value = adjustedRectsa.value.map(oldRect => {
- // const newRect = newRects.find(r => r.glassId === oldRect.glassId);
- // if (newRect) {
- // return { ...oldRect, ...newRect, isActive: oldRect.isActive };
- // }
- // return oldRect; // 濡傛灉鏃х煩褰㈠湪鏂版暟鎹腑涓嶅瓨鍦紝鍒欎繚鐣欏師鏍�
- // }).concat(newRects.filter(r => !adjustedRectsa.value.some(o => o.glassId === r.glassId)));
- // }
- // else {
- // adjustedRectsa.value = ''
- // }
if (data.waitingGlass && data.waitingGlass.length > 0) {
// 鎻愬彇鏂扮殑鐭╁舰ID
const newGlassIds = new Set(data.waitingGlass[0].map(rect => rect.glassId));
-
// 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
const existingRects = adjustedRectsa.value.filter(rect => newGlassIds.has(rect.glassId));
-
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.waitingGlass[0].map(rect => {
const scaleFactor = 1621.78/5190;
@@ -386,8 +228,7 @@
widtha: rect.width,
heighta: rect.height,
}
- });
-
+ });
// 鍚堝苟鏂版棫鐭╁舰锛屽苟淇濈暀 isActive 鐘舵��
adjustedRectsa.value = existingRects.map(oldRect => {
const newRect = newRects.find(r => r.glassId === oldRect.glassId);
@@ -403,10 +244,8 @@
if (data.outGlass && data.outGlass.length > 0) {
// 鎻愬彇鏂扮殑鐭╁舰ID
const newGlassIds = new Set(data.outGlass[0].map(rect => rect.glassId));
-
// 杩囨护鍑哄凡瀛樺湪鐨勭煩褰�
const existingRects = adjustedRectsb.value.filter(rect => newGlassIds.has(rect.glassId));
-
// 璁＄畻鏂扮殑鐭╁舰
const newRects = data.outGlass[0].map(rect => {
const scaleFactor = 1621.78/5190;
@@ -462,10 +301,31 @@
onMounted(() => {
initializeWebSocket(socketUrl, handleMessage);
});
-function updateRectColors() {
+function updateRectColorsa() {
adjustedRectsa.value.forEach(rect => {
if (rect.glassId === glassId) {
- rect.state = 5;
+ rect.state = 8;
+ }
+ });
+}
+function updateRectColorsb() {
+ adjustedRectsb.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
+ }
+ });
+}
+function updateRectColors1() {
+ adjustedRects1.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
+ }
+ });
+}
+function updateRectColors2() {
+ adjustedRects2.value.forEach(rect => {
+ if (rect.glassId === glassId) {
+ rect.state = 8;
}
});
}
@@ -477,7 +337,7 @@
return '#95d475';
case -1:
return '#CDAF95';
- case 5:
+ case 8:
return '#911005';
}
}
@@ -487,7 +347,7 @@
return '#eebe77';
case 4:
return '#CD6090';
- case 5:
+ case 8:
return '#911005';
}
}
@@ -564,7 +424,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
blind1.value = false;
- updateRectColors();
+ updateRectColors1();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -587,7 +447,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
blind2.value = false;
- updateRectColors();
+ updateRectColors2();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -610,7 +470,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
blinda.value = false;
- updateRectColors();
+ updateRectColorsa();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -633,7 +493,7 @@
if (response.code == 200) {
ElMessage.success(response.message);
blindb.value = false;
- updateRectColors();
+ updateRectColorsb();
} else {
// 璇锋眰澶辫触锛屾樉绀洪敊璇秷鎭�
ElMessage.error(response.message);
@@ -641,7 +501,7 @@
}
catch (error) {
// 澶勭悊閿欒
- console.error(error);
+ // console.error(error);
}
}
onBeforeUnmount(() => {
@@ -673,7 +533,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
@@ -701,7 +561,7 @@
left: `${rect.xcoordinate}px`,
width: `${rect.width}px`,
height: `${rect.height}px`,
- backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 5 ? '#911005' : 'lightblue' }"
+ backgroundColor: rect.isActive ? '#ADFF2F' : rect.state === 8 ? '#911005' : 'lightblue' }"
>
<div class="centered-text">
<div style="font-size: 15px;font-weight: bold;">{{ rect.glassId }}</div>
--
Gitblit v1.8.0