From 3d7c1067ec66856ab4faeacd5c66407d264e6267 Mon Sep 17 00:00:00 2001
From: qianming <qianming@anji-plus.com>
Date: Wed, 1 Sep 2021 10:35:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=90=E5=8F=98=E8=89=B2=E6=9F=B1=E5=BD=A2?=
 =?UTF-8?q?=E5=9B=BEy=E8=BD=B4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../componentsJSON/widget-gradient-barchart.js   | 16 ++++++++++++----
 .../widget/bar/widgetGradientColorBarchart.vue   |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js
index c823e321..b32528a4 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools/componentsJSON/widget-gradient-barchart.js
@@ -1,6 +1,6 @@
 /*
  * @Descripttion: 柱状图渐变色 json
- * @version: 
+ * @version:
  * @Author: qianlishi
  * @Date: 2021-08-29 07:23:41
  * @LastEditors: qianlishi
@@ -298,10 +298,18 @@ export const widgetGradientBarchart =  {
                 placeholder: '',
                 value: 0
               },
+              {
+                type: 'el-switch',
+                label: '缩放',
+                name: 'scale',
+                require: false,
+                placeholder: '',
+                value: false,
+              },
               {
                 type: 'el-input-number',
-                label: '文字间隔',
-                name: 'ytextInterval',
+                label: '均分',
+                name: 'splitNumber',
                 required: false,
                 placeholder: '',
                 value: ''
@@ -564,4 +572,4 @@ export const widgetGradientBarchart =  {
         },
       ],
     }
-  }
\ No newline at end of file
+  }
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 d1f38a2f..b3880e7b 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
@@ -241,12 +241,13 @@ export default {
       const optionsCollapse = this.optionsSetup;
       const yAxis = {
         type: "value",
+        scale : optionsCollapse.scale,
+        splitNumber: optionsCollapse.splitNumber,// 均分
         show: optionsCollapse.isShowY, // 坐标轴是否显示
         name: optionsCollapse.textNameY, // 坐标轴名称
         inverse: optionsCollapse.reversalY, // 轴反转
         axisLabel: {
           show: true,
-          interval: optionsCollapse.ytextInterval, // 文字间隔
           rotate: optionsCollapse.ytextAngle, // 文字角度
           textStyle: {
             color: optionsCollapse.colorY, // y轴 坐标文字颜色