From b353ca2a8f8a30c48297cbe2502ca52b1a2d3285 Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 31 五月 2024 16:43:47 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/HangZhouMes
---
UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue | 55 +++++++++++++++++++++++++++++++++++--------------------
1 files changed, 35 insertions(+), 20 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
index dfcfc48..74bdcb8 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindicationtwo.vue
@@ -125,7 +125,8 @@
content: itemData.item.content,
fillColor: itemData.item.fillColor,
width: itemData.item.width === 0 ? "" : 10,
- height: itemData.item.height === 0 ? "" : 90
+ height: itemData.item.height === 0 ? "" : 90,
+ downGlassInfoList:itemData.item.downGlassInfoList
};
if (index === 2 && itemData.item.width > 0) {
@@ -146,30 +147,44 @@
fetchFlowCardId(); // 鑾峰彇鏁版嵁
initializeWebSocket(socketUrl, handleMessage);
});
+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>
+ <td>${info.Filmsid}</td>
+ <td>${info.thickness}</td>
+ <td>${info.width}</td>
+ <td>${info.height}</td>
+ </tr>`;
+ });
-// const showCustomAlert = (content) => {
-// var str="鏋跺彿 : 111\n" +
-// "闀� : 111\n" +
-// "瀹� : 111\n" +
-// "鍘� : 111\n"+
-// "鐜荤拑ID : 111\n"+
-// "鑶滅郴 : 111\n";
+ tableContent += '</table>';
-// Swal.fire({
-// title: '鐜荤拑淇℃伅',
-// html: '<pre>' + str + '</pre>',
-// customClass: {
-// popup: 'format-pre'
-// }
-// });
-// };
-
-const showRectInfo = (rectInfo) => {
- const content = rectInfo.item.content;
- showCustomAlert(content);
+ Swal.fire({
+ title: '鐜荤拑淇℃伅',
+ html: tableContent,
+ customClass: {
+ popup: 'format-pre'
+ }
+ });
};
+
+ const showRectInfo = (rack) => {
+ const content = rack.item.content;
+ console.log(rack.item.downGlassInfoList[0].flowCardId)
+ console.log(content)
+ if(content==rack.item.downGlassInfoList[0].flowCardId){
+ const downGlassInfoList = rack.item.downGlassInfoList;
+ console.log(downGlassInfoList)
+ showCustomAlert(downGlassInfoList);
+
+ }
+
+ };
</script>
<style scoped>
--
Gitblit v1.8.0