From bd456a3fca8cb8e8c1a15fa21ca02117512f3c5c Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期一, 01 四月 2024 09:57:04 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/Albania_Mes
---
Albania_Mes-ui/src/views/home/index.vue | 24 +++++++++++-------------
1 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/Albania_Mes-ui/src/views/home/index.vue b/Albania_Mes-ui/src/views/home/index.vue
index adffe1f..1fa1da7 100644
--- a/Albania_Mes-ui/src/views/home/index.vue
+++ b/Albania_Mes-ui/src/views/home/index.vue
@@ -520,17 +520,16 @@
<!--鏄剧ず-->
<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:'
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px; background-color: '
- + (this.LastQueue.state>0?'#4CCCE4':(this.LastQueue.state==0?'#E4CA4C':'#E4CA4C'))+';text-align: center;'">
- {{ (this.LastQueue.glasswidth+this.LastQueue.glassheight)!=0?(this.LastQueue.glasswidth+"*"+this.LastQueue.glassheight):"" }}
- + (this.LastQueue.glasswidth / 25 * 7) + 'px;height:'
- + (this.LastQueue.glassheight / 25 * 7) + 'px;line-height: '
- + (this.LastQueue.glassheight / 25 * 7) + 'px;background-color: #93d2f3;text-align: center;'">
- {{ this.LastQueue.glasswidth }}*{{ this.LastQueue.glassheight }}
+ <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:'+ (this.LastQueue.glassheight / 25 * 7) + 'px;'+
+ 'line-height: '+ (this.LastQueue.glassheight / 25 * 7) + 'px;'+
+ 'background-color: '+ (this.LastQueue.state>0?'#4CCCE4':(this.LastQueue.state==0?'#E4CA4C':'#E4CA4C'))+
+ ';text-align: center;'">
+
+ {{ this.LastQueue.glasswidth!=null?(this.LastQueue.glasswidth+"*"+this.LastQueue.glassheight):"" }}
+
+
</div>
</div>
@@ -548,7 +547,7 @@
<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>
+ <span class="measuretitle">鍖归厤缁撴灉锛�</span> <span class="measureValue">{{ this.LastQueue.state>0?"鍖归厤鎴愬姛":(this.LastQueue.state==0?"澶氭暟鎹尮閰�":"鍖归厤澶辫触") }}</span>
<br>
</div>
</div>
@@ -1138,7 +1137,6 @@
//let tbdata=JSON.stringify(this.dataList);
let tbdata=this.dataList;
console.log(tbdata);
- let tbdata = this.dataList;
importData(tbdata).then(res => {
if (res.data.message == 200) {
this.$message.success(this.$t('Operation successful'));
--
Gitblit v1.8.0