From 19fd735d3e3c74e7e7dd2d273d47479513033077 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 21 十二月 2023 15:55:24 +0800
Subject: [PATCH] #

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

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 9379e94..f6918fc 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -218,9 +218,12 @@
 									<view style="width: 10vw;">鐩爣绔欙細{{infoText.staNo}}</view>
 									<view style="flex: 1;">鍟嗗搧缂栧彿</view>
 									<view style="flex: 1;">鍟嗗搧鍚嶇О</view>
+									<view style="flex: 1;">瑙勬牸</view>
+									<!-- <view style="flex: 1;">鎵瑰彿</view> -->
 									<view style="width: 10vw;">鏁伴噺</view>
-									<view style="flex: 1;">绠辩爜</view>
+									<!-- <view style="flex: 1;">绠辩爜</view> -->
 									<view style="width: 10vw;">搴撳瓨鏁伴噺</view>
+									<view style="width: 10vw;">鐜板瓨鏁伴噺</view>
 								</view>
 								<!-- body -->
 								<view class="swiper-body">
@@ -235,10 +238,11 @@
 											<view style="width: 10vw;">No:{{i+1}}</view>
 											<view style="flex: 1;">{{item.matNo}}</view>
 											<view style="flex: 1;">{{item.maknx}}</view>
-											<!-- <view style="width: 20%;">{{item.specs}}</view> -->
+											<view style="flex:1">{{item.specs}}</view>
 											<view style="width: 10vw;">{{item.count}}</view>
-											<view style="flex: 1;">{{item.zpallet}}</view>
+											<!-- <view style="flex: 1;">{{item.zpallet}}</view> -->
 											<view style="width: 10vw;">{{item.anfme}}</view>
+											<view style="width: 10vw;">{{parseInt(item.anfme) - parseInt(item.count)}}</view>
 										</swiper-item>
 									</swiper>
 								</view>
@@ -450,18 +454,16 @@
 			setInterval(()=>{
 				this.getDate2()
 				this.getUrl()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
+				// this.getInfo()
+				// this.getError()
+				this.getInfo2()
+				this.getError2()
 				this.controller()
 			},1000)
 			
 			setInterval(()=>{
 				this.getDate2()
 				this.getUrl()
-				this.getInfo()
-				this.getError()
 				// this.getInfo2()
 				// this.getError2()
 				this.controller()

--
Gitblit v1.9.1