From c7e6ef17c73feb1a3bf4bf0d6762d46f26fd4709 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 13 八月 2024 08:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/UnLoadGlass/Landingindication.vue | 37 ++++---------------------------------
1 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/UI-Project/src/views/UnLoadGlass/Landingindication.vue b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
index fcfa8e7..2dfb8f3 100644
--- a/UI-Project/src/views/UnLoadGlass/Landingindication.vue
+++ b/UI-Project/src/views/UnLoadGlass/Landingindication.vue
@@ -30,10 +30,8 @@
</div>
</div>
</template>
-
<script setup>
import { ref, watchEffect ,onMounted,onUnmounted} from 'vue';
-
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
let language = ref(localStorage.getItem('lang') || 'zh')
@@ -49,12 +47,9 @@
{ x: 140, y: 280, height: 60, width: 110, fillColor: '#6a6da9', item: { height: 20, width: 100, fillColor: 'yellow', content: 'NG1234561454' ,downGlassInfoList:""} }
]);
-
watchEffect(() => {
// 瑙﹀彂鏁版嵁鍙樺寲鏃堕噸鏂版覆鏌�
});
-
-
const calculateItemXPosition = (rack, item, index) => {
if (index === 0 ) {
return rack.x;
@@ -64,7 +59,6 @@
return rack.x + (rack.width - item.width) / 2;
}
};
-
const calculateItemYPosition = (rack, item, index) => {
if (index === 0 ) {
return rack.y + (rack.height - item.height) / 2;
@@ -74,41 +68,31 @@
return rack.y + rack.height - item.height;
}
};
-
-
const fetchFlowCardId = async () => {
try {
const response = await request.get('unLoadGlass/downWorkStation/getwo');
-
if (response.code === 200) {
console.log(response);
// 閬嶅巻鍝嶅簲鏁版嵁骞舵浛鎹acks鏁扮粍涓殑item灞炴��
response.data.forEach((itemData, index) => {
if (index < racks.value.length) {
const rack = racks.value[index];
- const newItem = {
+ rack.fillColor = itemData.item.fullCardColor === 'red' ? '#911005' : '#6a6da9';
+ const newItem = {
content: itemData.item.content,
fillColor: itemData.item.fillColor,
width: itemData.item.width === 0 ? "" : 10,
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(racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
}
});
-
-
-
-
-
} else {
ElMessage.error(response.msg);
}
@@ -121,27 +105,23 @@
//const socketUrl = `ws://${WebSocketHost}:88/api/unLoadGlass/api/talk/unloadglass2`;
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
-
// 鏇存柊 tableData 鐨勬暟鎹�
data.glassinfo[0].forEach((itemData, index) => {
if (index < racks.value.length) {
const rack = racks.value[index];
- const newItem = {
+ rack.fillColor = itemData.item.fullCardColor === 'red' ? '#911005' : '#6a6da9';
+ const newItem = {
content: itemData.item.content,
fillColor: itemData.item.fillColor,
width: itemData.item.width === 0 ? "" : 10,
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("鏄剧ず鍥�1",racks.value); // 鎵撳嵃鏇存柊鍚庣殑 racks 鍊�
}
});
@@ -168,9 +148,7 @@
<td>${info.height}</td>
</tr>`;
});
-
tableContent += '</table>';
-
Swal.fire({
// title: '鐜荤拑淇℃伅',
title: t('reportWork.glassinformation'),
@@ -180,8 +158,6 @@
}
});
};
-
-
const showRectInfo = (rack) => {
const content = rack.item.content;
console.log(rack.item.downGlassInfoList[0].flowCardId)
@@ -190,14 +166,9 @@
const downGlassInfoList = rack.item.downGlassInfoList;
console.log(downGlassInfoList)
showCustomAlert(downGlassInfoList);
-
}
-
};
-
-
</script>
-
<style scoped>
.glass-rack {
/* margin-left: 10px; */
--
Gitblit v1.8.0