From e9514a498f2b9ed6ffa964779064410e6addd424 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 10 十一月 2023 08:15:32 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   46 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 1c3824d..cb932f9 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -219,7 +219,7 @@
 									<view style="flex: 2;">鍟嗗搧缂栧彿</view>
 									<view style="flex: 2;">绠辩爜</view>
 									<view style="flex: 2;">鍟嗗搧鍚嶇О</view>
-									<view style="flex: 1;">瑙勬牸</view>
+									<view style="flex: 2;">瑙勬牸</view>
 									<view style="flex: 1;">浣滀笟鏁伴噺</view>
 									<view style="flex: 1;">鍓╀綑鏁伴噺</view>
 								</view>
@@ -237,7 +237,7 @@
 											<view style="flex: 2;">{{item.matNo}}</view>
 											<view style="flex: 2;">{{item.containerCode}}</view>
 											<view style="flex: 2;">{{item.maknx}}</view>
-											<view style="flex: 1;">{{item.specs}}</view>
+											<view style="flex: 2;">{{item.specs}}</view>
 											<view style="flex: 1;">{{item.count}}</view>
 											<view style="flex: 1;">{{item.total}}</view>
 										</swiper-item>
@@ -418,22 +418,46 @@
 			that.baseLedId = BaseLedId
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
-			// this.getUrl()
+			
+			
+		
+			this.getDate2()
+			setTimeout(()=>{
+				// this.getServerData()
+				// this.initlineChart()
+				// this.initPieChart()
+				// this.getOther()
+				setTimeout(()=>{
+					this.getServerData()
+					this.initlineChart()
+					this.initPieChart()
+					this.getOther()
+					setTimeout(()=>{
+						this.getServerData()
+						this.initlineChart()
+						this.initPieChart()
+						this.getOther()
+					},3000)
+				},1000)
+			},1000)
 		},
 		onLoad() {
+			setInterval(()=>{
+				this.getDate2()
+				this.getUrl()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
+				this.controller()
+			},1000)
+			
 			setInterval(()=>{
 				this.getServerData()
 				this.initlineChart()
 				this.initPieChart()
 				this.getOther()
-				this.getDate2()
-				// this.getInfo()
-				// this.getError()
-				this.getInfo2()
-				this.getError2()
-				this.getUrl()
-				this.controller()
-			},1000)
+			},600000)
 		},
 		methods: {
 			timeOuts() {

--
Gitblit v1.9.1