From ebbf2aa57c3bcc5fb7c9a6de1b725f531b652240 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 1 Aug 2022 11:32:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DeviceScreen.vue      |  6 +++---
 src/pages/HomeScreen.vue        |  2 +-
 src/pages/MonitoringScreen.vue  | 10 +++++++---
 src/pages/MonitoringScreen2.vue |  2 +-
 src/pages/TaskScreen.vue        |  4 ++--
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/pages/DeviceScreen.vue b/src/pages/DeviceScreen.vue
index 177b888..ec943a9 100644
--- a/src/pages/DeviceScreen.vue
+++ b/src/pages/DeviceScreen.vue
@@ -1684,7 +1684,7 @@ export default {
         // console.log(res.result)
         this.chartData1 = res.result
         if (res.result.length) {
-          window.clearInterval(this.timeOut2)
+          clearInterval(this.timeOut2)
           this.setEchart02() // 左3
         }
         // this.setEchart02() // 左3
@@ -1719,7 +1719,7 @@ export default {
           this.taskDate2.push(e.min_productivity)
         })
         if (res.result.length) {
-          window.clearInterval(this.timeOut1)
+          clearInterval(this.timeOut1)
           this.setEchart04() // 中2
         }
       } else {
@@ -1809,7 +1809,7 @@ export default {
         console.log(res.result)
         this.chartData2 = res.result
         if (res.result.length) {
-          window.clearInterval(this.timeOut3)
+          clearInterval(this.timeOut3)
           this.setEchart10() // 右3
         }
         // this.setEchart10() // 右3
diff --git a/src/pages/HomeScreen.vue b/src/pages/HomeScreen.vue
index 7fa51d1..f217aa5 100644
--- a/src/pages/HomeScreen.vue
+++ b/src/pages/HomeScreen.vue
@@ -53,7 +53,7 @@ export default {
       }, this.iTime)
     },
     toJump () {
-      window.clearInterval(this.timer)
+      clearInterval(this.timer)
       this.page = this.page === 'one' ? 'two' : 'one'
       setTimeout(() => {
         this.swipePage()
diff --git a/src/pages/MonitoringScreen.vue b/src/pages/MonitoringScreen.vue
index 7a5591a..4b89571 100644
--- a/src/pages/MonitoringScreen.vue
+++ b/src/pages/MonitoringScreen.vue
@@ -393,6 +393,10 @@ export default {
   beforeDestroy () {
     this.$once('hook:beforeDestroy', () => {
       clearInterval(this.timer2)
+      clearInterval(this.timer3)
+      clearInterval(this.interTime)
+      clearInterval(this.timeOut1)
+      clearInterval(this.timeOut2)
     })
   },
   methods: {
@@ -842,7 +846,7 @@ export default {
         this.joo1 = res.monthResult.joo1
         this.joo2 = res.monthResult.joo2
         this.joo3 = res.monthResult.joo3
-        window.clearInterval(this.timer3)
+        clearInterval(this.timer3)
         this.toSwiper()
       } else {
         this.Dialog(res.desc)
@@ -860,7 +864,7 @@ export default {
       if (res.code === '1') {
         this.arrL2 = [...res.result]
         if (this.arrL2.length > 0) {
-          window.clearInterval(this.timeOut1)
+          clearInterval(this.timeOut1)
           this.setEchart1()
         }
       } else {
@@ -872,7 +876,7 @@ export default {
       let res = await monthHarvest()
       if (res.code === '1') {
         this.arrL3 = [...res.result]
-        window.clearInterval(this.timeOut2)
+        clearInterval(this.timeOut2)
         this.setEchart2()
       } else {
         this.Dialog(res.desc)
diff --git a/src/pages/MonitoringScreen2.vue b/src/pages/MonitoringScreen2.vue
index 47ac9bc..c881445 100644
--- a/src/pages/MonitoringScreen2.vue
+++ b/src/pages/MonitoringScreen2.vue
@@ -153,7 +153,7 @@ export default {
     // this._getEchart4()
   },
   beforeDestroy () {
-    window.clearInterval(this.timer)
+    clearInterval(this.timer)
   },
   methods: {
     _getEchart4 () {
diff --git a/src/pages/TaskScreen.vue b/src/pages/TaskScreen.vue
index 25f1919..acb2d6f 100644
--- a/src/pages/TaskScreen.vue
+++ b/src/pages/TaskScreen.vue
@@ -215,7 +215,7 @@ export default {
     this.refresh()
   },
   beforeDestroy () {
-    window.clearInterval(this.timer)
+    clearInterval(this.timer)
   },
   methods: {
     refresh () {
@@ -235,7 +235,7 @@ export default {
       if (res.code === '1') {
         this.obj1 = res.content
         this.array1 = [...res.rows]
-        window.clearInterval(this.timeOut)
+        clearInterval(this.timeOut)
         this.setEchart1()
       } else {
         this.Dialog(res.desc)