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

---
 Monitor-APP/pages/home/home.vue |   48 +++++++++++++++++++++++-------------------------
 1 files changed, 23 insertions(+), 25 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 9379e94..ff85a1e 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>
@@ -247,10 +251,10 @@
 					</view>
 				</view>
 			</view>
-			<view class="btn">
-				<!-- <button >鎷f枡鍥炲簱</button> -->
+			<!-- <view class="btn"> -->
+				<!-- <button >鎷f枡鍥炲簱</button>
 				<button  size="mini" type="primary" @click="">鐩樼偣鍥炲簱</button>
-			</view>
+			</view> -->
 		</uni-transition>
 		<!-- 寮傚父淇℃伅 -->
 		<uni-transition :duration="duration" :mode-class="errorInfoMode" :show="errorInfoViewShow">
@@ -422,15 +426,12 @@
 			that.baseLedId = BaseLedId
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
-			
-			
-		
 			this.getDate2()
 			setTimeout(()=>{
-				// this.getServerData()
-				// this.initlineChart()
-				// this.initPieChart()
-				// this.getOther()
+				this.getServerData()
+				this.initlineChart()
+				this.initPieChart()
+				this.getOther()
 				setTimeout(()=>{
 					this.getServerData()
 					this.initlineChart()
@@ -441,13 +442,13 @@
 						this.initlineChart()
 						this.initPieChart()
 						this.getOther()
-					},3000)
-				},1000)
-			},1000)
+					},500)
+				},500)
+			},500)
 		},
 		onLoad() {
-			
 			setInterval(()=>{
+				this.getServerData()
 				this.getDate2()
 				this.getUrl()
 				this.getInfo()
@@ -458,13 +459,10 @@
 			},1000)
 			
 			setInterval(()=>{
-				this.getDate2()
-				this.getUrl()
-				this.getInfo()
-				this.getError()
-				// this.getInfo2()
-				// this.getError2()
-				this.controller()
+				this.getServerData()
+				this.initlineChart()
+				this.initPieChart()
+				this.getOther()
 			},600000)
 		},
 		methods: {
@@ -1025,7 +1023,7 @@
 	}
 	.info-main {
 		width: 100vw;
-		height: 80vh;
+		height: 88vh;
 		display: flex;
 		justify-content: center;
 		align-items: center;

--
Gitblit v1.9.1