From 29f8c2e989cd6d9d3e93b1ac511dbd9e14b8b338 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 03 三月 2025 23:34:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
UI-Project/src/views/Identify/identify.vue | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 7521e9f..461d622 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -28,8 +28,9 @@
}"
>
<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>
@@ -158,14 +159,14 @@
totalPages.value = response.data.totalPatternSequence;
const scaleFactor = 1621.78/6000;
const scaleFactory = 750/3300;
- adjustedRects.value = rawRects.map(rect => ({
+ adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
- yaxisa: rect.yaxis * scaleFactory,
- width: rect.edgWidth * scaleFactor ,
+ xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
+ yaxisa: rect.yaxis * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
- height: rect.edgHeight * scaleFactory,
+ height: rect.edgHeight * scaleFactory * 1.1,
state: rect.state
}));
currentPage.value = 1;
@@ -183,12 +184,12 @@
const scaleFactory = 750/3300;
adjustedRects.value = rawRects.map(rect => ({
...rect,
- xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor,
- yaxisa: rect.yaxis * scaleFactory,
- width: rect.edgWidth * scaleFactor ,
+ xaxisa: (6000 -(rect.xaxis + rect.edgWidth)) * scaleFactor * 1.1,
+ yaxisa: rect.yaxis * scaleFactory * 1.1,
+ width: rect.edgWidth * scaleFactor * 1.1,
widtha: rect.edgWidth ,
heighta: rect.edgHeight ,
- height: rect.edgHeight * scaleFactory,
+ height: rect.edgHeight * scaleFactory * 1.1,
state: rect.state
}));
}
@@ -236,7 +237,7 @@
justify-content: center;
align-items: center;
height: 100%;
- font-size: small;
+ /* font-size: large; */
}
#rect {
position: relative; /* 纭繚绠ご鍙互鐩稿浜庣煩褰㈠畾浣� */
--
Gitblit v1.8.0