From d5d0d1c7a84b996b9bbcebfaf2c2c95f1a5a3678 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 11 十月 2024 08:39:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 41 +++++++++++++++++++++++++++++++++--------
1 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index a9139da..1817bb6 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -42,11 +42,12 @@
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,23 +56,27 @@
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 () => {
try {
const response = await request.get('unLoadGlass/downWorkStation/getwo2');
+
if (response.code === 200) {
console.log(response);
// 閬嶅巻鍝嶅簲鏁版嵁骞舵浛鎹acks鏁扮粍涓殑item灞炴��
@@ -86,14 +91,22 @@
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 鍊�
}
});
+
+
+
+
+
} else {
ElMessage.error(response.msg);
}
@@ -101,11 +114,14 @@
console.error(error);
}
};
+
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,11 +133,14 @@
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 鍊�
}
});
@@ -148,7 +167,9 @@
<td>${info.height}</td>
</tr>`;
});
+
tableContent += '</table>';
+
Swal.fire({
title: t('reportWork.glassinformation'),
// title: '鐜荤拑淇℃伅',
@@ -158,6 +179,7 @@
}
});
};
+
const showRectInfo = (rack) => {
const content = rack.item.content;
console.log(rack.item.downGlassInfoList[0].flowCardId)
@@ -166,9 +188,12 @@
const downGlassInfoList = rack.item.downGlassInfoList;
console.log(downGlassInfoList)
showCustomAlert(downGlassInfoList);
+
}
+
};
</script>
+
<style scoped>
.glass-rack {
/* margin-left: 20px; */
--
Gitblit v1.8.0