From 2eca15e5ace9dc8cd30413a390a6d722973e613f Mon Sep 17 00:00:00 2001
From: qianming <qianming@anji-plus.com>
Date: Thu, 29 Jul 2021 19:34:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE=E6=94=AF?=
 =?UTF-8?q?=E6=8C=81=E6=B8=90=E5=8F=98=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/bigscreen/designer/tools.js  |  4 ++--
 .../widget/map/widgetAirBubbleMap.vue         | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index baaba81f..6153c603 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -5998,7 +5998,7 @@ const widgetTools = [
           {
             name: '地图块颜色',
             list: [
-/*              {
+              {
                 type: 'vue-color',
                 label: '0%处颜色',
                 name: 'font0PreColor',
@@ -6013,7 +6013,7 @@ const widgetTools = [
                 required: false,
                 placeholder: '',
                 value: '#061E3D'
-              },*/
+              },
               {
                 type: 'vue-color',
                 label: '高亮渐变色',
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue
index 62a7ac6d..fb4e5718 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/map/widgetAirBubbleMap.vue
@@ -443,6 +443,24 @@ export default {
     setOptionMapBlocak() {
       const optionsSetup = this.optionsSetup;
       const itemStyle = this.options.series[0]['itemStyle'];
+      const normal = {
+          //地图块颜色
+          areaColor: {
+            x: 0,
+            y: 0,
+            x2: 0,
+            y2: 1,
+            colorStops: [{
+              offset: 0,
+              color: optionsSetup.font0PreColor // 0% 处的颜色
+            }, {
+              offset: 1,
+              color: optionsSetup.font100PreColor // 100% 处的颜色
+            }],
+          },
+          borderColor: '#215495',
+          borderWidth: 1,
+        };
       //鼠标放置颜色加深
       const emphasis = {
         areaColor: {
@@ -459,6 +477,7 @@ export default {
           }],
         },
       };
+      itemStyle['normal'] = normal;
       itemStyle['emphasis'] = emphasis;
     },
     setOptionAirSize() {