From b6480bb8991e83a2efd5e4835ccc8ed0e87c067a Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期一, 22 七月 2024 14:14:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/PurchaseReturn/purchaseStorage.vue | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
index 5c0133f..ee0d270 100644
--- a/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
+++ b/UI-Project/src/views/PurchaseReturn/purchaseStorage.vue
@@ -29,16 +29,17 @@
// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
const handleMessage = (data) => {
// 鏇存柊 tableData 鐨勬暟鎹�
- adjustedRects.value = data.overGlass[0].map(rect => ({
+ if(data.overGlass!=null){
+ adjustedRects.value = data.overGlass[0].map(rect => ({
...rect, // 澶嶅埗鍘熷瀵硅薄鐨勫叾浠栧睘鎬�
- xcoordinate: rect.xCoordinate * 0.5, // 灏唜鍊奸櫎浠�3
- ycoordinate: rect.ycoordinate * 0.5,
+ xcoordinate: rect.xCoordinate * 0.4, // 灏唜鍊奸櫎浠�3
+ ycoordinate: rect.yCoordinate * 0.4,
width: rect.width * 0.4,
height: rect.height * 0.4,
widtha: rect.width,
heighta: rect.height,
}));
- console.log(adjustedRects.value);
+ }
};
onMounted(() => {
// fetchFlowCardId();
@@ -56,6 +57,8 @@
<div style="margin-top: 10px;">
<div>
<el-card style="margin-left: 10px;margin-top: 10px;margin-right: 10px;" v-loading="loading">
+ <div v-if="adjustedRects.length > 0">
+ <div style="text-align: center;">娴佺▼鍗�: {{ adjustedRects[0].flowCardId }}</div>
<el-scrollbar height="600px">
<div style="position: relative;width: 1400px;">
<div
@@ -66,12 +69,13 @@
width: `${rect.width}px`, height: `${rect.height}px`,
backgroundColor: rect.state === 4 ? '#d1edc4' : '#f8e3c5' }">
<div class="centered-text">
- <div >{{ rect.flowcardId }}</div>
- <div style="text-align: center;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div >{{ rect.glassId }}</div>
+ <div style="margin-top: 50px;margin-left: -85px;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
</el-scrollbar>
+ </div>
</el-card>
</div>
</div>
@@ -94,9 +98,9 @@
}
.centered-text {
/* 璁剧疆鏂囧瓧灞呬腑鏍峰紡 */
- display: flex;
+ display: flex;
justify-content: center;
- align-items: center;
+ align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
}
</style>
\ No newline at end of file
--
Gitblit v1.8.0