From b9b44b51b201e2f5a9a1f3665c7fb76b5690f9af Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 23 十二月 2024 16:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 24 ++++++++++--------------
1 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index a9139da..cd6109c 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -42,9 +42,9 @@
const racks = ref([
{ x: 50, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG123456' } },
+ { x: 140, y: 280, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } },
+
{ x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678' } },
-
- { x: 140, y: 280, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } }
]);
watchEffect(() => {
@@ -55,18 +55,18 @@
if (index === 0) {
return rack.x;
} else if (index === 1) {
- return rack.x + rack.width - item.width;
- } else {
return rack.x + (rack.width - item.width) / 2;
+ } else {
+ return rack.x + rack.width - item.width;
}
};
const calculateItemYPosition = (rack, item, index) => {
if (index === 0) {
return rack.y + (rack.height - item.height) / 2;
} else if (index === 1) {
- return rack.y + (rack.height - item.height) / 2;
- } else {
return rack.y + rack.height - item.height;
+ } else {
+ return rack.y + (rack.height - item.height) / 2;
}
};
const fetchFlowCardId = async () => {
@@ -86,12 +86,12 @@
height: itemData.item.height === 0 ? "" : 90
};
console.log(itemData.item.fullCardColor);
- if (index === 2 && itemData.item.width > 0) {
+ if (index === 1 && itemData.item.width > 0) {
newItem.width = 100;
newItem.height = 20;
}
rack.item = newItem;
- console.log(racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
+ console.log(racks.value);
}
});
} else {
@@ -103,9 +103,7 @@
};
let socket = null;
const socketUrl = `ws://${WebSocketHost}:${host}/api/unLoadGlass/api/talk/unloadglass3`;
-// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
- // 鏇存柊 tableData 鐨勬暟鎹�
data.glassinfo2[0].forEach((itemData, index) => {
if (index < racks.value.length) {
const rack = racks.value[index];
@@ -117,17 +115,16 @@
height: itemData.item.height === 0 ? "" : 90,
downGlassInfoList:itemData.item.downGlassInfoList
};
- if (index === 2 && itemData.item.width > 0) {
+ if (index === 1 && itemData.item.width > 0) {
newItem.width = 100;
newItem.height = 20;
}
rack.item = newItem;
- //console.log("鏄剧ず鍥�2",racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
}
});
};
onMounted(() => {
- fetchFlowCardId(); // 鑾峰彇鏁版嵁
+ fetchFlowCardId();
socket = initializeWebSocket(socketUrl, handleMessage);
});
onUnmounted(() => {
@@ -138,7 +135,6 @@
const showCustomAlert = (downGlassInfoList) => {
let tableContent = '<table border="1" style="border-collapse: collapse; width: 100%;">';
tableContent += '<tr><th style="background-color: #f2f2f2;">鐜荤拑ID</th><th style="background-color: #f2f2f2;">鑶滅郴</th><th style="background-color: #f2f2f2;">鍘氬害</th><th style="background-color: #f2f2f2;">瀹藉害</th><th style="background-color: #f2f2f2;">楂樺害</th></tr>';
-
downGlassInfoList.forEach(info => {
tableContent += `<tr>
<td>${info.glassId}</td>
--
Gitblit v1.8.0