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/identify.vue | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/UI-Project/src/views/Identify/identify.vue b/UI-Project/src/views/Identify/identify.vue
index 8c60e30..461d622 100644
--- a/UI-Project/src/views/Identify/identify.vue
+++ b/UI-Project/src/views/Identify/identify.vue
@@ -29,7 +29,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>
@@ -158,7 +159,7 @@
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 * 1.1,
yaxisa: rect.yaxis * scaleFactory * 1.1,
--
Gitblit v1.8.0