From 02d848bf39005e83882a87f8bc322d8499b92fbc Mon Sep 17 00:00:00 2001
From: whychdw <49690745@qq.com>
Date: 星期六, 29 八月 2020 10:05:44 +0800
Subject: [PATCH] 提交修改

---
 src/components/chart/BarChart.vue |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/components/chart/BarChart.vue b/src/components/chart/BarChart.vue
index e93e51d..aadb3c8 100644
--- a/src/components/chart/BarChart.vue
+++ b/src/components/chart/BarChart.vue
@@ -35,6 +35,10 @@
         unit: {
             type: String,
             default: '',
+        },
+        showLabel: {
+            type: Boolean,
+            default: true,
         }
     },
     methods:{
@@ -52,8 +56,11 @@
                     },
                     formatter(params){
                         var res = params[0].name+'<br/>';
-                        res+= params[0].seriesName;
-                        res+=' : '+params[0].data[1]+unit+'</br>';
+                        params.forEach(item=>{
+                            res += item.marker;
+                            res += item.seriesName;
+                            res +=' : '+item.data[1]+unit+'</br>';
+                        });
                         return res;
                     }
                 },
@@ -131,22 +138,29 @@
 
                 // 鏄剧ず鏁版嵁
                 item.label= {
-                    show: true,
+                    show: this.showLabel,
                     position: 'top',
                     color: '#fff',
                 };
-
-                // 璁剧疆鑳屾櫙
-                item.itemStyle = {
-                    color: function(value) {
-                        let val = value.value[1];
-                        if(val == max) {
-                            return 'green';
-                        }else if(val == min) {
-                            return 'red';
+                // 璁剧疆棰滆壊
+                if(item.hColor) {
+                    // 璁剧疆鑳屾櫙
+                    item.itemStyle = {
+                        color: item.hColor,
+                    };
+                }else {
+                    // 璁剧疆鑳屾櫙
+                    item.itemStyle = {
+                        color: function(value) {
+                            let val = value.value[1];
+                            if(val == max) {
+                                return 'green';
+                            }else if(val == min) {
+                                return 'red';
+                            }
                         }
-                    }
-                };
+                    };
+                }
                 return item;
             });
             // 杩斿洖

--
Gitblit v1.9.1