From b8ed2917f1da6f644bf76b78f61720870b0b27ad Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期三, 08 十月 2025 16:50:42 +0800
Subject: [PATCH] 1

---
 Monitor-APP/pages/home/home.vue |  172 ++++++++++++++++++++++++---------------------------------
 1 files changed, 72 insertions(+), 100 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 6c1e7c7..f2cf9f3 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -30,7 +30,8 @@
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;">
 													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">
-														{{baseInfo.xDistance}}</view>
+														{{baseInfo.xDistance}}
+													</view>
 													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
 												</view>
 												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌璺濈(鍗冪背)
@@ -43,7 +44,8 @@
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;">
 													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">
-														{{baseInfo.yDistance}}</view>
+														{{baseInfo.yDistance}}
+													</view>
 													<view style="position: absolute;bottom: 0;left: 10vw;">KM</view>
 												</view>
 												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷璺濈(鍗冪背)
@@ -56,7 +58,8 @@
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;">
 													<view style="-width: 2vw;padding-left: 2vw;;font-size: 2vw;">
-														{{baseInfo.xDuration}}</view>
+														{{baseInfo.xDuration}}
+													</view>
 													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
 												</view>
 												<view style="height: 100%;text-align: left;text-indent: 2em;">绱璧拌鏃堕暱(灏忔椂)
@@ -69,7 +72,8 @@
 											<view class="flex-col" style="width: calc(100% - 5vw);">
 												<view class="flex-row" style="position: relative;">
 													<view style="width: 2vw;padding-left: 2vw;;font-size: 2vw;">
-														{{baseInfo.yDuration}}</view>
+														{{baseInfo.yDuration}}
+													</view>
 													<view style="position: absolute;bottom: 0;left: 10vw;">H</view>
 												</view>
 												<view style="height: 100%;text-align: left;text-indent: 2em;">绱鍗囬檷鏃堕暱(灏忔椂)
@@ -108,7 +112,8 @@
 											</view>
 											<view
 												style="position: absolute;bottom: 0;right: 0;font-size: 2.5vw;color: #FF5722;;">
-												{{baseInfo.used}}</view>
+												{{baseInfo.used}}
+											</view>
 										</view>
 									</view>
 								</view>
@@ -187,21 +192,24 @@
 														<view style="width: 8vw;height: 4vw;line-height: 4vw;">鍦ㄥ簱</view>
 														<view
 															style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">
-															{{baseInfo.stockCount}}</view>
+															{{baseInfo.stockCount}}
+														</view>
 													</view>
 													<view class="flex-row sub-info" style="margin-top: 2vh;">
 														<image src="../../static/f1.png" mode="aspectFit"></image>
 														<view style="width: 8vw;height: 4vw;line-height: 4vw;">绌哄簱</view>
 														<view
 															style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">
-															{{baseInfo.emptyCount}}</view>
+															{{baseInfo.emptyCount}}
+														</view>
 													</view>
 													<view class="flex-row sub-info" style="margin-top: 2vh;">
 														<image src="../../static/e1.png" mode="aspectFit"></image>
 														<view style="width: 8vw;height: 4vw;line-height: 4vw;">閿佸畾</view>
 														<view
 															style="width: 8vw;height: 4vw;line-height: 4vw;font-size: 2vw;">
-															{{baseInfo.noneCount}}</view>
+															{{baseInfo.noneCount}}
+														</view>
 													</view>
 												</view>
 											</view>
@@ -209,14 +217,18 @@
 
 									</y-box>
 								</view>
-								<view style="height: 2%;"></view>
-								<view style="height: 18%;">
-									<y-box>
-										<view class="flex-col"
-											style="width: 100%;height: 100%;font-size: 4vh;justify-content: center;letter-spacing: 1vh;">
-											鑷姩浠撳簱WCS鐩戞帶骞冲彴
-										</view>
-									</y-box>
+								<view style="height: 1%;"></view>
+								<view style="height: 18%;" class="flex-row">
+									<view  style ="margin-left: -4vw;height: 4vw;margin-top: 1vw;">
+										<image style="height: 4vw;" src="../../static/zy_logo.png" mode="aspectFit">
+										</image>
+									</view>
+									<view style ="width: 10vw;margin-left: -7vw;">
+										<image style="height: 8vw;" src="../../static/barcode.png" mode="aspectFit">
+										</image>
+									</view>
+									
+
 								</view>
 							</view>
 						</view>
@@ -434,9 +446,9 @@
 				times: 0,
 				currDate: '',
 				textred: 'textred',
-				apiIp: '10.10.10.203',
+				apiIp: '10.10.32.200',
 				apiPort: '9090',
-				apiUrl: 'rqdzwcs',
+				apiUrl: 'nbjswcs',
 				ledInfosApi: '/console/getLedInfos'
 
 			}
@@ -481,7 +493,7 @@
 		},
 		onLoad() {
 			this.getLedInfo()
-			
+
 			setInterval(() => {
 				this.getServerData()
 				this.getDate2()
@@ -570,90 +582,50 @@
 						ledId: that.baseLedId
 					},
 					success(result) {
+						that.timeOut = false
+						that.times = 0
 						var res = result.data
-						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": "涓壃宸ュ巶"
-										}
-									]
-								}
+						var res = result.data
+						if (res.data && res.data !== "") {
+							if (that.infoType == 2 || that.infoType == 3) {
+								return;
+							}
 
-							]
+							// infoType1:鍙湁鎷f枡绛変俊鎭�
+							that.infoType = 1
+							if (res.data[0].ioType === 101) {
+								that.infoText.title = '鍏ㄦ澘鍑哄簱'
+							} else if (res.data[0].ioType === 103) {
+								that.infoText.title = '妫�鏂欏嚭搴�'
+							} else if (res.data[0].ioType === 107) {
+								that.infoText.title = '鐩樼偣鍑哄簱'
+							} else if (res.data[0].ioType === 1) {
+								that.infoText.title = '鍏ュ簱'
+							} else if (res.data[0].ioType === 10) {
+								that.infoText.title = '绌烘墭鍏ュ簱'
+							} else if (res.data[0].ioType === 110) {
+								that.infoText.title = '绌烘墭鍑哄簱'
+							}
+							that.infoText.barcode = res.data[0].barcode
+							that.infoText.workNo = res.data[0].workNo
+							that.infoText.sourceLocNo = res.data[0].sourceLocNo
+							that.infoText.staNo = res.data[0].staNo
+							that.swiperList = res.data[0].matDtos
+							// that.infoText.matnr = res.data[0].matDtos[0].matnr
+							// that.infoText.specs = res.data[0].matDtos[0].specs
+							// that.infoText.maknx = res.data[0].matDtos[0].maknx
+							// that.infoText.count = res.data[0].matDtos[0].count
+						} else {
+							if (that.infoType == 2 || that.infoType == 3) {
+								return;
+							}
+							that.infoType = 0
 						}
-						that.infoModel(res1)
+					},
+					fail(err) {
+						that.timeOut = true
+						that.times = that.times + 1
+						that.infoType = 0
 					}
 				})
 

--
Gitblit v1.9.1