From bd21c609d3e0f325f10f20bb1f59ae24a4b35dc2 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 10:29:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identifwutwo.vue | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwutwo.vue b/UI-Project/src/views/Identify/identifwutwo.vue
index d1b8dc6..bd7ce7b 100644
--- a/UI-Project/src/views/Identify/identifwutwo.vue
+++ b/UI-Project/src/views/Identify/identifwutwo.vue
@@ -14,7 +14,8 @@
}">
<div class="centered-text">
<div style="font-size: 20px;font-weight: bold;">{{ rect.glassId }}</div>
- <div style="font-size: 20px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 20px;font-weight: bold;">{{ rect.flowCardId }}</div>
+ <div style="font-size: 30px;font-weight: bold;">{{ rect.widtha }}*{{ rect.heighta }}</div>
</div>
</div>
</div>
@@ -58,7 +59,7 @@
if (existingRect) {
return {
...existingRect,
- xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor * 1.1,
+ xAxisa: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor * 1.1,
yAxisa: rect.yAxis * scaleFactory * 1.1,
width: rect.edgWidth * scaleFactor * 1.1,
height: rect.edgHeight * scaleFactory * 1.1,
@@ -71,7 +72,7 @@
// 濡傛灉涓嶅瓨鍦紝鍒欐坊鍔犳柊鐭╁舰锛岄粯璁� isActive 涓� false
return {
...rect,
- xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor * 1.1,
+ xAxisa: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor * 1.1,
yAxisa: rect.yAxis * scaleFactory * 1.1,
width: rect.edgWidth * scaleFactor * 1.1,
height: rect.edgHeight * scaleFactory * 1.1,
--
Gitblit v1.8.0