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 | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/Identify/identifwutwo.vue b/UI-Project/src/views/Identify/identifwutwo.vue
index e633e48..bd7ce7b 100644
--- a/UI-Project/src/views/Identify/identifwutwo.vue
+++ b/UI-Project/src/views/Identify/identifwutwo.vue
@@ -9,12 +9,13 @@
class="rect"
@click="showDialog(rect.glassId)"
:style="{ position: 'absolute',
- top: `${rect.yAxis}px`, left: `${rect.xAxis}px`, width: `${rect.edgWidth}px`, height: `${rect.edgHeight}px`,
+ top: `${rect.yAxisa}px`, left: `${rect.xAxisa}px`, width: `${rect.width}px`, height: `${rect.height}px`,
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>
@@ -58,10 +59,10 @@
if (existingRect) {
return {
...existingRect,
- xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
- yAxis: rect.yAxis * scaleFactory,
- edgWidth: rect.edgWidth * scaleFactor,
- edgHeight: rect.edgHeight * scaleFactory,
+ 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,
widtha: rect.edgWidth,
heighta: rect.edgHeight,
state: rect.state,
@@ -71,10 +72,10 @@
// 濡傛灉涓嶅瓨鍦紝鍒欐坊鍔犳柊鐭╁舰锛岄粯璁� isActive 涓� false
return {
...rect,
- xAxis: (6000 - (rect.xAxis + rect.edgWidth)) * scaleFactor,
- yAxis: rect.yAxis * scaleFactory,
- edgWidth: rect.edgWidth * scaleFactor,
- edgHeight: rect.edgHeight * scaleFactory,
+ 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,
widtha: rect.edgWidth,
heighta: rect.edgHeight,
state: rect.state,
@@ -188,7 +189,7 @@
justify-content: center;
align-items: center;
height: 100%; /* 纭繚div鍗犳嵁鏁翠釜鐭╁舰鐨勯珮搴� */
- font-size: small;
+ /* font-size: large; */
}
#line {
position: absolute;
--
Gitblit v1.8.0