From 9df4a1ac09d23969f5b77da9d7ac03106052b827 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期六, 04 十一月 2023 15:03:45 +0800
Subject: [PATCH] #

---
 Monitor-APP/pages/index/data.json |    3 -
 Monitor-APP/pages/home/home.vue   |   62 ++++++++++++++++++------------
 2 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/Monitor-APP/pages/home/home.vue b/Monitor-APP/pages/home/home.vue
index dc05b0f..f9affcb 100644
--- a/Monitor-APP/pages/home/home.vue
+++ b/Monitor-APP/pages/home/home.vue
@@ -420,20 +420,39 @@
 			that.basePort = BasePort
 			that.baseCrnId = BaseCrnId
 			
+			
+		
 			this.getDate2()
-			this.getUrl()
-			this.getServerData()
-			// this.initlineChart()
-			// this.initPieChart()
-			this.getOther()
 			setTimeout(()=>{
-				this.initlineChart()
-				this.getServerData()
-				this.initPieChart()
-				this.getOther()
+				// 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.getDate2()
@@ -443,17 +462,7 @@
 				// this.getInfo2()
 				// this.getError2()
 				this.controller()
-			},1000)
-			
-			setInterval(()=>{
-				this.getServerData()
-				this.initlineChart()
-				this.initPieChart()
-				this.getOther()
 			},600000)
-			
-		
-			
 		},
 		methods: {
 			timeOuts() {
@@ -542,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;
 					}
@@ -736,7 +746,6 @@
 				var m = date.getMonth() + 1
 				var d = date.getDate()
 				var newDate = m + '-' + d
-				console.log(newDate);
 				return newDate
 			},
 			/*************** 鎶樼嚎鍥� *****************************************************************************************************/
@@ -751,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)
+							
 						}
 					}
 				})
diff --git a/Monitor-APP/pages/index/data.json b/Monitor-APP/pages/index/data.json
index 29bc8cc..4ae0f5b 100644
--- a/Monitor-APP/pages/index/data.json
+++ b/Monitor-APP/pages/index/data.json
@@ -37,8 +37,7 @@
 																			"maknx": "鍐呭叚瑙掓矇澶磋灪閽�",
 																			"count": 235.0
 																		}],
-																"emptyMk":false,
-																"ioType":101
+																"emptyMk":false
 												}]
 		}},
 	"dataError2":{"data":{"msg":"鎿嶄綔鎴愬姛","code":200,"data":""}},

--
Gitblit v1.9.1