From 1525595546be911302e71fcba57eedc806b49122 Mon Sep 17 00:00:00 2001
From: qianming <qianming@anji-plus.com>
Date: Thu, 19 Aug 2021 14:40:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/report/bigscreen/designer/tools.js  | 24 +++++++++++++++++--
 .../widget/bar/widgetBarStackChart.vue        |  8 +++----
 .../bar/widgetGradientColorBarchart.vue       |  3 +--
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index 860f5c2f..e9aceb81 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -2250,6 +2250,26 @@ const widgetTools = [
               },
             ],
           },
+          {
+            name: '提示语设置',
+            list: [
+              {
+                type: 'el-input-number',
+                label: '字体大小',
+                name: 'tipsFontSize',
+                required: false,
+                placeholder: '',
+                value: 16
+              },
+              {
+                type: 'vue-color',
+                label: '字体颜色',
+                name: 'lineColor',
+                required: false,
+                placeholder: '',
+              },
+            ],
+          },
           {
             name: '坐标轴边距设置',
             list: [
@@ -6050,7 +6070,7 @@ const widgetTools = [
               },
             ],
           },
-          /*{
+          {
             name: '提示语设置',
             list: [
               {
@@ -6069,7 +6089,7 @@ const widgetTools = [
                 placeholder: '',
               },
             ],
-          },*/
+          },
           /*{
             name: '坐标轴边距设置',
             list: [
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue
index b3fee286..3ee18515 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue
@@ -97,7 +97,7 @@ export default {
       this.setOptionsX();
       this.setOptionsY();
       this.setOptionsTop();
-      //this.setOptionsTooltip();
+      this.setOptionsTooltip();
       //this.setOptionsMargin();
       //this.setOptionsLegend();
       //this.setOptionsColor();
@@ -215,8 +215,8 @@ export default {
       }
       this.options.series = series;
     },
-    // tooltip 设置
-    /*    setOptionsTooltip() {
+    // tooltip 提示语设置，鼠标放置显示
+        setOptionsTooltip() {
           const optionsCollapse = this.optionsSetup;
           const tooltip = {
             trigger: "item",
@@ -227,7 +227,7 @@ export default {
             }
           };
           this.options.tooltip = tooltip;
-        },*/
+        },
     // 边距设置
     setOptionsMargin() {
       const optionsCollapse = this.optionsSetup;
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue
index b0e069ca..d1f38a2f 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetGradientColorBarchart.vue
@@ -283,12 +283,11 @@ export default {
             fontWeight: optionsCollapse.fontWeight
           };
           series[key].barWidth = optionsCollapse.maxWidth;
-          //series[key].barMinHeight = optionsCollapse.minHeight;
         }
       }
       this.options.series = series;
     },
-    // tooltip 设置
+    // tooltip 提示语设置
     setOptionsTooltip() {
       const optionsCollapse = this.optionsSetup;
       const tooltip = {