From 974ee1162baf9d1ec5ec46c263e495edc840ae54 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 12 Dec 2018 15:11:16 +0800
Subject: [PATCH] 道闸

---
 src/components/allPieChart.vue | 16 +++++-----------
 src/components/barChart.vue    |  9 ++++-----
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/src/components/allPieChart.vue b/src/components/allPieChart.vue
index be2e20f..5f9e036 100644
--- a/src/components/allPieChart.vue
+++ b/src/components/allPieChart.vue
@@ -4,8 +4,6 @@
 
 <script>
 import echarts from 'echarts'
-
-require('echarts/theme/macarons') // echarts theme
 import {debounce} from '../utils/debounce'
 
 export default {
@@ -21,7 +19,7 @@ export default {
     },
     height: {
       type: String,
-      default: '205px'
+      default: '100%'
     },
     autoResize: {
       type: Boolean,
@@ -35,7 +33,6 @@ export default {
   data() {
     return {
       chart: null,
-      sidebarElm: null
     }
   },
   watch: {
@@ -61,7 +58,6 @@ export default {
     if (this.autoResize) {
       window.removeEventListener('resize', this.__resizeHandler)
     }
-
     this.chart.dispose()
     this.chart = null
   },
@@ -109,8 +105,9 @@ export default {
           {
             name: '半径模式',
             type: 'pie',
-            radius: ['20%', '100%'],
+            radius: ['20%', '90%'],
             center: ['50%', '50%'],
+            hoverAnimation:false,
             roseType: 'radius',
             label: {
               show: false
@@ -156,17 +153,14 @@ export default {
 
             ],
             animationType: 'scale',
-            animationEasing: 'elasticOut',
-            animationDelay: function(idx) {
-              return Math.random() * 200;
-            }
+            animationEasing: 'elasticOut'
           }
 
         ]
       })
     },
     initChart() {
-      this.chart = echarts.init(this.$el, 'macarons')
+      this.chart = echarts.init(this.$el)
       this.setOptions(this.chartData)
     }
   }
diff --git a/src/components/barChart.vue b/src/components/barChart.vue
index b69f351..9a73e96 100644
--- a/src/components/barChart.vue
+++ b/src/components/barChart.vue
@@ -32,8 +32,7 @@ export default {
   },
   data() {
     return {
-      chart: null,
-      sidebarElm: null
+      chart: null
     }
   },
   watch: {
@@ -116,9 +115,9 @@ export default {
           top: 10,
           containLabel: true
         },
-        // tooltip: {
-        //
-        // },
+        tooltip: {
+
+        },
         yAxis: {
           axisLabel : {
             formatter: '{value}',
--
libgit2 0.21.4