From fdf078d0adec8aaa4bdf39a61db38ed68184b50d Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期四, 11 四月 2024 09:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
Albania_Mes-ui/src/views/home/index.vue | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index cd87755..d6c887c 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -513,9 +513,7 @@
<span class="measuretitle">{{ $t('Height') }}锛�</span> <span class="measureValue">{{
this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
<br>
- <span class="measuretitle">{{ $t('Thickness') }}锛�</span> <span class="measureValue">{{
- this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
- <br>
+
<span class="measuretitle">{{ $t('Measure Width') }}锛�</span> <span class="measureValue">{{
this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
<br>
@@ -523,8 +521,8 @@
this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
<br>
<span class="measuretitle">{{ $t('Matching results') }}锛�</span> <span class="measureValue">{{
- this.LastQueue.state > 0 ? $t('Matching successful') : (this.LastQueue.state == 0 ? $t('Multiple data
- matching'):$t('Matching failed')) }}</span>
+ this.LastQueue.state > 0 ? $t('Matching successful') :
+ (this.LastQueue.state == 0 ? $t('Multiple data matching'):$t('Matching failed')) }}</span>
<br>
</div>
</div>
@@ -853,7 +851,6 @@
this.tableData1 = obj.OrderTask[0];
this.LastQueue = obj.LastQueue[0];
-
//鏄惁鍏佽鍑虹墖
this.isAllowQueue = obj.isAllowQueue[0];
--
Gitblit v1.8.0