Browse Source

柱状对比图功能更新

qianming 4 years ago
parent
commit
2d69abb5a4

+ 21 - 5
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: [

+ 2 - 2
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轴