From d62a5f34ef60949ef6bef74fd9c48c20b4e65d83 Mon Sep 17 00:00:00 2001 From: wangfei <3597712270@qq.com> Date: 星期五, 09 八月 2024 13:19:37 +0800 Subject: [PATCH] 钢化模块旋转更改,下片台 --- UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue index a9139da..12bb518 100644 --- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue +++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue @@ -47,6 +47,7 @@ { x: 140, y: 280, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' } } ]); + watchEffect(() => { // 瑙﹀彂鏁版嵁鍙樺寲鏃堕噸鏂版覆鏌� }); @@ -60,6 +61,7 @@ return rack.x + (rack.width - item.width) / 2; } }; + const calculateItemYPosition = (rack, item, index) => { if (index === 0) { return rack.y + (rack.height - item.height) / 2; @@ -69,9 +71,12 @@ return rack.y + rack.height - item.height; } }; + + 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) { 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) { 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