From 36909d121a6f1b4c3f4540b8c64c80e872d105ae Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 28 五月 2025 15:12:32 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   62 +++++++++++++++++++++++-------
 1 files changed, 47 insertions(+), 15 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 2f57de9..12946e6 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -201,21 +201,21 @@
 									vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 									display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 									<swiper class="swiper-body-main" vertical="true" 
-									display-multiple-items="1"
+									display-multiple-items="2"
 									circular="true" :autoplay="true" :interval="3000" :duration="2000">
 										<swiper-item class="swiper-item" v-for="(item,i) in swiperList" :key="i">
-											<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
+											<view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view>
 											<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
 											<view style="width: 50%; font-size: 3vw;">鐗╂枡缂栫爜: {{item.matnr}}</view>
-											<view style="width: 50%; font-size: 3vw;">鎵瑰彿: {{item.batch}}</view>
-											<view style="width: 33%; font-size: 3vw;">鐢熶骇鏃ユ湡: {{item.manuDate}}</view>
+											<view style="width: 50%; font-size: 3vw;">鍚嶇О: {{item.maknx}}</view>
+											<!-- <view style="width: 33%; font-size: 3vw;">鐢熶骇鏃ユ湡: {{item.manuDate}}</view> -->
 											
-											<view style="width: 33%; font-size: 3vw;">鍨嬪彿: {{item.model}}</view>
-											<view style="width: 33%; font-size: 3vw;">鑶滅被鍨�: {{item.specs}}</view>
 											
-											<view style="width: 33%; font-size: 3vw;">闀垮害: {{item.length}}</view>
-											<view style="width: 33%; font-size: 3vw;">瀹藉害: {{item.weight}}</view>
-											<view style="width: 33%; font-size: 3vw;">闈㈢Н: {{item.volume}}</view>
+											<view style="width: 50%; font-size: 3vw;">瑙勬牸: {{item.specs}}</view>
+											<view style="width: 50%; font-size: 3vw;">鎵规: {{item.batch}}</view>
+											<view style="width: 50%; font-size: 3vw;">閿�鍞崟鍙�: {{item.orderNo}}</view>
+											<view style="width: 50%; font-size: 3vw;">瀹㈡埛鍚嶇О: {{item.customer}}</view>
+											<view style="width: 33%; font-size: 3vw;">鏁伴噺: {{item.count}}</view>
 											
 											
 										</swiper-item>
@@ -370,7 +370,10 @@
 				timeOut: false,
 				times: 0,
 				currDate: '',
-				locList:[],				
+				locList:[],	
+				oldHours:'',
+				oldMin:''
+        
 				
 			}
 		},
@@ -418,20 +421,43 @@
 				// this.getDate2()
 				// this.getInfo()
 				// this.getError()
-				// // this.getInfo2()
-				// // this.getError2()
+				// this.getInfo2()
+				// this.getError2()
 				// this.getUrl()
 				this.controller()
 				// this.statisticalModel()
 				// 娴嬭瘯鐢�
 				
 			},1000)
+			
+			setInterval(()=> {	
+				setTimeout(()=>{
+					plus.runtime.restart();
+				},100)
+				
+			},1000*60*60*4)
+			
+			// setInterval(()=> {
+			// 	setTimeout(()=>{
+			// 		var time = new Date();
+			// 		var hh = time.getHours();
+			// 		var mm = time.getMinutes();
+			// 		if(hh > this.oldHours && mm >this.oldMin && this.oldMin - mm < 55){
+			// 			plus.runtime.restart();
+			// 		}
+			// 		if(mm >this.oldMin && mm - this.oldMin >2){
+			// 			plus.runtime.restart();
+			// 		}
+			// 	},100)
+				
+			// },1000*30)
 		},
 		methods: {
 			webSockerInit(){
 				let that = this;
 				that.commonUrl = that.baseIP + ':' +that.basePort + "/" +that.baseUrl
-				let socketUrl = "ws://"+that.commonUrl+"/led/"+that.baseLedId				
+				let socketUrl = "ws://"+that.commonUrl+"/led/"+that.baseLedId
+						// socketUrl = "ws://10.0.100.150:8080/gtctu/led/113"
 				const ws = new WebSocketClient(socketUrl);
 				ws.connect()
 				ws.onmessage((msg)=>{					
@@ -452,6 +478,8 @@
 				 	that.calendar = data.year + "骞�" + data.month + "鏈�" + data.day + "鏃� " + data.hour + ":" + data.minute + ":" + data.second + " " + data.week
 				 	that.currDate = data.year + "/" + data.month + "/" + data.day
 				 	that.locList = data.inventoryData
+					that.oldHours = data.hour
+					that.oldMin = data.minute
 				 }else if(data.type === "error"){
 				 	if (data.errMsg && data.errMsg !== "") {
 				 		var errorInfo = data.errMsg
@@ -473,7 +501,7 @@
 				 		that.infoType = 0
 				 	}
 				 }else if(data.type === "task"){
-					 if (data.taskList && data.taskList !== "") {
+					 if (data.taskList && data.taskList !== "" && data.taskList.length !=0) {
 					 	if (that.infoType == 2 || that.infoType == 3) {
 					 		return;
 					 	}
@@ -482,7 +510,7 @@
 					 	if (data.taskList[0].ioType === 101) {
 					 		that.infoText.title = '鍏ㄦ澘鍑哄簱'
 					 	} else if(data.taskList[0].ioType === 103) {
-					 		that.infoText.title = '妫�鏂欏嚭搴�'
+					 		that.infoText.title = '鎷f枡鍑哄簱'
 					 	} else if(data.taskList[0].ioType === 107) {
 					 		that.infoText.title = '鐩樼偣鍑哄簱'
 					 	} else if(data.taskList[0].ioType === 1) {
@@ -491,6 +519,10 @@
 					 		that.infoText.title = '绌烘墭鍏ュ簱'
 					 	} else if(data.taskList[0].ioType === 110) {
 					 		that.infoText.title = '绌烘墭鍑哄簱'
+					 	} else if(data.taskList[0].ioType === 104) {
+					 		that.infoText.title = '骞舵澘鍑哄簱'
+					 	}else if(data.taskList[0].ioType === 54) {
+					 		that.infoText.title = '骞舵澘鍏ュ簱'
 					 	}
 					 	that.infoText.barcode = data.taskList[0].barcode
 					 	that.infoText.workNo = data.taskList[0].workNo

--
Gitblit v1.9.1