From a271e498c7de95b0c217a20cb5aac892c5eea261 Mon Sep 17 00:00:00 2001
From: jn517618 <jn517618@163.com>
Date: Thu, 11 Jan 2024 13:38:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../energySourcesProvince/component/measure.vue     |  7 ++++++-
 .../energySourcesProvince/component/pathMap.vue     | 13 ++++++++++---
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/energySourcesProvince/component/measure.vue b/src/views/energySourcesProvince/component/measure.vue
index 77df2b0..d83f3fe 100644
--- a/src/views/energySourcesProvince/component/measure.vue
+++ b/src/views/energySourcesProvince/component/measure.vue
@@ -128,7 +128,12 @@ export default {
             },
             data: [
               {
-                value: 1548, name: '碳减排占比',
+                value: 1548,
+                label: {
+                  formatter: function () {
+                    return '碳减排' + '\n' + '占比'; 
+                  }
+                },
                 itemStyle: {
                   color: '#39496d'
                 }
diff --git a/src/views/energySourcesProvince/component/pathMap.vue b/src/views/energySourcesProvince/component/pathMap.vue
index 35660ac..c4c6033 100644
--- a/src/views/energySourcesProvince/component/pathMap.vue
+++ b/src/views/energySourcesProvince/component/pathMap.vue
@@ -291,12 +291,12 @@ export default {
             <div>
               <div>用电量</div>
               <div class="mapslabel-b-font" style="color:#11F150;">${r.electricity}</div>
-              <span style="margin-top:0.06rem;display: inline-block;float: left;color:#11F150; font-family: Acumin-Pro-Condensed-Black-2;">kw·h</span>
+              <span style="color:#11F150;" class="mapslabel-b-font2">kw·h</span>
             </div>
             <div>
               <div>碳排放量</div>
               <div class="mapslabel-b-font" style="color:#FBB02D;">${r.carbon}</div>
-              <span style="margin-top:0.06rem;display: inline-block;float: left;color:#FBB02D;font-family: Acumin-Pro-Condensed-Black-2;">t</span>
+              <span class="mapslabel-b-font2" style="color:#FBB02D;">t</span>
             </div>
           </div>
         </div>
@@ -607,11 +607,18 @@ export default {
 
 .mapslabel-b .mapslabel-b-font {
   font-size: 0.24rem;
-  font-family: Acumin-Pro-Condensed-Black-2;
+  font-family: Acumin-Pro-Condensed-Regular-2;
   margin-top: 0.04rem;
   float: left;
 }
 
+.mapslabel-b .mapslabel-b-font2 {
+  margin-left: 0.02rem;
+  display: inline-block;
+  float: left;
+  font-family: Acumin-Pro-Condensed-Regular-2;
+}
+
 
 
 .BMap_bubble_pop .BMap_center {