From 55aa572d4750c29b1bb6b21dae800a2dbe71a9d4 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期五, 13 十二月 2024 14:26:04 +0800
Subject: [PATCH] 删除废弃代码
---
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 33 ++-------------------------------
1 files changed, 2 insertions(+), 31 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index 1817bb6..cd6109c 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -47,7 +47,6 @@
{ x: 280, y: 100, height: 100, width: 60, fillColor: '#6a6da9', item: { height: 90, width: 10, fillColor: 'yellow', content: 'NG12345678' } },
]);
-
watchEffect(() => {
// 瑙﹀彂鏁版嵁鍙樺寲鏃堕噸鏂版覆鏌�
});
@@ -61,7 +60,6 @@
return rack.x + rack.width - item.width;
}
};
-
const calculateItemYPosition = (rack, item, index) => {
if (index === 0) {
return rack.y + (rack.height - item.height) / 2;
@@ -71,12 +69,9 @@
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灞炴��
@@ -91,22 +86,14 @@
height: itemData.item.height === 0 ? "" : 90
};
console.log(itemData.item.fullCardColor);
-
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 {
ElMessage.error(response.msg);
}
@@ -114,14 +101,9 @@
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];
@@ -133,20 +115,16 @@
height: itemData.item.height === 0 ? "" : 90,
downGlassInfoList:itemData.item.downGlassInfoList
};
-
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(() => {
@@ -157,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>
@@ -167,9 +144,7 @@
<td>${info.height}</td>
</tr>`;
});
-
tableContent += '</table>';
-
Swal.fire({
title: t('reportWork.glassinformation'),
// title: '鐜荤拑淇℃伅',
@@ -179,7 +154,6 @@
}
});
};
-
const showRectInfo = (rack) => {
const content = rack.item.content;
console.log(rack.item.downGlassInfoList[0].flowCardId)
@@ -188,12 +162,9 @@
const downGlassInfoList = rack.item.downGlassInfoList;
console.log(downGlassInfoList)
showCustomAlert(downGlassInfoList);
-
}
-
};
</script>
-
<style scoped>
.glass-rack {
/* margin-left: 20px; */
--
Gitblit v1.8.0