From 2d69abb5a49ee42133bb4d4ace460ec080a8066b Mon Sep 17 00:00:00 2001
From: qianming <qianming@anji-plus.com>
Date: Fri, 27 Aug 2021 10:49:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=B1=E7=8A=B6=E5=AF=B9=E6=AF=94=E5=9B=BE?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=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  | 26 +++++++++++++++----
 .../widget/bar/widgetBarCompareChart.vue      |  4 +--
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js
index fa14dc0d..0705bdeb 100644
--- a/report-ui/src/views/report/bigscreen/designer/tools.js
+++ b/report-ui/src/views/report/bigscreen/designer/tools.js
@@ -7151,6 +7151,14 @@ const widgetTools = [
                 placeholder: '',
                 value: 14,
               },
+              {
+                type: 'el-switch',
+                label: '刻度线',
+                name: 'tickLineLeft',
+                require: false,
+                placeholder: '',
+                value: false,
+              },
               {
                 type: 'el-switch',
                 label: 'X轴线',
@@ -7236,6 +7244,14 @@ const widgetTools = [
                 placeholder: '',
                 value: 14,
               },
+              {
+                type: 'el-switch',
+                label: '刻度线',
+                name: 'tickLineLeft',
+                require: false,
+                placeholder: '',
+                value: false,
+              },
               {
                 type: 'el-switch',
                 label: 'X轴线',
@@ -7362,7 +7378,7 @@ const widgetTools = [
                 value: '#fff',
               }, {
                 type: 'el-switch',
-                label: '分割线显示',
+                label: 'y轴线显示',
                 name: 'isShowSplitLineY',
                 require: false,
                 placeholder: '',
@@ -7384,7 +7400,7 @@ const widgetTools = [
               {
                 type: 'el-switch',
                 label: '显示',
-                name: 'isShow',
+                name: 'isShowY',
                 required: false,
                 placeholder: '',
                 value: true
@@ -7392,7 +7408,7 @@ const widgetTools = [
               {
                 type: 'el-input-number',
                 label: '字体大小',
-                name: 'fontSize',
+                name: 'fontSizeY',
                 required: false,
                 placeholder: '',
                 value: 14
@@ -7400,7 +7416,7 @@ const widgetTools = [
               {
                 type: 'vue-color',
                 label: '字体颜色',
-                name: 'subTextColor',
+                name: 'subTextColorY',
                 required: false,
                 placeholder: '',
                 value: '#fff'
@@ -7408,7 +7424,7 @@ const widgetTools = [
               {
                 type: 'el-select',
                 label: '字体粗细',
-                name: 'fontWeight',
+                name: 'fontWeightY',
                 required: false,
                 placeholder: '',
                 selectOptions: [
diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue
index 54b20f6b..4e00cc0a 100644
--- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue
+++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarCompareChart.vue
@@ -312,7 +312,7 @@ export default {
           },
         },
         axisTick: {
-          show: false,
+          show: optionsSetup.tickLineLeft,
         },
         position: 'bottom',
         axisLabel: { // x轴
@@ -347,7 +347,7 @@ export default {
           },
         },
         axisTick: {
-          show: false,
+          show: optionsSetup.tickLineRight,
         },
         position: 'bottom',
         axisLabel: { // x轴