From 82ed6f99283df1513adb2bd60d0cc18df08dddb1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 13 八月 2024 17:02:08 +0800
Subject: [PATCH] #

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

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index b559bc9..32e196a 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>
 												
 												
 												
@@ -304,6 +304,7 @@
 <script>
 	import demodata from '@/mockdata/demodata.json';
 	import ycqdata from '@/pages/index/data.json';
+	let socket;
 	export default {
 		data() {
 			return {
@@ -392,26 +393,84 @@
 			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.getInfo2()
-				// this.getError2()
-				this.getUrl()
-				this.controller()
-				this.statisticalModel()
+				// this.initlineChart()
+				// this.initPieChart()
+				// this.getOther()
+				// // this.getDate()
+				// this.getDate2()
+				// this.getInfo()
+				// this.getError()
+				// // this.getInfo2()
+				// // this.getError2()
+				// this.getUrl()
+				// this.controller()
+				// this.statisticalModel()
 				// 娴嬭瘯鐢�
 				
 			},1000)
 		},
 		methods: {
+			webSockerInit(){
+				let that = this;
+				that.commonUrl = that.baseIP + ':' +that.basePort + "/" +that.baseUrl
+				if(typeof(WebSocket) == "undefined"){
+					console.log("涓嶆敮鎸亀ebsocket")
+				}else{
+					let socketUrl = "ws://"+that.commonUrl+"/led/"+that.baseLedId
+					console.log("ws://"+that.commonUrl+"/led/"+that.baseLedId)
+					if (socket != null) {
+					  socket.close();
+					  socket = null;
+					}
+					// 寮�鍚竴涓獁ebsocket鏈嶅姟
+					socket = new WebSocket(socketUrl);
+					//鎵撳紑浜嬩欢
+					socket.onopen = function () {
+					  console.log("websocket宸叉墦寮�");
+					};
+					socket.onmessage = function(msg){
+						let data = JSON.parse(msg.data)
+						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
+					}
+					socket.onclose = function(){
+						console.log("websocket宸插叧闂�");
+					}
+					socket.onerror = function(){
+						console.log("websocket閿欒");
+					}
+				}
+			},
 			statisticalModel() {
 				let that = this
 				uni.request({
@@ -718,8 +777,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 +821,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