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 |  186 +++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 156 insertions(+), 30 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index b559bc9..12946e6 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -27,13 +27,13 @@
 										vertical 婊戝姩鏂瑰悜鏄惁涓虹旱鍚� 
 										display-multiple-items 鍚屾椂鏄剧ず鐨勬粦鍧楁暟閲� -->
 										<swiper class="swiper-body-main" vertical="true" 
-										display-multiple-items="3"
+										display-multiple-items="5"
 										circular="true" :autoplay="true" :interval="3000" :duration="2000">
 											<swiper-item class="swiper-item" v-for="(item,i) in locList" :key="i">
 												<!-- <view style="width: 30%;">{{i+1}} / {{swiperList.length}}</view> -->
 												<!-- <view style="width: 30%;">鏂欏彿: {{item.matnr}}</view> -->
-												<view style="width: 50%; font-size: 3vw;">鍨嬪彿: {{item.model}}</view>
-												<view style="width: 50%; font-size: 3vw;">鍗锋暟: {{item.modelCount}}</view>
+												<view style="width: 50%; font-size: 1vw;">鐗╂枡鐮�: {{item.matnr}}</view>
+												<view style="width: 50%; font-size: 1vw;">鏁伴噺: {{item.matnrCount}}</view>
 												
 												
 												
@@ -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>
@@ -304,6 +304,8 @@
 <script>
 	import demodata from '@/mockdata/demodata.json';
 	import ycqdata from '@/pages/index/data.json';
+	import {WebSocketClient} from "@/static/js/WebSocketClient"	
+	let socket;
 	export default {
 		data() {
 			return {
@@ -368,7 +370,10 @@
 				timeOut: false,
 				times: 0,
 				currDate: '',
-				locList:[]
+				locList:[],	
+				oldHours:'',
+				oldMin:''
+        
 				
 			}
 		},
@@ -392,26 +397,152 @@
 			that.baseCrnId = BaseCrnId
 			// this.getUrl()
 		},
-		onLoad() {
+		created() {
+			let that = this
+			const BaseIP = uni.getStorageSync('BaseIp');
+			const BaseLedId = uni.getStorageSync('BaseLedId');
+			const BasePort = uni.getStorageSync('BasePort');
+			const BaseCrnId = uni.getStorageSync('BaseCrnId');
+			const PROJ = uni.getStorageSync('UPROJ');
+			that.baseUrl = PROJ
+			that.baseIP = BaseIP
+			that.baseLedId = BaseLedId
+			that.basePort = BasePort
+			that.baseCrnId = BaseCrnId
+			that.webSockerInit();
+		},
+		onLoad() {			
 			setInterval(()=>{
 				this.getServerData()
-				this.initlineChart()
-				this.initPieChart()
-				this.getOther()
-				// this.getDate()
-				this.getDate2()
-				this.getInfo()
-				this.getError()
+				// this.initlineChart()
+				// this.initPieChart()
+				// this.getOther()
+				// // this.getDate()
+				// this.getDate2()
+				// this.getInfo()
+				// this.getError()
 				// this.getInfo2()
 				// this.getError2()
-				this.getUrl()
+				// this.getUrl()
 				this.controller()
-				this.statisticalModel()
+				// 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
+						// socketUrl = "ws://10.0.100.150:8080/gtctu/led/113"
+				const ws = new WebSocketClient(socketUrl);
+				ws.connect()
+				ws.onmessage((msg)=>{					
+				 let data = JSON.parse(msg.data)
+				 if(data.type === "default"){
+				 	that.chartsData.Pie.series[0].data = data.pie
+				 	that.baseInfo.stockCount = data.stockCunt
+				 	that.baseInfo.emptyCount = data.emptyCount
+				 	that.baseInfo.noneCount =data.noneCount
+				 	that.baseInfo.used = data.used
+				 	that.baseInfo.usedPr = data.usedPr
+				 	
+				 	that.chartsData.Line.categories = [
+				 		that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
+				 		that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
+				 		that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
+				 	that.chartsData.Line.series = data.rows
+				 	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
+				 		if (that.infoType == 1) {
+				 			that.infoType = 3
+				 			that.infoText.title = "鍏朵粬淇℃伅" 
+				 			// that.infoText.title = "寮傚父"
+				 			that.infoText.error = errorInfo
+				 			return
+				 		}
+				 		that.infoType = 2
+				 		that.infoText.title = "鍏朵粬淇℃伅"
+				 		// that.infoText.title = "寮傚父"
+				 		that.infoText.error = errorInfo
+				 	} else {
+				 		if (that.infoType == 1) {
+				 			return
+				 		}
+				 		that.infoType = 0
+				 	}
+				 }else if(data.type === "task"){
+					 if (data.taskList && data.taskList !== "" && data.taskList.length !=0) {
+					 	if (that.infoType == 2 || that.infoType == 3) {
+					 		return;
+					 	}
+					 	// infoType1:鍙湁鎷f枡绛変俊鎭�
+					 	that.infoType = 1
+					 	if (data.taskList[0].ioType === 101) {
+					 		that.infoText.title = '鍏ㄦ澘鍑哄簱'
+					 	} else if(data.taskList[0].ioType === 103) {
+					 		that.infoText.title = '鎷f枡鍑哄簱'
+					 	} else if(data.taskList[0].ioType === 107) {
+					 		that.infoText.title = '鐩樼偣鍑哄簱'
+					 	} else if(data.taskList[0].ioType === 1) {
+					 		that.infoText.title = '鍏ュ簱'
+					 	} else if(data.taskList[0].ioType === 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
+					 	that.infoText.sourceLocNo = data.taskList[0].sourceLocNo
+					 	that.infoText.staNo = data.taskList[0].staNo
+					 	that.swiperList = data.taskList[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
+					 }
+				 }
+				 
+				})
+			},
 			statisticalModel() {
 				let that = this
 				uni.request({
@@ -718,8 +849,7 @@
 					method:"GET",
 					success(result) {
 						var res = result.data.data
-						that.calendar = res.year + "骞�" + res.month + "鏈�" + res.day + "鏃� " + res.hour + ":" + res.minute + ":" + res.second + " " + res.week
-						that.currDate = res.year + "/" + res.month + "/" + res.day
+						
 					}
 				})
 			},
@@ -763,11 +893,7 @@
 					success(result) {
 						var res = result.data
 						if (res.code === 200) {
-							that.chartsData.Line.categories = [
-								that.getDateFormat(-11),that.getDateFormat(-10),that.getDateFormat(-9),that.getDateFormat(-8),
-								that.getDateFormat(-7),that.getDateFormat(-6),that.getDateFormat(-5),that.getDateFormat(-4),
-								that.getDateFormat(-3),that.getDateFormat(-2),that.getDateFormat(-1),that.getDateFormat(0),]
-							that.chartsData.Line.series = res.data.rows
+							
 						}
 					}
 				})

--
Gitblit v1.9.1