From df13b23a2fa3519e6f796ed946d87412a6a5f7ca Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 07 三月 2025 16:56:44 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/YiWuProject
---
UI-Project/src/views/Identify/identifwu.vue | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwu.vue b/UI-Project/src/views/Identify/identifwu.vue
index 0161515..e01fece 100644
--- a/UI-Project/src/views/Identify/identifwu.vue
+++ b/UI-Project/src/views/Identify/identifwu.vue
@@ -13,8 +13,9 @@
backgroundColor: rect.isActive ? '#ADFF2F' : getRectColor(rect.state)
}">
<div class="centered-text">
- <div>{{ rect.glassId }}</div>
- <div>{{ rect.widtha }}*{{ rect.heighta }}</div>
+ <div style="font-size: 20px;font-weight: bold;">{{ rect.glassId }}</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>
@@ -140,8 +141,8 @@
if (existingRect) {
return {
...existingRect,
- xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor * 1.1,
- yAxisa: rect.yAxis * scaleFactory * 1.1,
+ xAxisa: rect.xAxis * scaleFactor * 1.1,
+ yAxisa: (3300 - (rect.yAxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
width: rect.edgWidth * scaleFactor * 1.1,
height: rect.edgHeight * scaleFactory * 1.1,
widtha: rect.edgWidth,
@@ -153,8 +154,8 @@
// 濡傛灉涓嶅瓨鍦紝鍒欐坊鍔犳柊鐭╁舰锛岄粯璁� isActive 涓� false
return {
...rect,
- xAxisa: (6000 - (rect.xAxis + rect.width)) * scaleFactor * 1.1,
- yAxisa: rect.yAxis * scaleFactory * 1.1,
+ xAxisa: rect.xAxis * scaleFactor * 1.1,
+ yAxisa: (3300 - (rect.yAxis + rect.edgHeight + 300)) * scaleFactory * 1.1,
width: rect.edgWidth * scaleFactor * 1.1,
height: rect.edgHeight * scaleFactory * 1.1,
widtha: rect.edgWidth,
@@ -188,7 +189,7 @@
justify-content: center;
align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
- font-size: large;
+ /* font-size: large; */
}
#line {
position: absolute;
--
Gitblit v1.8.0