From a797577e17a9609f7da7cdba0cc3c08fcd720bc7 Mon Sep 17 00:00:00 2001
From: qianming <isqianming@163.com>
Date: Fri, 10 Jun 2022 17:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96--=E4=B8=AD=E5=9B=BD=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE-=E6=B0=94=E6=B3=A1=E5=9C=B0=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/configure/widget-airbubble-map.js   | 10 +++++++-
 .../widget/map/widgetAirBubbleMap.vue         | 24 +++++--------------
 2 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js
index 979c7da5..363a03ad 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js
+++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/widget-airbubble-map.js
@@ -134,8 +134,16 @@ export const widgetAirbubbleMap = {
           ],
         },
         {
-          name: '字体设置',
+          name: '地图设置',
           list: [
+            {
+              type: 'el-switch',
+              label: '文字显示',
+              name: 'isShowMap',
+              required: false,
+              placeholder: '',
+              value: true
+            },
             {
               type: 'el-input-number',
               label: '文字大小',
diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
index e8d08a65..f16f75ae 100644
--- a/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
+++ b/report-ui/src/views/bigscreenDesigner/designer/widget/map/widgetAirBubbleMap.vue
@@ -215,24 +215,12 @@ export default {
       options: {
         //backgroundColor: '#0F1C3C',
         tooltip: {
-          show: true,
-          formatter: function(params) {
-            if (params.value.length > 1) {
-              return (
-                "&nbsp;&nbsp;" +
-                params.name +
-                "&nbsp;&nbsp;&nbsp;" +
-                params.value[2] +
-                "&nbsp;&nbsp;"
-              );
+          trigger: 'item',
+          formatter: function (params) {
+            if (params.value.length >1 ) {
+              return params.data.name + "" + params.data.value[2];
             } else {
-              return (
-                "&nbsp;&nbsp;" +
-                params.name +
-                "&nbsp;&nbsp;&nbsp;" +
-                params.value +
-                "&nbsp;&nbsp;"
-              );
+              return params.name;
             }
           }
         },
@@ -472,7 +460,7 @@ export default {
       const label = this.options.series[0]["label"];
       const normal = {
         position: "right",
-        show: true,
+        show: optionsSetup.isShowMap,
         color: optionsSetup.fontTextColor,
         fontSize: optionsSetup.fontTextSize,
         fontWeight: optionsSetup.fontTextWeight