From 79a829a40d5b2df372766b54eeb060502e23441d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?zhaobing=E2=80=99?= <zhao.bin@free-sun.com.cn>
Date: Mon, 25 Dec 2023 20:44:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=8A=A0=E8=BD=BD=E4=B8=8D=E5=87=BA=E6=9D=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../deviceBigdataGraph/deviceBigdataGraph.js     | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js
index 9bee0cc..d5a7964 100644
--- a/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js
+++ b/weapp/package/deviceBigdataGraph/deviceBigdataGraph.js
@@ -24,7 +24,6 @@ Page({
             });
             chart.setOption(option);
             this.chart = chart;
-            wx.hideLoading()
 
             return chart;
         });
@@ -147,12 +146,12 @@ Page({
                     that.initECharts(option);
                 }, 1000)
             } else {
-                wx.hideLoading()
 
             }
         })
         Request.get(getPatrolRecord('all', moment(date1).format('YYYY-MM-DD') + ' 00:00:00', moment('2099-12-31').format('YYYY-MM-DD') + ' 23:59:59', 'null', 'null',{home:false})).then(res => {
             if (res) {
+                
                 let normal = 0;
                 let abnormal = 0;
                 let unknown = 0;
@@ -231,7 +230,6 @@ Page({
                             break;
                     }
                 });
-                that.setData({dataList:res})
                 var optionDevice = {
                     tooltip: {
                         trigger: 'item'
@@ -267,11 +265,14 @@ Page({
 
                     }]
                 };
-                that.timeoutId2=  setTimeout(() => {
-                    that.initDeviceECharts(optionDevice);
-                }, 1000)
+                that.setData({dataList:res},()=>{
+                    that.timeoutId2=  setTimeout(() => {
+                        that.initDeviceECharts(optionDevice);
+                    }, 1000)
+                })
+
+               
             } else {
-                wx.hideLoading()
             }
         })
         Request.get(getProjectList()).then(res => {
@@ -282,7 +283,6 @@ Page({
                 //     projectList: res
                 // })
             } else {
-                wx.hideLoading()
 
             }
         })