From 321d832e90265b74992a60728c11ef8ec81f61c9 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 06 十一月 2023 14:48:53 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/home/home.vue |   60 +++++++++++++++++++++++++++++++++++++++++++-----------------
 1 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index 9f5253b..59a0271 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,28 +419,49 @@
 			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() {
-			this.getServerData()
-			this.initlineChart()
-			this.initPieChart()
-			this.getOther()
-			this.getDate2()
-			this.getUrl()
+			
 			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.getUrl()
+				this.getInfo()
+				this.getError()
+				// this.getInfo2()
+				// this.getError2()
+				this.controller()
 			},600000)
 		},
 		methods: {
@@ -529,6 +551,7 @@
 			infoModel(res) {
 				let that = this
 				if (res.data && res.data !== "") {
+					that.infoText.title = res.data[0].title
 					if (that.infoType == 2 || that.infoType == 3) {
 						return;
 					}
@@ -737,11 +760,14 @@
 					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
+							setTimeout(()=> {
+								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
+							},1000)
+							
 						}
 					}
 				})
@@ -776,7 +802,7 @@
 				uni.request({
 					url: that.commonUrl + "/monitor/other",
 					data: {
-						crnId: that.baseCrnId, 
+						crnId: that.baseCrnId,
 						ledId: that.baseLedId,
 					},
 					success(result) {

--
Gitblit v1.9.1