From 91e5bb3b8aef30ba85f809edbf903d9a596bc009 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 08 十二月 2023 08:15:09 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index f44947d..4ad7fb8 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -214,12 +214,16 @@
 							<!-- 鏂囨湰瀹瑰櫒 -->
 							<view class="text-content">
 								<!-- head -->
+								<!-- <view class="swiper-head">
+									<view style="flex: 1;">浣滀笟鏁伴噺锛歿{infoText.barcode}}</view>
+									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
+								</view> -->
 								<view class="swiper-head">
-									<view style="flex: 1;">绔欏彿锛歿{infoText.staNo}}</view>
+									<view style="flex: 2;">鎵樼洏鐮侊細{{infoText.barcode}}</view>
 									<view style="flex: 2;">鍟嗗搧缂栧彿</view>
 									<view style="flex: 2;">绠辩爜</view>
 									<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
-									<view style="flex: 2;">瑙勬牸</view>
+									<view style="flex: 5;">瑙勬牸</view>
 									<view style="flex: 1;">浣滀笟鏁伴噺</view>
 									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
 								</view>
@@ -233,11 +237,11 @@
 									display-multiple-items="15"
 									circular="true" :autoplay="true" :interval="3000" :duration="1000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i" :style="item.color">
-											<view style="flex: 1;">No:{{i+1}}</view>
+											<view style="flex: 2;word-break: break-all;">{{item.orderNo ? item.orderNo : '--'}}</view>
 											<view style="flex: 2;">{{item.matNo}}</view>
 											<view style="flex: 2;">{{item.containerCode}}</view>
 											<view style="flex: 2;">{{item.maknx}}</view>
-											<view style="flex: 2;">{{item.specs}}</view>
+											<view style="flex: 5;">{{item.specs}}</view>
 											<view style="flex: 1;">{{item.count}}</view>
 											<view style="flex: 1;">{{item.total}}</view>
 										</swiper-item>
@@ -445,10 +449,10 @@
 			setInterval(()=>{
 				this.getDate2()
 				this.getUrl()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
 				this.controller()
 			},1000)
 			
@@ -565,8 +569,8 @@
 							res.data[0].matDtos[k]['color'] = 'color: #df741c'
 						}
 					}
-					console.log(that.swiperList);
 					that.infoText.staNo = res.data[0].staNo
+					that.infoText.barcode = res.data[0].barcode
 					that.swiperList = res.data[0].matDtos
 					// that.infoText.matnr = res.data[0].matDtos[0].matnr
 					// that.infoText.specs = res.data[0].matDtos[0].specs

--
Gitblit v1.9.1