From eb05511cce839cafc4dee453c94f41e0dd52bce5 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 16 九月 2025 13:37:52 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |  134 ++++++++++++++++++++++++++++++++++++--------
 1 files changed, 108 insertions(+), 26 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 9379e94..d34fc20 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: {
@@ -515,7 +513,91 @@
 					data: {ledId:that.baseLedId},
 					success(result) {
 						var	res = result.data
-						that.infoModel(res)
+						const res1 = {
+						  "data": [
+							{
+							  "ioType": 103,
+							  "staNo": "STA002",
+							  "workNo": "8888",
+							  "matDtos": [
+								{
+								  "matnr": "0050950010050001",
+								  "maknx": "灏忓帹鎴�",
+								  "proType":"鐢甸晙",
+								  "batch": null,
+								  "specs": "桅35",
+								  "orderNo": "WHIN2503000101",
+								  "outOrderNo": "BYM2024-1007SN楂橀湒",
+								  "unit": "pcs",
+								  "weight": 450,
+								  "objectName": "桅35閾滃皬鍘ㄦ埧",
+								  "length": 20,
+								  "temp1": "浜屽彿鏄熸渤绌哄績鍗曞瓟锛堜笉甯﹀瓟銆丮8铻虹汗瀛旓級",
+								  "temp2": "1007SN楂橀湒",
+								  "count": 1000,
+								  "anfme": 1000,
+								  "factArea": "楂橀湒宸ュ巶"
+								},
+								{
+								  "matnr": "0050950010050002",
+								  "proType":"鐢甸晙",
+								  "maknx": "澶у帹鎴�",
+								  "batch": "B20240521A",
+								  "specs": "桅45",
+								  "orderNo": "WHIN2503000102",
+								  "outOrderNo": "BYM2024-1008SN楂橀湒",
+								  "unit": "pcs",
+								  "weight": 520,
+								  "objectName": "桅45閾滃ぇ鍘ㄦ埧",
+								  "length": 22,
+								  "temp1": "D1075000鍏ュ鍠锋灙榫欏ご(57閾溿�佷綋鎶涚爞銆�2涓灪涓濆瓟)SH095",
+									"temp2": "1007SN楂橀湒",
+								  "count": 800,
+								  "anfme": 800,
+								  "factArea": "涓壃宸ュ巶"
+								},
+								{
+								  "matnr": "0050950010050003",
+								  "proType":"鐢甸晙",
+								  "maknx": "娴村閰嶄欢",
+								  "batch": "B20240521B",
+								  "specs": "桅28",
+								  "orderNo": "WHIN2503000103",
+								  "outOrderNo": "BYM2024-1009SN楂橀湒",
+								  "unit": "濂�",
+								  "weight": 300,
+								  "objectName": "桅28闀�閾浠�",
+								  "length": 18,
+								  "temp1": "桅28闀�閾浠�",
+								   "temp2": "1007SN楂橀湒",
+								  "count": 600,
+								  "anfme": 600,
+								  "factArea": "涓壃宸ュ巶"
+								},
+								{
+								  "matnr": "0050950010050004",
+								  "proType":"鐢甸晙",
+								  "maknx": "闂ㄦ妸鎵�",
+								  "batch": null,
+								  "specs": "L200*W30",
+								  "orderNo": "WHIN2503000104",
+								  "outOrderNo": "BYM2024-1010SN楂橀湒",
+								  "unit": "涓�",
+								  "weight": 180,
+								  "objectName": "榛戣壊閾濋棬鎶婃墜",
+								  "length": 20,
+								  "temp1": "榛戣壊閾濋棬鎶婃墜",
+								   "temp2": "1007SN楂橀湒",
+								  "count": 300,
+								  "anfme": 300,
+								  "factArea": "涓壃宸ュ巶"
+								}
+							  ]
+							}
+						
+						  ]
+						}
+						that.infoModel(res1)
 					}
 				})
 				
@@ -1025,7 +1107,7 @@
 	}
 	.info-main {
 		width: 100vw;
-		height: 80vh;
+		height: 88vh;
 		display: flex;
 		justify-content: center;
 		align-items: center;

--
Gitblit v1.9.1