From 6c52e356b3514c6737ad42121177488c2d48144d Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 04 十一月 2023 09:07:41 +0800
Subject: [PATCH] #

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

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 9f5253b..dc05b0f 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -329,6 +329,7 @@
 	export default {
 		data() {
 			return {
+				commonUrl: '',
 				series: [],
 				homeViewShow: true,
 				infoViewShow: false	,
@@ -418,29 +419,41 @@
 			that.baseLedId = BaseLedId
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
-			// this.getUrl()
-		},
-		onLoad() {
-			this.getServerData()
-			this.initlineChart()
-			this.initPieChart()
-			this.getOther()
+			
 			this.getDate2()
 			this.getUrl()
+			this.getServerData()
+			// this.initlineChart()
+			// this.initPieChart()
+			this.getOther()
+			setTimeout(()=>{
+				this.initlineChart()
+				this.getServerData()
+				this.initPieChart()
+				this.getOther()
+			},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()
 			},600000)
+			
+		
+			
 		},
 		methods: {
 			timeOuts() {
@@ -723,6 +736,7 @@
 				var m = date.getMonth() + 1
 				var d = date.getDate()
 				var newDate = m + '-' + d
+				console.log(newDate);
 				return newDate
 			},
 			/*************** 鎶樼嚎鍥� *****************************************************************************************************/
@@ -776,7 +790,7 @@
 				uni.request({
 					url: that.commonUrl + "/monitor/other",
 					data: {
-						crnId: that.baseCrnId, 
+						crnId: that.baseCrnId,
 						ledId: that.baseLedId,
 					},
 					success(result) {

--
Gitblit v1.9.1