堆叠图样式更新

report-ui/src/views/report/bigscreen/designer/tools.js

@@ -5711,7 +5711,7 @@ const widgetTools = [
               },
             ],
           },
-/*          {
+          {
             name: '标题设置',
             list: [
               {
@@ -5816,14 +5816,6 @@ const widgetTools = [
           {
             name: 'X轴设置',
             list: [
-              {
-                type: 'el-input-text',
-                label: '名称',
-                name: 'xName',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
               {
                 type: 'el-switch',
                 label: '显示',
@@ -5832,9 +5824,17 @@ const widgetTools = [
                 placeholder: '',
                 value: true,
               },
+              {
+                type: 'el-input-text',
+                label: 'X轴别名',
+                name: 'xName',
+                required: false,
+                placeholder: '',
+                value: ''
+              },
               {
                 type: 'vue-color',
-                label: '坐标名颜色',
+                label: '别名颜色',
                 name: 'xNameColor',
                 required: false,
                 placeholder: '',
@@ -5842,16 +5842,24 @@ const widgetTools = [
               },
               {
                 type: 'el-input-number',
-                label: '字体大小',
+                label: '别名字号',
                 name: 'xNameFontSize',
                 required: false,
                 placeholder: '',
-                value: 12
+                value: 14
+              },
+              {
+                type: 'el-switch',
+                label: '轴反转',
+                name: 'reversalX',
+                required: false,
+                placeholder: '',
+                value: false
               },
               {
                 type: 'el-slider',
                 label: '文字角度',
-                name: 'textAngle',
+                name: 'textAngleX',
                 required: false,
                 placeholder: '',
                 value: 0
@@ -5864,17 +5872,9 @@ const widgetTools = [
                 placeholder: '',
                 value: ''
               },
-              {
-                type: 'el-switch',
-                label: '轴反转',
-                name: 'reversalX',
-                required: false,
-                placeholder: '',
-                value: false
-              },
               {
                 type: 'vue-color',
-                label: '颜色',
+                label: '文字颜色',
                 name: 'Xcolor',
                 required: false,
                 placeholder: '',
@@ -5882,11 +5882,11 @@ const widgetTools = [
               },
               {
                 type: 'el-input-number',
-                label: '字号',
+                label: '文字字号',
                 name: 'fontSizeX',
                 required: false,
                 placeholder: '',
-                value: 12,
+                value: 14,
               },
               {
                 type: 'vue-color',
@@ -5918,14 +5918,6 @@ const widgetTools = [
           {
             name: 'Y轴设置',
             list: [
-              {
-                type: 'el-input-text',
-                label: '名称',
-                name: 'textNameY',
-                require: false,
-                placeholder: '',
-                value: ''
-              },
               {
                 type: 'el-switch',
                 label: '显示',
@@ -5934,9 +5926,17 @@ const widgetTools = [
                 placeholder: '',
                 value: true,
               },
+              {
+                type: 'el-input-text',
+                label: 'Y轴别名',
+                name: 'textNameY',
+                require: false,
+                placeholder: '',
+                value: ''
+              },
               {
                 type: 'vue-color',
-                label: '坐标名颜色',
+                label: '别名颜色',
                 name: 'NameColorY',
                 required: false,
                 placeholder: '',
@@ -5944,11 +5944,11 @@ const widgetTools = [
               },
               {
                 type: 'el-input-number',
-                label: '字体大小',
+                label: '别名字号',
                 name: 'NameFontSizeY',
                 required: false,
                 placeholder: '',
-                value: 12,
+                value: 14,
               },
               {
                 type: 'el-switch',
@@ -5958,9 +5958,17 @@ const widgetTools = [
                 placeholder: '',
                 value: false
               },
+              {
+                type: 'el-slider',
+                label: '文字角度',
+                name: 'textAngleY',
+                required: false,
+                placeholder: '',
+                value: 0
+              },
               {
                 type: 'vue-color',
-                label: '颜色',
+                label: '文字颜色',
                 name: 'colorY',
                 required: false,
                 placeholder: '',
@@ -5968,11 +5976,11 @@ const widgetTools = [
               },
               {
                 type: 'el-input-number',
-                label: '字号',
+                label: '文字字号',
                 name: 'fontSizeY',
                 required: false,
                 placeholder: '',
-                value: 12,
+                value: 14,
               },
               {
                 type: 'vue-color',
@@ -6042,7 +6050,7 @@ const widgetTools = [
               },
             ],
           },
-          /!*{
+          /*{
             name: '提示语设置',
             list: [
               {
@@ -6061,8 +6069,8 @@ const widgetTools = [
                 placeholder: '',
               },
             ],
-          },*!/
-          {
+          },*/
+          /*{
             name: '坐标轴边距设置',
             list: [
               {
@@ -6095,8 +6103,8 @@ const widgetTools = [
                 value: 10,
               },
             ],
-          },
-          {
+          },*/
+          /*{
             name: '图例操作',
             list: [
               {

report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue

@@ -93,18 +93,17 @@ export default {
   methods: {
     // 修改图标options属性
     editorOptions() {
-      //this.setOptionBar();
-      //this.setOptionsTitle();
-      //this.setOptionsX();
-      //this.setOptionsY();
-      //this.setOptionsTop();
+      this.setOptionsTitle();
+      this.setOptionsX();
+      this.setOptionsY();
+      this.setOptionsTop();
       //this.setOptionsTooltip();
       //this.setOptionsMargin();
       //this.setOptionsLegend();
       //this.setOptionsColor();
       this.setOptionsData();
     },
-    // 标题修改  对应数据内容例如ABC等的调整
+    // 标题修改
     setOptionsTitle() {
       const optionsCollapse = this.optionsSetup;
       const title = {};
@@ -136,7 +135,7 @@ export default {
           color: optionsCollapse.xNameColor,
           fontSize: optionsCollapse.xNameFontSize
         },
-        nameRotate: optionsCollapse.textAngle, // 文字角度
+        nameRotate: optionsCollapse.textAngleX, // 文字角度
         inverse: optionsCollapse.reversalX, // 轴反转
         axisLabel: {
           show: true,
@@ -176,6 +175,7 @@ export default {
         inverse: optionsCollapse.reversalY, // y轴反转
         axisLabel: {
           show: true,
+          rotate: optionsCollapse.textAngleY,// 文字角度
           textStyle: {
             color: optionsCollapse.colorY, // y轴 坐标文字颜色
             fontSize: optionsCollapse.fontSizeY
@@ -196,21 +196,6 @@ export default {
       };
       this.options.yAxis = yAxis;
     },
-    //柱体设置
-    setOptionBar() {
-      const optionsSetup = this.optionsSetup;
-      const series = this.options.series;
-      const itemStyle = {
-        borderRadius: optionsSetup.radius
-      }
-      const barWidth = optionsSetup.maxWidth;
-      for (const key in series) {
-        if (series[key].type == "bar") {
-          this.options.series[key].itemStyle = itemStyle
-        }
-      }
-      ;
-    },
     // 数值设定 or 柱体设置
     setOptionsTop() {
       const optionsCollapse = this.optionsSetup;
@@ -345,6 +330,14 @@ export default {
           data: data,
           barGap: "0%",
           barWidth : optionsSetup.maxWidth,
+          label : {
+            show: optionsSetup.isShow,
+            position: "top",
+            distance: 10,
+            fontSize: optionsSetup.fontSize,
+            color: optionsSetup.subTextColor,
+            fontWeight: optionsSetup.fontWeight
+          },
           itemStyle: {
             borderRadius: null
           }