From 6ac729663f3bd55e3a8e7ea27ebd114effeb3969 Mon Sep 17 00:00:00 2001
From: lin-xin <2981207131@qq.com>
Date: Wed, 12 Sep 2018 16:40:23 +0800
Subject: [PATCH] =?UTF-8?q?'=E7=A6=BB=E5=BC=80=E9=A6=96=E9=A1=B5=E6=97=B6?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Dashboard.vue | 39 +++++++++++++++++--------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/src/components/page/Dashboard.vue b/src/components/page/Dashboard.vue
index 5850595..22022d8 100644
--- a/src/components/page/Dashboard.vue
+++ b/src/components/page/Dashboard.vue
@@ -180,8 +180,7 @@
                     bgColor: '#F5F8FD',
                     bottomPadding: 30,
                     topPadding: 30
-                },
-                collapse: false
+                }
             }
         },
         components: {
@@ -193,23 +192,15 @@
             }
         },
         created(){
-            bus.$on('collapse', msg => {
-                this.collapse = msg;
-            });
-            // 调用renderChart方法对图表进行重新渲染
-            window.addEventListener('resize', ()=>{
-                this.$refs.bar.renderChart();
-                this.$refs.line.renderChart();
-            })
+            this.handleListener();
             this.changeDate();
         },
-        watch: {
-            collapse(){
-                setTimeout(() => {
-                    this.$refs.bar.renderChart();
-                    this.$refs.line.renderChart();
-                }, 300);
-            }
+        activated(){
+            this.handleListener();
+        },
+        deactivated(){
+            window.removeEventListener('resize', this.renderChart);
+            bus.$off('collapse', this.handleBus);
         },
         methods: {
             changeDate(){
@@ -218,6 +209,20 @@
                     const date = new Date(now - (6 - index) * 86400000);
                     item.name = `${date.getFullYear()}/${date.getMonth()+1}/${date.getDate()}`
                 })
+            },
+            handleListener(){
+                bus.$on('collapse', this.handleBus);
+                // 调用renderChart方法对图表进行重新渲染
+                window.addEventListener('resize', this.renderChart)
+            },
+            handleBus(msg){
+                setTimeout(() => {
+                    this.renderChart()
+                }, 300);
+            },
+            renderChart(){
+                this.$refs.bar.renderChart();
+                this.$refs.line.renderChart();
             }
         }
     }
-- 
GitLab