From 93850b9aee34d3a66c2770a1eb0435ce104e772f Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 15 四月 2021 15:20:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop

---
 src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
index a6d8e09..61a58f1 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/Echarts.vue
@@ -811,7 +811,7 @@
           }
         }, { // 娴侀噺杞�
           type: 'value',
-          name: '娴侀噺(m3/h)',
+          name: '搴熸皵娴侀噺(m3/h)',
           axisLabel: {
             formatter: '{value}',
             textStyle: {
@@ -1067,6 +1067,7 @@
       padding: 0;
       border-color:#00fff6;
       text-align: center;
+      z-index: 9999;
       //padding-left:20px ;
       //padding: 0!important;
     }

--
Gitblit v1.8.0