feat--柱状对比图更新

report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-bar-compare.js

@@ -321,18 +321,6 @@ export const widgetBarCompare = {
               placeholder: '',
               value: '',
             },
-            {
-              type: 'el-select',
-              label: '数值位置',
-              name: 'positionXLeft',
-              required: false,
-              placeholder: '',
-              selectOptions: [
-                { code: 'bottom', name: '底部' },
-                { code: 'top', name: '顶部' },
-              ],
-              value: 'bottom'
-            },
             {
               type: 'vue-color',
               label: '数值颜色',
@@ -499,18 +487,6 @@ export const widgetBarCompare = {
               placeholder: '',
               value: '',
             },
-            {
-              type: 'el-select',
-              label: '数值位置',
-              name: 'positionXRight',
-              required: false,
-              placeholder: '',
-              selectOptions: [
-                { code: 'bottom', name: '底部' },
-                { code: 'top', name: '顶部' },
-              ],
-              value: 'bottom'
-            },
             {
               type: 'vue-color',
               label: '数值颜色',
@@ -579,7 +555,7 @@ export const widgetBarCompare = {
             {
               type: 'el-switch',
               label: '坐标轴显示',
-              name: 'lineXRight',
+              name: 'isShowAxisLineXRight',
               require: false,
               placeholder: '',
               value: false,
@@ -653,14 +629,14 @@ export const widgetBarCompare = {
         {
           name: 'Y轴设置',
           list: [
-            {
+/*            {
               type: 'el-switch',
               label: 'Y轴显示',
               name: 'isShowY',
               require: false,
               placeholder: '',
               value: true,
-            },
+            },*/
             {
               type: 'el-switch',
               label: '数值显示',
@@ -734,30 +710,6 @@ export const widgetBarCompare = {
               placeholder: '',
               value: ''
             },
-            {
-              type: 'el-switch',
-              label: '坐标轴显示',
-              name: 'isShowAxisLineY',
-              require: false,
-              placeholder: '',
-              value: false,
-            },
-            {
-              type: 'vue-color',
-              label: '坐标轴颜色',
-              name: 'lineColorY',
-              required: false,
-              placeholder: '',
-              value: '#fff',
-            },
-            {
-              type: 'el-input-number',
-              label: '坐标轴宽度',
-              name: 'lineWidthY',
-              required: false,
-              placeholder: '',
-              value: 1,
-            },
           ],
         },
         {

report-ui/src/views/bigscreenDesigner/designer/widget/bar/widgetBarCompareChart.vue

@@ -341,7 +341,7 @@ export default {
         type: "value",
         show: optionsSetup.isShowXLeft,
         inverse: true,
-        position: optionsSetup.positionXLeft,
+        position: "bottom",
         axisLabel: {
           // x轴
           show: optionsSetup.isShowAxisLabelXLeft,
@@ -388,10 +388,10 @@ export default {
       const xAxisRight = {
         max: optionsSetup.maxXRight !== "" ? optionsSetup.maxXRight : null,
         gridIndex: 2,
-        splitNumber: optionsSetup.splitNumberRight,
+        splitNumber: optionsSetup.splitNumberXRight,
         show: optionsSetup.isShowXRight,
         type: "value",
-        position: optionsSetup.positionXRight,
+        position: "bottom",
         axisLabel: {
           // x轴
           show: optionsSetup.isShowAxisLabelXRight,
@@ -405,14 +405,14 @@ export default {
         },
         axisLine: {
           //X轴线
-          show: optionsSetup.isShowAxisLineXLeft,
+          show: optionsSetup.isShowAxisLineXRight,
           lineStyle: {
             color: optionsSetup.lineColorXRight,
             width: optionsSetup.lineWidthXRight,
           },
         },
         axisTick: {
-          show: optionsSetup.isShowAxisLineXLeft,
+          show: optionsSetup.isShowAxisLineXRight,
           lineStyle: {
             color: optionsSetup.lineColorXRight,
             width: optionsSetup.lineWidthXRight,
@@ -438,8 +438,7 @@ export default {
         gridIndex: 1,
         type: "category",
         inverse: true,
-        position: "left",
-        show: optionsSetup.isShowY,
+        show: true,
         axisLabel: {
           show: optionsSetup.isShowAxisLabelY,
           interval: optionsSetup.textIntervalY,
@@ -453,18 +452,10 @@ export default {
           },
         },
         axisLine: {
-          show: optionsSetup.isShowAxisLineY,
-          lineStyle: {
-            color: optionsSetup.lineColorY,
-            width: optionsSetup.lineWidthY,
-          },
+          show: false,
         },
         axisTick: {
-          show: optionsSetup.isShowAxisLineY,
-          lineStyle: {
-            color: optionsSetup.lineColorY,
-            width: optionsSetup.lineWidthY,
-          },
+          show: false,
         },
       };
       this.options.yAxis[1] = yAxis;