From 6b8b4e4dc8a12695d51ce40f04297f2fcb2bf657 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期二, 09 四月 2024 14:24:31 +0800
Subject: [PATCH] 更新
---
Albania_Mes-ui/src/views/home/index.vue | 53 +++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 39 insertions(+), 14 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index bad3360..e0f07bd 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -306,6 +306,19 @@
.cells {
height: 100%;
}
+.measure_Content{
+ margin-bottom: 20px;
+ font-size: 30px;
+}
+.measuretitle{
+
+}
+.measureValue{
+
+}
+.measureUnit{
+ margin-left: 10px;
+}
</style>
<template>
<el-container>
@@ -520,8 +533,7 @@
<!--鏄剧ず-->
<div style="width:1000px;height: 720px;border: 2px solid #d1d1d1;float: left;">
<!--鐜荤拑鍥� #81b337-->
- <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glasswidth / 25 * 7))/2)+'px auto;width:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ <div :style="'top:10px;bottom: 10px;left: 10px;right: 10px;margin:'+((720-(this.LastQueue.glassheight / 25 * 7))/2)+'px auto;width:'
+ (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
+ (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
+ (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
@@ -534,18 +546,31 @@
<div style="width:20px;height: 720px;float: left;"></div>
<div style="width:500px;height: 620px;border: 2px solid #d1d1d1;float: left;padding: 50px 50px;">
<!--鐜荤拑鍥� #81b337-->
- <span class="measuretitle">闀匡細</span> <span class="measureValue">{{ this.LastQueue.glasswidth }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">瀹斤細</span> <span class="measureValue">{{ this.LastQueue.glassheight }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">鍘氾細</span> <span class="measureValue">{{ this.LastQueue.thickness }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">娴嬮噺闀匡細</span> <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">娴嬮噺瀹斤細</span> <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span> <span class="measureUnit">mm</span>
- <br>
- <span class="measuretitle">鍖归厤缁撴灉锛�</span> <span class="measureValue">{{ this.LastQueue.state>0?"鍖归厤鎴愬姛":(this.LastQueue.state==0?"鍖归厤澶辫触":"澶氭暟鎹尮閰�") }}</span>
- <br>
+ <div class="measure_Content">
+ <span class="measuretitle" style="font-size: 30px;">闀匡細</span>
+ <span class="measureValue">{{ this.LastQueue.glasswidth }}</span>
+ <span class="measureUnit"> mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">瀹斤細</span>
+ <span class="measureValue">{{ this.LastQueue.glassheight }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">娴嬮噺闀匡細</span>
+ <span class="measureValue">{{ this.LastQueue.glasswidthmm }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">娴嬮噺瀹斤細</span>
+ <span class="measureValue">{{ this.LastQueue.glassheightmm }}</span>
+ <span class="measureUnit">mm</span>
+ </div>
+ <div class="measure_Content">
+ <span class="measuretitle">鍖归厤缁撴灉锛�</span>
+ <span class="measureValue">{{ this.LastQueue.state>0?"鍖归厤鎴愬姛":(this.LastQueue.state==0?"鍖归厤澶辫触":"澶氭暟鎹尮閰�") }}</span>
+ </div>
+
</div>
</div>
</el-dialog>
--
Gitblit v1.8.0