柱、线图XY配置项调整

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

@@ -6,681 +6,697 @@
  * @LastEditors: qianlishi
  * @LastEditTime: 2021-09-28 14:11:09
  */
-export const widgetBarStack =  {
-    code: 'widgetBarStackChart',
-    type: 'barChart',
-    tabName: '柱状图',
-    label: '柱状堆叠图',
-    icon: 'iconbianzu23',
-    options: {
-      // 配置
-      setup: [
-        {
-          type: 'el-input-text',
-          label: '图层名称',
-          name: 'layerName',
-          required: false,
-          placeholder: '',
-          value: '柱状堆叠图',
-        },
-        {
-          type: 'el-switch',
-          label: '竖展示',
-          name: 'verticalShow',
-          required: false,
-          placeholder: '',
-          value: false,
-        },
-        {
-          type: 'vue-color',
-          label: '背景颜色',
-          name: 'background',
-          required: false,
-          placeholder: '',
-          value: ''
-        },
+export const widgetBarStack = {
+  code: 'widgetBarStackChart',
+  type: 'barChart',
+  tabName: '柱状图',
+  label: '柱状堆叠图',
+  icon: 'iconbianzu23',
+  options: {
+    // 配置
+    setup: [
+      {
+        type: 'el-input-text',
+        label: '图层名称',
+        name: 'layerName',
+        required: false,
+        placeholder: '',
+        value: '柱状堆叠图',
+      },
+      {
+        type: 'el-switch',
+        label: '竖展示',
+        name: 'verticalShow',
+        required: false,
+        placeholder: '',
+        value: false,
+      },
+      {
+        type: 'vue-color',
+        label: '背景颜色',
+        name: 'background',
+        required: false,
+        placeholder: '',
+        value: ''
+      },
+      {
+        type: 'el-select',
+        label: '堆叠样式',
+        name: 'stackStyle',
+        required: false,
+        placeholder: '',
+        selectOptions: [
+          {code: 'leftRight', name: '左右堆叠'},
+          {code: 'upDown', name: '上下堆叠'},
+        ],
+        value: 'leftRight'
+      },
+      [
         {
-          type: 'el-select',
-          label: '堆叠样式',
-          name: 'stackStyle',
-          required: false,
-          placeholder: '',
-          selectOptions: [
-            {code: 'leftRight', name: '左右堆叠'},
-            {code: 'upDown', name: '上下堆叠'},
+          name: '柱体设置',
+          list: [
+            {
+              type: 'el-slider',
+              label: '最大宽度',
+              name: 'maxWidth',
+              required: false,
+              placeholder: '',
+              value: 20,
+            },
+            {
+              type: 'el-slider',
+              label: '圆角',
+              name: 'radius',
+              require: false,
+              placeholder: '',
+              value: 5,
+            },
           ],
-          value: 'leftRight'
         },
-        [
-          {
-            name: '柱体设置',
-            list: [
-              {
-                type: 'el-slider',
-                label: '最大宽度',
-                name: 'maxWidth',
-                required: false,
-                placeholder: '',
-                value: 20,
-              },
-              {
-                type: 'el-slider',
-                label: '圆角',
-                name: 'radius',
-                require: false,
-                placeholder: '',
-                value: 5,
-              },
-            ],
-          },
-          {
-            name: '标题设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '标题显示',
-                name: 'isNoTitle',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: '标题名',
-                name: 'titleText',
-                required: false,
-                placeholder: '',
-                value: '',
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'textColor',
-                required: false,
-                placeholder: '',
-                value: '#FFD700'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'textFontSize',
-                required: false,
-                placeholder: '',
-                value: 20
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'textFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  { code: 'normal', name: '正常' },
-                  { code: 'bold', name: '粗体' },
-                  { code: 'bolder', name: '特粗体' },
-                  { code: 'lighter', name: '细体' }
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-select',
-                label: '字体风格',
-                name: 'textFontStyle',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  { code: 'normal', name: '正常' },
-                  { code: 'italic', name: 'italic斜体' },
-                  { code: 'oblique', name: 'oblique斜体' },
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-select',
-                label: '字体位置',
-                name: 'textAlign',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  { code: 'center', name: '居中' },
-                  { code: 'left', name: '左对齐' },
-                  { code: 'right', name: '右对齐' },
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-input-text',
-                label: '副标题名',
-                name: 'subText',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: 'rgba(30, 144, 255, 1)'
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'subTextFontSize',
-                required: false,
-                placeholder: '',
-                value: 20
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'subTextFontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  { code: 'normal', name: '正常' },
-                  { code: 'bold', name: '粗体' },
-                  { code: 'bolder', name: '特粗体' },
-                  { code: 'lighter', name: '细体' }
-                ],
-                value: 'normal'
-              },
-              {
-                type: 'el-select',
-                label: '字体风格',
-                name: 'subTextFontStyle',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  { code: 'normal', name: '正常' },
-                  { code: 'italic', name: 'italic斜体' },
-                  { code: 'oblique', name: 'oblique斜体' },
-                ],
-                value: 'normal'
-              },
-            ],
-          },
-          {
-            name: '图例操作',
-            list: [
-              {
-                type: 'el-switch',
-                label: '图例显示',
-                name: 'isShowLegend',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: '图例名称',
-                name: 'legendName',
-                required: false,
-                placeholder: '多值以'|'隔开',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'legendColor',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'legendFontSize',
-                required: false,
-                placeholder: '',
-                value: 12,
-              },
-              {
-                type: 'el-input-number',
-                label: '图例宽度',
-                name: 'legendWidth',
-                required: false,
-                placeholder: '',
-                value: 12,
-              },
-              {
-                type: 'el-select',
-                label: '横向位置',
-                name: 'lateralPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'center', name: '居中'},
-                  {code: 'left', name: '左对齐'},
-                  {code: 'right', name: '右对齐'},
-                ],
-                value: 'center'
-              },
-              {
-                type: 'el-select',
-                label: '纵向位置',
-                name: 'longitudinalPosition',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'top', name: '顶部'},
-                  {code: 'bottom', name: '底部'},
-                ],
-                value: 'top'
-              },
-              {
-                type: 'el-select',
-                label: '布局前置',
-                name: 'layoutFront',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'vertical', name: '竖排'},
-                  {code: 'horizontal', name: '横排'},
-                ],
-                value: 'horizontal'
-              },
-            ],
-          },
-          {
-            name: 'X轴设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'hideX',
-                required: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: 'X轴别名',
-                name: 'xName',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '别名颜色',
-                name: 'xNameColor',
-                required: false,
-                placeholder: '',
-                value: '#fff'
-              },
-              {
-                type: 'el-input-number',
-                label: '别名字号',
-                name: 'xNameFontSize',
-                required: false,
-                placeholder: '',
-                value: 14
-              },
-              {
-                type: 'el-switch',
-                label: '轴反转',
-                name: 'reversalX',
-                required: false,
-                placeholder: '',
-                value: false
-              },
-              {
-                type: 'el-slider',
-                label: '文字角度',
-                name: 'textAngleX',
-                required: false,
-                placeholder: '',
-                value: 0
-              },
-              {
-                type: 'el-input-number',
-                label: '文字间隔',
-                name: 'textInterval',
-                required: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '文字颜色',
-                name: 'Xcolor',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '文字字号',
-                name: 'fontSizeX',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'vue-color',
-                label: '轴颜色',
-                name: 'lineColorX',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-switch',
-                label: '分割线显示',
-                name: 'isShowSplitLineX',
-                require: false,
-                placeholder: '',
-                value: false,
-              },
-              {
-                type: 'vue-color',
-                label: '分割线颜色',
-                name: 'splitLineColorX',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-
-              }
-            ],
-          },
-          {
-            name: 'Y轴设置',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'isShowY',
-                require: false,
-                placeholder: '',
-                value: true,
-              },
-              {
-                type: 'el-input-text',
-                label: 'Y轴别名',
-                name: 'textNameY',
-                require: false,
-                placeholder: '',
-                value: ''
-              },
-              {
-                type: 'vue-color',
-                label: '别名颜色',
-                name: 'NameColorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '别名字号',
-                name: 'NameFontSizeY',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'el-switch',
-                label: '轴反转',
-                name: 'reversalY',
-                required: false,
-                placeholder: '',
-                value: false
-              },
-              {
-                type: 'el-slider',
-                label: '文字角度',
-                name: 'textAngleY',
-                required: false,
-                placeholder: '',
-                value: 0
-              },
-              {
-                type: 'vue-color',
-                label: '文字颜色',
-                name: 'colorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-input-number',
-                label: '文字字号',
-                name: 'fontSizeY',
-                required: false,
-                placeholder: '',
-                value: 14,
-              },
-              {
-                type: 'vue-color',
-                label: '轴颜色',
-                name: 'lineColorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              },
-              {
-                type: 'el-switch',
-                label: '分割线显示',
-                name: 'isShowSplitLineY',
-                require: false,
-                placeholder: '',
-                value: false,
-              }, {
-                type: 'vue-color',
-                label: '分割线颜色',
-                name: 'splitLineColorY',
-                required: false,
-                placeholder: '',
-                value: '#fff',
-              }
-            ],
-          },
-          {
-            name: '数值设定',
-            list: [
-              {
-                type: 'el-switch',
-                label: '显示',
-                name: 'isShow',
-                required: false,
-                placeholder: '',
-                value: false
-              },
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'fontSize',
-                required: false,
-                placeholder: '',
-                value: 14
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'subTextColor',
-                required: false,
-                placeholder: '',
-                value: '#fff'
-              },
-              {
-                type: 'el-select',
-                label: '字体粗细',
-                name: 'fontWeight',
-                required: false,
-                placeholder: '',
-                selectOptions: [
-                  {code: 'normal', name: '正常'},
-                  {code: 'bold', name: '粗体'},
-                  {code: 'bolder', name: '特粗体'},
-                  {code: 'lighter', name: '细体'}
-                ],
-                value: 'normal'
-              },
-            ],
-          },
-          {
-            name: '提示语设置',
-            list: [
-              {
-                type: 'el-input-number',
-                label: '字体字号',
-                name: 'tipsFontSize',
-                required: false,
-                placeholder: '',
-                value: 16
-              },
-              {
-                type: 'vue-color',
-                label: '字体颜色',
-                name: 'tipsColor',
-                required: false,
-                placeholder: '',
-                value: '#00FEFF'
-              },
-            ],
-          },
-          {
-            name: '坐标轴边距设置',
-            list: [
-              {
-                type: 'el-slider',
-                label: '左边距(像素)',
-                name: 'marginLeft',
-                required: false,
-                placeholder: '',
-                value: 10,
-              }, {
-                type: 'el-slider',
-                label: '顶边距(像素)',
-                name: 'marginTop',
-                required: false,
-                placeholder: '',
-                value: 50,
-              }, {
-                type: 'el-slider',
-                label: '右边距(像素)',
-                name: 'marginRight',
-                required: false,
-                placeholder: '',
-                value: 40,
-              }, {
-                type: 'el-slider',
-                label: '底边距(像素)',
-                name: 'marginBottom',
-                required: false,
-                placeholder: '',
-                value: 10,
-              },
-            ],
-          },
-          {
-            name: '自定义配色',
-            list: [
-              {
-                type: 'customColor',
-                label: '',
-                name: 'customColor',
-                required: false,
-                value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
-              },
-            ],
-          },
-        ],
-      ],
-      // 数据
-      data: [
         {
-          type: 'el-radio-group',
-          label: '数据类型',
-          name: 'dataType',
-          require: false,
-          placeholder: '',
-          selectValue: true,
-          selectOptions: [
+          name: '标题设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '标题显示',
+              name: 'isNoTitle',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '标题名',
+              name: 'titleText',
+              required: false,
+              placeholder: '',
+              value: '',
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'textColor',
+              required: false,
+              placeholder: '',
+              value: '#FFD700'
+            },
             {
-              code: 'staticData',
-              name: '静态数据',
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'textFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
             },
             {
-              code: 'dynamicData',
-              name: '动态数据',
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'textFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体风格',
+              name: 'textFontStyle',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体位置',
+              name: 'textAlign',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-input-text',
+              label: '副标题名',
+              name: 'subText',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: 'rgba(30, 144, 255, 1)'
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'subTextFontSize',
+              required: false,
+              placeholder: '',
+              value: 20
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'subTextFontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+            {
+              type: 'el-select',
+              label: '字体风格',
+              name: 'subTextFontStyle',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
+              ],
+              value: 'normal'
             },
           ],
-          value: 'staticData',
         },
         {
-          type: 'el-input-number',
-          label: '刷新时间(毫秒)',
-          name: 'refreshTime',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          value: 5000
+          name: '图例操作',
+          list: [
+            {
+              type: 'el-switch',
+              label: '图例显示',
+              name: 'isShowLegend',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '图例名称',
+              name: 'legendName',
+              required: false,
+              placeholder: '多值以' | '隔开',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'legendColor',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'legendFontSize',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'el-input-number',
+              label: '图例宽度',
+              name: 'legendWidth',
+              required: false,
+              placeholder: '',
+              value: 12,
+            },
+            {
+              type: 'el-select',
+              label: '横向位置',
+              name: 'lateralPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
+              ],
+              value: 'center'
+            },
+            {
+              type: 'el-select',
+              label: '纵向位置',
+              name: 'longitudinalPosition',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'top', name: '顶部'},
+                {code: 'bottom', name: '底部'},
+              ],
+              value: 'top'
+            },
+            {
+              type: 'el-select',
+              label: '布局前置',
+              name: 'layoutFront',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'vertical', name: '竖排'},
+                {code: 'horizontal', name: '横排'},
+              ],
+              value: 'horizontal'
+            },
+          ],
         },
         {
-          type: 'el-button',
-          label: '静态数据',
-          name: 'staticData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'staticData',
-          value: [
-            {"axis":"2021-07-25","name":"A","data":"12"},
-            {"axis":"2021-07-25","name":"B","data":"20"},
-            {"axis":"2021-07-26","name":"B","data":"5"},
-            {"axis":"2021-07-27","name":"A","data":"15"},
-            {"axis":"2021-07-27","name":"B","data":"30"},
+          name: 'X轴设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'hideX',
+              required: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '坐标名',
+              name: 'nameX',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '坐标名颜色',
+              name: 'nameColorX',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-input-number',
+              label: '坐标名字号',
+              name: 'nameFontSizeX',
+              required: false,
+              placeholder: '',
+              value: 14
+            },
+            {
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'colorX',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '文字字号',
+              name: 'fontSizeX',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'el-input-number',
+              label: '文字间隔',
+              name: 'textInterval',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
+            {
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalX',
+              required: false,
+              placeholder: '',
+              value: false
+            },
+            {
+              type: 'vue-color',
+              label: '轴颜色',
+              name: 'lineColorX',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-switch',
+              label: '分割线显示',
+              name: 'isShowSplitLineX',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '分割线颜色',
+              name: 'splitLineColorX',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            }
           ],
         },
         {
-          type: 'dycustComponents',
-          label: '',
-          name: 'dynamicData',
-          required: false,
-          placeholder: '',
-          relactiveDom: 'dataType',
-          relactiveDomValue: 'dynamicData',
-          chartType: 'widget-stackchart',
-          dictKey: 'STACK_PROPERTIES',
-          value: '',
+          name: 'Y轴设置',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShowY',
+              require: false,
+              placeholder: '',
+              value: true,
+            },
+            {
+              type: 'el-input-text',
+              label: '坐标名',
+              name: 'textNameY',
+              require: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'vue-color',
+              label: '坐标名颜色',
+              name: 'nameColorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '坐标名字号',
+              name: 'nameFontSizeY',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'vue-color',
+              label: '数值颜色',
+              name: 'colorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-input-number',
+              label: '数值字号',
+              name: 'fontSizeY',
+              required: false,
+              placeholder: '',
+              value: 14,
+            },
+            {
+              type: 'el-switch',
+              label: '缩放',
+              name: 'scale',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'el-input-number',
+              label: '均分',
+              name: 'splitNumberY',
+              required: false,
+              placeholder: '',
+              value: ''
+            },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleY',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
+            {
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalY',
+              required: false,
+              placeholder: '',
+              value: false
+            },
+            {
+              type: 'vue-color',
+              label: '轴颜色',
+              name: 'lineColorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+            {
+              type: 'el-switch',
+              label: '分割线显示',
+              name: 'isShowSplitLineY',
+              require: false,
+              placeholder: '',
+              value: false,
+            },
+            {
+              type: 'vue-color',
+              label: '分割线颜色',
+              name: 'splitLineColorY',
+              required: false,
+              placeholder: '',
+              value: '#fff',
+            },
+          ],
         },
-      ],
-      // 坐标
-      position: [
         {
-          type: 'el-input-number',
-          label: '左边距',
-          name: 'left',
-          required: false,
-          placeholder: '',
-          value: 0,
+          name: '数值设定',
+          list: [
+            {
+              type: 'el-switch',
+              label: '显示',
+              name: 'isShow',
+              required: false,
+              placeholder: '',
+              value: false
+            },
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'fontSize',
+              required: false,
+              placeholder: '',
+              value: 14
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'subTextColor',
+              required: false,
+              placeholder: '',
+              value: '#fff'
+            },
+            {
+              type: 'el-select',
+              label: '字体粗细',
+              name: 'fontWeight',
+              required: false,
+              placeholder: '',
+              selectOptions: [
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
+              ],
+              value: 'normal'
+            },
+          ],
         },
         {
-          type: 'el-input-number',
-          label: '上边距',
-          name: 'top',
-          required: false,
-          placeholder: '',
-          value: 0,
+          name: '提示语设置',
+          list: [
+            {
+              type: 'el-input-number',
+              label: '字体字号',
+              name: 'tipsFontSize',
+              required: false,
+              placeholder: '',
+              value: 16
+            },
+            {
+              type: 'vue-color',
+              label: '字体颜色',
+              name: 'tipsColor',
+              required: false,
+              placeholder: '',
+              value: '#00FEFF'
+            },
+          ],
         },
         {
-          type: 'el-input-number',
-          label: '宽度',
-          name: 'width',
-          required: false,
-          placeholder: '该容器在1920px大屏中的宽度',
-          value: 500,
+          name: '坐标轴边距设置',
+          list: [
+            {
+              type: 'el-slider',
+              label: '左边距(像素)',
+              name: 'marginLeft',
+              required: false,
+              placeholder: '',
+              value: 10,
+            }, {
+              type: 'el-slider',
+              label: '顶边距(像素)',
+              name: 'marginTop',
+              required: false,
+              placeholder: '',
+              value: 50,
+            }, {
+              type: 'el-slider',
+              label: '右边距(像素)',
+              name: 'marginRight',
+              required: false,
+              placeholder: '',
+              value: 40,
+            }, {
+              type: 'el-slider',
+              label: '底边距(像素)',
+              name: 'marginBottom',
+              required: false,
+              placeholder: '',
+              value: 10,
+            },
+          ],
         },
         {
-          type: 'el-input-number',
-          label: '高度',
-          name: 'height',
-          required: false,
-          placeholder: '该容器在1080px大屏中的高度',
-          value: 250,
+          name: '自定义配色',
+          list: [
+            {
+              type: 'customColor',
+              label: '',
+              name: 'customColor',
+              required: false,
+              value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
+            },
+          ],
         },
       ],
-    }
+    ],
+    // 数据
+    data: [
+      {
+        type: 'el-radio-group',
+        label: '数据类型',
+        name: 'dataType',
+        require: false,
+        placeholder: '',
+        selectValue: true,
+        selectOptions: [
+          {
+            code: 'staticData',
+            name: '静态数据',
+          },
+          {
+            code: 'dynamicData',
+            name: '动态数据',
+          },
+        ],
+        value: 'staticData',
+      },
+      {
+        type: 'el-input-number',
+        label: '刷新时间(毫秒)',
+        name: 'refreshTime',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        value: 5000
+      },
+      {
+        type: 'el-button',
+        label: '静态数据',
+        name: 'staticData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'staticData',
+        value: [
+          {"axis": "2021-07-25", "name": "A", "data": "12"},
+          {"axis": "2021-07-25", "name": "B", "data": "20"},
+          {"axis": "2021-07-26", "name": "B", "data": "5"},
+          {"axis": "2021-07-27", "name": "A", "data": "15"},
+          {"axis": "2021-07-27", "name": "B", "data": "30"},
+        ],
+      },
+      {
+        type: 'dycustComponents',
+        label: '',
+        name: 'dynamicData',
+        required: false,
+        placeholder: '',
+        relactiveDom: 'dataType',
+        relactiveDomValue: 'dynamicData',
+        chartType: 'widget-stackchart',
+        dictKey: 'STACK_PROPERTIES',
+        value: '',
+      },
+    ],
+    // 坐标
+    position: [
+      {
+        type: 'el-input-number',
+        label: '左边距',
+        name: 'left',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '上边距',
+        name: 'top',
+        required: false,
+        placeholder: '',
+        value: 0,
+      },
+      {
+        type: 'el-input-number',
+        label: '宽度',
+        name: 'width',
+        required: false,
+        placeholder: '该容器在1920px大屏中的宽度',
+        value: 500,
+      },
+      {
+        type: 'el-input-number',
+        label: '高度',
+        name: 'height',
+        required: false,
+        placeholder: '该容器在1080px大屏中的高度',
+        value: 250,
+      },
+    ],
   }
+}

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

@@ -111,10 +111,10 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -125,9 +125,9 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -138,9 +138,9 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -175,10 +175,10 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -189,9 +189,9 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -211,7 +211,7 @@ export const widgetBarchart = {
             {
               type: 'el-input-text',
               label: '坐标名',
-              name: 'xName',
+              name: 'nameX',
               required: false,
               placeholder: '',
               value: ''
@@ -226,7 +226,7 @@ export const widgetBarchart = {
             },
             {
               type: 'el-input-number',
-              label: '坐标字号',
+              label: '坐标名字号',
               name: 'nameFontSizeX',
               required: false,
               placeholder: '',
@@ -234,35 +234,35 @@ export const widgetBarchart = {
             },
             {
               type: 'vue-color',
-              label: '数值颜色',
-              name: 'Xcolor',
+              label: '文字颜色',
+              name: 'colorX',
               required: false,
               placeholder: '',
               value: '#fff',
             },
             {
               type: 'el-input-number',
-              label: '数值字号',
+              label: '文字字号',
               name: 'fontSizeX',
               required: false,
               placeholder: '',
               value: 14,
             },
             {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngle',
+              type: 'el-input-number',
+              label: '文字间隔',
+              name: 'textInterval',
               required: false,
               placeholder: '',
-              value: 0
+              value: ''
             },
             {
-              type: 'el-input-number',
-              label: '数值间隔',
-              name: 'textInterval',
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
               required: false,
               placeholder: '',
-              value: ''
+              value: 0
             },
             {
               type: 'el-switch',
@@ -295,7 +295,6 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               value: '#fff',
-
             }
           ],
         },
@@ -328,7 +327,7 @@ export const widgetBarchart = {
             },
             {
               type: 'el-input-number',
-              label: '坐标字号',
+              label: '坐标名字号',
               name: 'nameFontSizeY',
               required: false,
               placeholder: '',
@@ -350,14 +349,6 @@ export const widgetBarchart = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'ytextAngle',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-switch',
               label: '缩放',
@@ -369,11 +360,19 @@ export const widgetBarchart = {
             {
               type: 'el-input-number',
               label: '均分',
-              name: 'splitNumber',
+              name: 'splitNumberY',
               required: false,
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleY',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'el-switch',
               label: '轴反转',
@@ -389,22 +388,23 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               value: '#fff',
-            }, {
+            },
+            {
               type: 'el-switch',
               label: '分割线显示',
               name: 'isShowSplitLineY',
               require: false,
               placeholder: '',
               value: false,
-            }, {
+            },
+            {
               type: 'vue-color',
               label: '分割线颜色',
               name: 'splitLineColorY',
               required: false,
               placeholder: '',
               value: '#fff',
-
-            }
+            },
           ],
         },
         {
@@ -449,10 +449,10 @@ export const widgetBarchart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -521,7 +521,7 @@ export const widgetBarchart = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
+              value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
             },
           ],
         },
@@ -565,11 +565,11 @@ export const widgetBarchart = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          { "axis": "苹果", "data": 1000 },
-          { "axis": "三星", "data": 2229 },
-          { "axis": "小米", "data": 3879 },
-          { "axis": "oppo", "data": 2379 },
-          { "axis": "vivo", "data": 4079 },
+          {"axis": "苹果", "data": 1000},
+          {"axis": "三星", "data": 2229},
+          {"axis": "小米", "data": 3879},
+          {"axis": "oppo", "data": 2379},
+          {"axis": "vivo", "data": 4079},
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/barCharts/widget-gradient-barchart.js

@@ -203,7 +203,7 @@ export const widgetGradientBarchart = {
             {
               type: 'el-input-text',
               label: '坐标名',
-              name: 'xName',
+              name: 'nameX',
               required: false,
               placeholder: '',
               value: ''
@@ -214,47 +214,47 @@ export const widgetGradientBarchart = {
               name: 'nameColorX',
               required: false,
               placeholder: '',
-              value: '#fff',
+              value: '#fff'
             },
             {
               type: 'el-input-number',
-              label: '坐标字号',
+              label: '坐标名字号',
               name: 'nameFontSizeX',
               required: false,
               placeholder: '',
-              value: 14,
+              value: 14
             },
             {
               type: 'vue-color',
-              label: '数值颜色',
-              name: 'Xcolor',
+              label: '文字颜色',
+              name: 'colorX',
               required: false,
               placeholder: '',
               value: '#fff',
             },
             {
               type: 'el-input-number',
-              label: '数值字号',
+              label: '文字字号',
               name: 'fontSizeX',
               required: false,
               placeholder: '',
               value: 14,
             },
             {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngle',
+              type: 'el-input-number',
+              label: '文字间隔',
+              name: 'textInterval',
               required: false,
               placeholder: '',
-              value: 0
+              value: ''
             },
             {
-              type: 'el-input-number',
-              label: '数值间隔',
-              name: 'textInterval',
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
               required: false,
               placeholder: '',
-              value: ''
+              value: 0
             },
             {
               type: 'el-switch',
@@ -308,7 +308,8 @@ export const widgetGradientBarchart = {
               require: false,
               placeholder: '',
               value: ''
-            }, {
+            },
+            {
               type: 'vue-color',
               label: '坐标名颜色',
               name: 'nameColorY',
@@ -318,8 +319,8 @@ export const widgetGradientBarchart = {
             },
             {
               type: 'el-input-number',
-              label: '坐标字号',
-              name: 'namefontSizeY',
+              label: '坐标名字号',
+              name: 'nameFontSizeY',
               required: false,
               placeholder: '',
               value: 14,
@@ -340,14 +341,6 @@ export const widgetGradientBarchart = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'ytextAngle',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-switch',
               label: '缩放',
@@ -359,11 +352,19 @@ export const widgetGradientBarchart = {
             {
               type: 'el-input-number',
               label: '均分',
-              name: 'splitNumber',
+              name: 'splitNumberY',
               required: false,
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleY',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'el-switch',
               label: '轴反转',
@@ -395,7 +396,7 @@ export const widgetGradientBarchart = {
               required: false,
               placeholder: '',
               value: '#fff',
-            }
+            },
           ],
         },
         {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js

@@ -128,10 +128,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -142,9 +142,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -155,9 +155,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -192,10 +192,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -206,9 +206,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -264,9 +264,9 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -277,8 +277,8 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'top', name: '顶部' },
-                { code: 'bottom', name: '底部' },
+                {code: 'top', name: '顶部'},
+                {code: 'bottom', name: '底部'},
               ],
               value: 'top'
             },
@@ -289,8 +289,8 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'vertical', name: '竖排' },
-                { code: 'horizontal', name: '横排' },
+                {code: 'vertical', name: '竖排'},
+                {code: 'horizontal', name: '横排'},
               ],
               value: 'horizontal'
             },
@@ -309,7 +309,7 @@ export const widgetBarLineStack = {
             },
             {
               type: 'el-input-text',
-              label: '轴别名',
+              label: '坐标名',
               name: 'nameX',
               required: false,
               placeholder: '',
@@ -317,7 +317,7 @@ export const widgetBarLineStack = {
             },
             {
               type: 'vue-color',
-              label: '别名颜色',
+              label: '坐标名颜色',
               name: 'nameColorX',
               required: false,
               placeholder: '',
@@ -325,27 +325,27 @@ export const widgetBarLineStack = {
             },
             {
               type: 'el-input-number',
-              label: '别名字号',
+              label: '坐标名字号',
               name: 'nameFontSizeX',
               required: false,
               placeholder: '',
               value: 14
             },
             {
-              type: 'el-switch',
-              label: '轴反转',
-              name: 'reversalX',
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'colorX',
               required: false,
               placeholder: '',
-              value: false
+              value: '#fff',
             },
             {
-              type: 'el-slider',
-              label: '文字角度',
-              name: 'textAngleX',
+              type: 'el-input-number',
+              label: '文字字号',
+              name: 'fontSizeX',
               required: false,
               placeholder: '',
-              value: 0
+              value: 14,
             },
             {
               type: 'el-input-number',
@@ -356,20 +356,20 @@ export const widgetBarLineStack = {
               value: ''
             },
             {
-              type: 'vue-color',
-              label: '文字颜色',
-              name: 'colorX',
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
               required: false,
               placeholder: '',
-              value: '#fff',
+              value: 0
             },
             {
-              type: 'el-input-number',
-              label: '文字字号',
-              name: 'fontSizeX',
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalX',
               required: false,
               placeholder: '',
-              value: 14,
+              value: false
             },
             {
               type: 'vue-color',
@@ -448,14 +448,6 @@ export const widgetBarLineStack = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngleYLeft',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-input-number',
               label: '均分',
@@ -464,6 +456,14 @@ export const widgetBarLineStack = {
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleYLeft',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'vue-color',
               label: '轴颜色',
@@ -535,14 +535,6 @@ export const widgetBarLineStack = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngleYRight',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-input-number',
               label: '均分',
@@ -551,6 +543,14 @@ export const widgetBarLineStack = {
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleYRight',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'vue-color',
               label: '轴颜色',
@@ -619,10 +619,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -670,10 +670,10 @@ export const widgetBarLineStack = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -742,7 +742,7 @@ export const widgetBarLineStack = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{ color: '#ff7f50' }, { color: '#87cefa' }, { color: '#da70d6' }, { color: '#32cd32' }, { color: '#6495ed' }],
+              value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}],
             },
           ],
         },
@@ -786,16 +786,16 @@ export const widgetBarLineStack = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          { "axis": "2021-07", "name": "A", "bar": "12", "line": "20" },
-          { "axis": "2021-07", "name": "B", "bar": "20", "line": "12" },
-          { "axis": "2021-08", "name": "A", "bar": "0", "line": "8" },
-          { "axis": "2021-08", "name": "B", "bar": "5", "line": "3" },
-          { "axis": "2021-09", "name": "A", "bar": "15", "line": "9" },
-          { "axis": "2021-09", "name": "B", "bar": "30", "line": "19" },
-          { "axis": "2021-10", "name": "A", "bar": "10", "line": "27" },
-          { "axis": "2021-10", "name": "B", "bar": "24", "line": "6" },
-          { "axis": "2021-11", "name": "A", "bar": "23", "line": "29" },
-          { "axis": "2021-11", "name": "B", "bar": "8", "line": "9" },
+          {"axis": "2021-07", "name": "A", "bar": "12", "line": "20"},
+          {"axis": "2021-07", "name": "B", "bar": "20", "line": "12"},
+          {"axis": "2021-08", "name": "A", "bar": "0", "line": "8"},
+          {"axis": "2021-08", "name": "B", "bar": "5", "line": "3"},
+          {"axis": "2021-09", "name": "A", "bar": "15", "line": "9"},
+          {"axis": "2021-09", "name": "B", "bar": "30", "line": "19"},
+          {"axis": "2021-10", "name": "A", "bar": "10", "line": "27"},
+          {"axis": "2021-10", "name": "B", "bar": "24", "line": "6"},
+          {"axis": "2021-11", "name": "A", "bar": "23", "line": "29"},
+          {"axis": "2021-11", "name": "B", "bar": "8", "line": "9"},
         ],
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js

@@ -156,10 +156,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -170,9 +170,9 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -183,9 +183,9 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -220,10 +220,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -234,9 +234,9 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -292,9 +292,9 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -305,8 +305,8 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'top', name: '顶部' },
-                { code: 'bottom', name: '底部' },
+                {code: 'top', name: '顶部'},
+                {code: 'bottom', name: '底部'},
               ],
               value: 'top'
             },
@@ -317,8 +317,8 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'vertical', name: '竖排' },
-                { code: 'horizontal', name: '横排' },
+                {code: 'vertical', name: '竖排'},
+                {code: 'horizontal', name: '横排'},
               ],
               value: 'horizontal'
             },
@@ -337,7 +337,7 @@ export const widgetBarlinechart = {
             },
             {
               type: 'el-input-text',
-              label: '轴别名',
+              label: '坐标名',
               name: 'nameX',
               required: false,
               placeholder: '',
@@ -345,7 +345,7 @@ export const widgetBarlinechart = {
             },
             {
               type: 'vue-color',
-              label: '别名颜色',
+              label: '坐标名颜色',
               name: 'nameColorX',
               required: false,
               placeholder: '',
@@ -353,27 +353,27 @@ export const widgetBarlinechart = {
             },
             {
               type: 'el-input-number',
-              label: '别名字号',
+              label: '坐标名字号',
               name: 'nameFontSizeX',
               required: false,
               placeholder: '',
               value: 14
             },
             {
-              type: 'el-switch',
-              label: '轴反转',
-              name: 'reversalX',
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'colorX',
               required: false,
               placeholder: '',
-              value: false
+              value: '#fff',
             },
             {
-              type: 'el-slider',
-              label: '文字角度',
-              name: 'textAngleX',
+              type: 'el-input-number',
+              label: '文字字号',
+              name: 'fontSizeX',
               required: false,
               placeholder: '',
-              value: 0
+              value: 14,
             },
             {
               type: 'el-input-number',
@@ -384,20 +384,20 @@ export const widgetBarlinechart = {
               value: ''
             },
             {
-              type: 'vue-color',
-              label: '文字颜色',
-              name: 'colorX',
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
               required: false,
               placeholder: '',
-              value: '#fff',
+              value: 0
             },
             {
-              type: 'el-input-number',
-              label: '文字字号',
-              name: 'fontSizeX',
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalX',
               required: false,
               placeholder: '',
-              value: 14,
+              value: false
             },
             {
               type: 'vue-color',
@@ -476,14 +476,6 @@ export const widgetBarlinechart = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngleYLeft',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-input-number',
               label: '均分',
@@ -492,6 +484,14 @@ export const widgetBarlinechart = {
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleYLeft',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'vue-color',
               label: '轴颜色',
@@ -563,14 +563,6 @@ export const widgetBarlinechart = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngleYRight',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-input-number',
               label: '均分',
@@ -579,6 +571,14 @@ export const widgetBarlinechart = {
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleYRight',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'vue-color',
               label: '轴颜色',
@@ -647,10 +647,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -698,10 +698,10 @@ export const widgetBarlinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -770,7 +770,7 @@ export const widgetBarlinechart = {
               label: '',
               name: 'customColor',
               required: false,
-              value: [{ color: '#00F4FFFF' }, { color: '#e68b55' }],
+              value: [{color: '#00F4FFFF'}, {color: '#e68b55'}],
             },
           ],
         },
@@ -814,18 +814,18 @@ export const widgetBarlinechart = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          { "axis": "1月", "bar": 2.6, "line": 2 },
-          { "axis": "2月", "bar": 5.9, "line": 2.2 },
-          { "axis": "3月", "bar": 9, "line": 3.3 },
-          { "axis": "4月", "bar": 26.4, "line": 4.5 },
-          { "axis": "5月", "bar": 28.7, "line": 6.3 },
-          { "axis": "6月", "bar": 70.7, "line": 10.2 },
-          { "axis": "7月", "bar": 175.6, "line": 20.3 },
-          { "axis": "8月", "bar": 182.2, "line": 23.4 },
-          { "axis": "9月", "bar": 48.7, "line": 23 },
-          { "axis": "10月", "bar": 18.8, "line": 16.5 },
-          { "axis": "11月", "bar": 6, "line": 12 },
-          { "axis": "12月", "bar": 2.3, "line": 6.2 },
+          {"axis": "1月", "bar": 2.6, "line": 2},
+          {"axis": "2月", "bar": 5.9, "line": 2.2},
+          {"axis": "3月", "bar": 9, "line": 3.3},
+          {"axis": "4月", "bar": 26.4, "line": 4.5},
+          {"axis": "5月", "bar": 28.7, "line": 6.3},
+          {"axis": "6月", "bar": 70.7, "line": 10.2},
+          {"axis": "7月", "bar": 175.6, "line": 20.3},
+          {"axis": "8月", "bar": 182.2, "line": 23.4},
+          {"axis": "9月", "bar": 48.7, "line": 23},
+          {"axis": "10月", "bar": 18.8, "line": 16.5},
+          {"axis": "11月", "bar": 6, "line": 12},
+          {"axis": "12月", "bar": 2.3, "line": 6.2},
         ]
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js

@@ -148,10 +148,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -162,9 +162,9 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -175,9 +175,9 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -212,10 +212,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -226,9 +226,9 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -284,9 +284,9 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -297,8 +297,8 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'top', name: '顶部' },
-                { code: 'bottom', name: '底部' },
+                {code: 'top', name: '顶部'},
+                {code: 'bottom', name: '底部'},
               ],
               value: 'top'
             },
@@ -309,8 +309,8 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'vertical', name: '竖排' },
-                { code: 'horizontal', name: '横排' },
+                {code: 'vertical', name: '竖排'},
+                {code: 'horizontal', name: '横排'},
               ],
               value: 'horizontal'
             },
@@ -329,7 +329,7 @@ export const widgetMoreBarLine = {
             },
             {
               type: 'el-input-text',
-              label: '轴别名',
+              label: '坐标名',
               name: 'nameX',
               required: false,
               placeholder: '',
@@ -337,7 +337,7 @@ export const widgetMoreBarLine = {
             },
             {
               type: 'vue-color',
-              label: '别名颜色',
+              label: '坐标名颜色',
               name: 'nameColorX',
               required: false,
               placeholder: '',
@@ -345,27 +345,27 @@ export const widgetMoreBarLine = {
             },
             {
               type: 'el-input-number',
-              label: '别名字号',
+              label: '坐标名字号',
               name: 'nameFontSizeX',
               required: false,
               placeholder: '',
               value: 14
             },
             {
-              type: 'el-switch',
-              label: '轴反转',
-              name: 'reversalX',
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'colorX',
               required: false,
               placeholder: '',
-              value: false
+              value: '#fff',
             },
             {
-              type: 'el-slider',
-              label: '文字角度',
-              name: 'textAngleX',
+              type: 'el-input-number',
+              label: '文字字号',
+              name: 'fontSizeX',
               required: false,
               placeholder: '',
-              value: 0
+              value: 14,
             },
             {
               type: 'el-input-number',
@@ -376,20 +376,20 @@ export const widgetMoreBarLine = {
               value: ''
             },
             {
-              type: 'vue-color',
-              label: '文字颜色',
-              name: 'colorX',
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
               required: false,
               placeholder: '',
-              value: '#fff',
+              value: 0
             },
             {
-              type: 'el-input-number',
-              label: '文字字号',
-              name: 'fontSizeX',
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalX',
               required: false,
               placeholder: '',
-              value: 14,
+              value: false
             },
             {
               type: 'vue-color',
@@ -468,14 +468,6 @@ export const widgetMoreBarLine = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngleYLeft',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-input-number',
               label: '均分',
@@ -484,6 +476,14 @@ export const widgetMoreBarLine = {
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleYLeft',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'vue-color',
               label: '轴颜色',
@@ -555,14 +555,6 @@ export const widgetMoreBarLine = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngleYRight',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-input-number',
               label: '均分',
@@ -571,6 +563,14 @@ export const widgetMoreBarLine = {
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleYRight',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'vue-color',
               label: '轴颜色',
@@ -639,10 +639,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -690,10 +690,10 @@ export const widgetMoreBarLine = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -763,9 +763,9 @@ export const widgetMoreBarLine = {
               name: 'customColor',
               required: false,
               value: [
-                { color: '#4bdfff' },
-                { color: '#55f49c' },
-                { color: '#ffa43a' },
+                {color: '#4bdfff'},
+                {color: '#55f49c'},
+                {color: '#ffa43a'},
               ],
             },
           ],
@@ -810,14 +810,14 @@ export const widgetMoreBarLine = {
         relactiveDom: 'dataType',
         relactiveDomValue: 'staticData',
         value: [
-          { "date": "2014", "unsales": 400, "manus": 300, "sales": 4.2, },
-          { "date": "2015", "unsales": 400, "manus": 500, "sales": 3.6, },
-          { "date": "2016", "unsales": 300, "manus": 500, "sales": 5.8, },
-          { "date": "2017", "unsales": 300, "manus": 500, "sales": 3.4, },
-          { "date": "2018", "unsales": 400, "manus": 400, "sales": 2.5, },
-          { "date": "2019", "unsales": 400, "manus": 500, "sales": 5.8, },
-          { "date": "2020", "unsales": 300, "manus": 400, "sales": 7.6, },
-          { "date": "2021", "unsales": 300, "manus": 600, "sales": 3.4, },
+          {"date": "2014", "unsales": 400, "manus": 300, "sales": 4.2,},
+          {"date": "2015", "unsales": 400, "manus": 500, "sales": 3.6,},
+          {"date": "2016", "unsales": 300, "manus": 500, "sales": 5.8,},
+          {"date": "2017", "unsales": 300, "manus": 500, "sales": 3.4,},
+          {"date": "2018", "unsales": 400, "manus": 400, "sales": 2.5,},
+          {"date": "2019", "unsales": 400, "manus": 500, "sales": 5.8,},
+          {"date": "2020", "unsales": 300, "manus": 400, "sales": 7.6,},
+          {"date": "2021", "unsales": 300, "manus": 600, "sales": 3.4,},
         ]
       },
       {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-line-stack.js

@@ -316,43 +316,43 @@ export const widgetLineStack = {
             },
             {
               type: 'el-input-text',
-              label: 'X轴别名',
-              name: 'xName',
+              label: '坐标名',
+              name: 'nameX',
               required: false,
               placeholder: '',
               value: ''
             },
             {
               type: 'vue-color',
-              label: '别名颜色',
-              name: 'xNameColor',
+              label: '坐标名颜色',
+              name: 'nameColorX',
               required: false,
               placeholder: '',
               value: '#fff'
             },
             {
               type: 'el-input-number',
-              label: '别名字号',
-              name: 'xNameFontSize',
+              label: '坐标名字号',
+              name: 'nameFontSizeX',
               required: false,
               placeholder: '',
               value: 14
             },
             {
-              type: 'el-switch',
-              label: '轴反转',
-              name: 'reversalX',
+              type: 'vue-color',
+              label: '文字颜色',
+              name: 'colorX',
               required: false,
               placeholder: '',
-              value: false
+              value: '#fff',
             },
             {
-              type: 'el-slider',
-              label: '文字角度',
-              name: 'textAngleX',
+              type: 'el-input-number',
+              label: '文字字号',
+              name: 'fontSizeX',
               required: false,
               placeholder: '',
-              value: 0
+              value: 14,
             },
             {
               type: 'el-input-number',
@@ -363,20 +363,20 @@ export const widgetLineStack = {
               value: ''
             },
             {
-              type: 'vue-color',
-              label: '文字颜色',
-              name: 'Xcolor',
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
               required: false,
               placeholder: '',
-              value: '#fff',
+              value: 0
             },
             {
-              type: 'el-input-number',
-              label: '字体字号',
-              name: 'fontSizeX',
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalX',
               required: false,
               placeholder: '',
-              value: 14,
+              value: false
             },
             {
               type: 'vue-color',
@@ -401,7 +401,6 @@ export const widgetLineStack = {
               required: false,
               placeholder: '',
               value: '#fff',
-
             }
           ],
         },
@@ -418,7 +417,7 @@ export const widgetLineStack = {
             },
             {
               type: 'el-input-text',
-              label: 'Y轴别名',
+              label: '坐标名',
               name: 'textNameY',
               require: false,
               placeholder: '',
@@ -426,51 +425,67 @@ export const widgetLineStack = {
             },
             {
               type: 'vue-color',
-              label: '别名颜色',
-              name: 'NameColorY',
+              label: '坐标名颜色',
+              name: 'nameColorY',
               required: false,
               placeholder: '',
               value: '#fff',
             },
             {
               type: 'el-input-number',
-              label: '别名字号',
-              name: 'NameFontSizeY',
+              label: '坐标名字号',
+              name: 'nameFontSizeY',
               required: false,
               placeholder: '',
               value: 14,
             },
             {
-              type: 'el-switch',
-              label: '轴反转',
-              name: 'reversalY',
+              type: 'vue-color',
+              label: '数值颜色',
+              name: 'colorY',
               required: false,
               placeholder: '',
-              value: false
+              value: '#fff',
             },
             {
-              type: 'el-slider',
-              label: '文字角度',
-              name: 'textAngleY',
+              type: 'el-input-number',
+              label: '数值字号',
+              name: 'fontSizeY',
               required: false,
               placeholder: '',
-              value: 0
+              value: 14,
             },
             {
-              type: 'vue-color',
-              label: '文字颜色',
-              name: 'colorY',
-              required: false,
+              type: 'el-switch',
+              label: '缩放',
+              name: 'scale',
+              require: false,
               placeholder: '',
-              value: '#fff',
+              value: false,
             },
             {
               type: 'el-input-number',
-              label: '文字字号',
-              name: 'fontSizeY',
+              label: '均分',
+              name: 'splitNumberY',
               required: false,
               placeholder: '',
-              value: 14,
+              value: ''
+            },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleY',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
+            {
+              type: 'el-switch',
+              label: '轴反转',
+              name: 'reversalY',
+              required: false,
+              placeholder: '',
+              value: false
             },
             {
               type: 'vue-color',
@@ -479,22 +494,23 @@ export const widgetLineStack = {
               required: false,
               placeholder: '',
               value: '#fff',
-            }, {
+            },
+            {
               type: 'el-switch',
               label: '分割线显示',
               name: 'isShowSplitLineY',
               require: false,
               placeholder: '',
               value: false,
-            }, {
+            },
+            {
               type: 'vue-color',
               label: '分割线颜色',
               name: 'splitLineColorY',
               required: false,
               placeholder: '',
               value: '#fff',
-
-            }
+            },
           ],
         },
         {

report-ui/src/views/bigscreenDesigner/designer/tools/configure/lineCharts/widget-linechart.js

@@ -127,10 +127,10 @@ export const widgetLinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -141,9 +141,9 @@ export const widgetLinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -154,9 +154,9 @@ export const widgetLinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'center', name: '居中' },
-                { code: 'left', name: '左对齐' },
-                { code: 'right', name: '右对齐' },
+                {code: 'center', name: '居中'},
+                {code: 'left', name: '左对齐'},
+                {code: 'right', name: '右对齐'},
               ],
               value: 'center'
             },
@@ -191,10 +191,10 @@ export const widgetLinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'bold', name: '粗体' },
-                { code: 'bolder', name: '特粗体' },
-                { code: 'lighter', name: '细体' }
+                {code: 'normal', name: '正常'},
+                {code: 'bold', name: '粗体'},
+                {code: 'bolder', name: '特粗体'},
+                {code: 'lighter', name: '细体'}
               ],
               value: 'normal'
             },
@@ -205,9 +205,9 @@ export const widgetLinechart = {
               required: false,
               placeholder: '',
               selectOptions: [
-                { code: 'normal', name: '正常' },
-                { code: 'italic', name: 'italic斜体' },
-                { code: 'oblique', name: 'oblique斜体' },
+                {code: 'normal', name: '正常'},
+                {code: 'italic', name: 'italic斜体'},
+                {code: 'oblique', name: 'oblique斜体'},
               ],
               value: 'normal'
             },
@@ -227,7 +227,7 @@ export const widgetLinechart = {
             {
               type: 'el-input-text',
               label: '坐标名',
-              name: 'xName',
+              name: 'nameX',
               required: false,
               placeholder: '',
               value: ''
@@ -238,47 +238,47 @@ export const widgetLinechart = {
               name: 'nameColorX',
               required: false,
               placeholder: '',
-              value: '#fff',
+              value: '#fff'
             },
             {
               type: 'el-input-number',
-              label: '坐标字号',
+              label: '坐标名字号',
               name: 'nameFontSizeX',
               required: false,
               placeholder: '',
-              value: 14,
+              value: 14
             },
             {
               type: 'vue-color',
-              label: '数值颜色',
-              name: 'Xcolor',
+              label: '文字颜色',
+              name: 'colorX',
               required: false,
               placeholder: '',
               value: '#fff',
             },
             {
               type: 'el-input-number',
-              label: '数值字号',
+              label: '文字字号',
               name: 'fontSizeX',
               required: false,
               placeholder: '',
               value: 14,
             },
             {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'textAngle',
+              type: 'el-input-number',
+              label: '文字间隔',
+              name: 'textInterval',
               required: false,
               placeholder: '',
-              value: 0
+              value: ''
             },
             {
-              type: 'el-input-number',
-              label: '数值间隔',
-              name: 'textInterval',
+              type: 'el-slider',
+              label: '文字角度',
+              name: 'textAngleX',
               required: false,
               placeholder: '',
-              value: ''
+              value: 0
             },
             {
               type: 'el-switch',
@@ -343,8 +343,8 @@ export const widgetLinechart = {
             },
             {
               type: 'el-input-number',
-              label: '坐标字号',
-              name: 'namefontSizeY',
+              label: '坐标名字号',
+              name: 'nameFontSizeY',
               required: false,
               placeholder: '',
               value: 14,
@@ -365,14 +365,6 @@ export const widgetLinechart = {
               placeholder: '',
               value: 14,
             },
-            {
-              type: 'el-slider',
-              label: '数值角度',
-              name: 'ytextAngle',
-              required: false,
-              placeholder: '',
-              value: 0
-            },
             {
               type: 'el-switch',
               label: '缩放',
@@ -384,11 +376,19 @@ export const widgetLinechart = {
             {
               type: 'el-input-number',
               label: '均分',
-              name: 'splitNumber',
+              name: 'splitNumberY',
               required: false,
               placeholder: '',
               value: ''
             },
+            {
+              type: 'el-slider',
+              label: '数值角度',
+              name: 'textAngleY',
+              required: false,
+              placeholder: '',
+              value: 0
+            },
             {
               type: 'el-switch',
               label: '轴反转',
@@ -420,7 +420,7 @@ export const widgetLinechart = {
               required: false,
               placeholder: '',
               value: '#fff',
-            }
+            },
           ],
         },
         {

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

@@ -131,10 +131,10 @@ export default {
         // 坐标轴是否显示
         show: optionsSetup.hideX,
         // 坐标轴名称
-        name: optionsSetup.xName,
+        name: optionsSetup.nameX,
         nameTextStyle: {
-          color: optionsSetup.xNameColor,
-          fontSize: optionsSetup.xNameFontSize
+          color: optionsSetup.nameColorX,
+          fontSize: optionsSetup.nameFontSizeX
         },
         // 轴反转
         inverse: optionsSetup.reversalX,
@@ -146,7 +146,7 @@ export default {
           rotate: optionsSetup.textAngleX,
           textStyle: {
             // 坐标文字颜色
-            color: optionsSetup.Xcolor,
+            color: optionsSetup.colorX,
             fontSize: optionsSetup.fontSizeX
           }
         },
@@ -170,15 +170,18 @@ export default {
       const optionsSetup = this.optionsSetup;
       const yAxis = {
         type: "value",
+        scale: optionsSetup.scale,
+        // 均分
+        splitNumber: optionsSetup.splitNumberY,
         // 坐标轴是否显示
         show: optionsSetup.isShowY,
         // 坐标轴名称
         name: optionsSetup.textNameY,
         nameTextStyle: {
-          color: optionsSetup.NameColorY,
-          fontSize: optionsSetup.NameFontSizeY
+          color: optionsSetup.nameColorY,
+          fontSize: optionsSetup.nameFontSizeY
         },
-        // y轴反转
+        // 轴反转
         inverse: optionsSetup.reversalY,
         axisLabel: {
           show: true,

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

@@ -128,20 +128,25 @@ export default {
       const optionsSetup = this.optionsSetup;
       const xAxis = {
         type: "category",
-        show: optionsSetup.hideX, // 坐标轴是否显示
-        name: optionsSetup.xName, // 坐标轴名称
+        // 坐标轴是否显示
+        show: optionsSetup.hideX,
+        // 坐标轴名称
+        name: optionsSetup.nameX,
         nameTextStyle: {
-          color: optionsSetup.xNameColor,
-          fontSize: optionsSetup.xNameFontSize
+          color: optionsSetup.nameColorX,
+          fontSize: optionsSetup.nameFontSizeX
         },
-        nameRotate: optionsSetup.textAngle, // 文字角度
-        inverse: optionsSetup.reversalX, // 轴反转
+        // 轴反转
+        inverse: optionsSetup.reversalX,
         axisLabel: {
           show: true,
-          interval: optionsSetup.textInterval, // 文字角度
-          rotate: optionsSetup.textAngle, // 文字角度
+          // 文字间隔
+          interval: optionsSetup.textInterval,
+          // 文字角度
+          rotate: optionsSetup.textAngleX,
           textStyle: {
-            color: optionsSetup.Xcolor, // x轴 坐标文字颜色
+            // 坐标文字颜色
+            color: optionsSetup.colorX,
             fontSize: optionsSetup.fontSizeX
           }
         },
@@ -166,19 +171,25 @@ export default {
       const yAxis = {
         type: "value",
         scale: optionsSetup.scale,
-        splitNumber: optionsSetup.splitNumber,// 均分
-        show: optionsSetup.isShowY, // 坐标轴是否显示
-        name: optionsSetup.textNameY, // 坐标轴名称
+        // 均分
+        splitNumber: optionsSetup.splitNumberY,
+        // 坐标轴是否显示
+        show: optionsSetup.isShowY,
+        // 坐标轴名称
+        name: optionsSetup.textNameY,
         nameTextStyle: {
           color: optionsSetup.nameColorY,
           fontSize: optionsSetup.nameFontSizeY
         },
-        inverse: optionsSetup.reversalY, // 轴反转
+        // 轴反转
+        inverse: optionsSetup.reversalY,
         axisLabel: {
           show: true,
-          rotate: optionsSetup.ytextAngle, // 文字角度
+          // 文字角度
+          rotate: optionsSetup.textAngleY,
           textStyle: {
-            color: optionsSetup.colorY, // x轴 坐标文字颜色
+            // 坐标文字颜色
+            color: optionsSetup.colorY,
             fontSize: optionsSetup.fontSizeY
           }
         },
@@ -195,7 +206,6 @@ export default {
           }
         }
       };
-
       this.options.yAxis = yAxis;
     },
     // 数值设定 or 柱体设置

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

@@ -198,20 +198,25 @@ export default {
       const optionsSetup = this.optionsSetup;
       const xAxis = {
         type: "category",
-        show: optionsSetup.hideX, // 坐标轴是否显示
-        name: optionsSetup.xName, // 坐标轴名称
+        // 坐标轴是否显示
+        show: optionsSetup.hideX,
+        // 坐标轴名称
+        name: optionsSetup.nameX,
         nameTextStyle: {
           color: optionsSetup.nameColorX,
           fontSize: optionsSetup.nameFontSizeX
         },
-        nameRotate: optionsSetup.textAngle, // 文字角度
-        inverse: optionsSetup.reversalX, // 轴反转
+        // 轴反转
+        inverse: optionsSetup.reversalX,
         axisLabel: {
           show: true,
-          interval: optionsSetup.textInterval, // 文字间隔
-          rotate: optionsSetup.textAngle, // 文字角度
+          // 文字间隔
+          interval: optionsSetup.textInterval,
+          // 文字角度
+          rotate: optionsSetup.textAngleX,
           textStyle: {
-            color: optionsSetup.Xcolor, // x轴 坐标文字颜色
+            // 坐标文字颜色
+            color: optionsSetup.colorX,
             fontSize: optionsSetup.fontSizeX
           }
         },
@@ -236,19 +241,25 @@ export default {
       const yAxis = {
         type: "value",
         scale: optionsSetup.scale,
-        splitNumber: optionsSetup.splitNumber,// 均分
-        show: optionsSetup.isShowY, // 坐标轴是否显示
-        name: optionsSetup.textNameY, // 坐标轴名称
-        nameTextStyle: { // 别名
+        // 均分
+        splitNumber: optionsSetup.splitNumberY,
+        // 坐标轴是否显示
+        show: optionsSetup.isShowY,
+        // 坐标轴名称
+        name: optionsSetup.textNameY,
+        nameTextStyle: {
           color: optionsSetup.nameColorY,
-          fontSize: optionsSetup.namefontSizeY
+          fontSize: optionsSetup.nameFontSizeY
         },
-        inverse: optionsSetup.reversalY, // 轴反转
+        // 轴反转
+        inverse: optionsSetup.reversalY,
         axisLabel: {
           show: true,
-          rotate: optionsSetup.ytextAngle, // 文字角度
+          // 文字角度
+          rotate: optionsSetup.textAngleY,
           textStyle: {
-            color: optionsSetup.colorY, // y轴 坐标文字颜色
+            // 坐标文字颜色
+            color: optionsSetup.colorY,
             fontSize: optionsSetup.fontSizeY
           }
         },

report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLineStackChart.vue

@@ -131,10 +131,10 @@ export default {
         // 坐标轴是否显示
         show: optionsSetup.hideX,
         // 坐标轴名称
-        name: optionsSetup.xName,
+        name: optionsSetup.nameX,
         nameTextStyle: {
-          color: optionsSetup.xNameColor,
-          fontSize: optionsSetup.xNameFontSize
+          color: optionsSetup.nameColorX,
+          fontSize: optionsSetup.nameFontSizeX
         },
         // 轴反转
         inverse: optionsSetup.reversalX,
@@ -146,7 +146,7 @@ export default {
           rotate: optionsSetup.textAngleX,
           textStyle: {
             // 坐标文字颜色
-            color: optionsSetup.Xcolor,
+            color: optionsSetup.colorX,
             fontSize: optionsSetup.fontSizeX
           }
         },
@@ -170,22 +170,25 @@ export default {
       const optionsSetup = this.optionsSetup;
       const yAxis = {
         type: "value",
+        scale: optionsSetup.scale,
+        // 均分
+        splitNumber: optionsSetup.splitNumberY,
         // 坐标轴是否显示
         show: optionsSetup.isShowY,
         // 坐标轴名称
         name: optionsSetup.textNameY,
         nameTextStyle: {
-          color: optionsSetup.NameColorY,
-          fontSize: optionsSetup.NameFontSizeY
+          color: optionsSetup.nameColorY,
+          fontSize: optionsSetup.nameFontSizeY
         },
-        // y轴反转
+        // 轴反转
         inverse: optionsSetup.reversalY,
         axisLabel: {
           show: true,
           // 文字角度
           rotate: optionsSetup.textAngleY,
           textStyle: {
-            // y轴 坐标文字颜色
+            // 坐标文字颜色
             color: optionsSetup.colorY,
             fontSize: optionsSetup.fontSizeY
           }
@@ -262,7 +265,7 @@ export default {
       legend.itemWidth = optionsSetup.legendWidth;
     },
     // 图例名称设置
-    setOptionsLegendName(name){
+    setOptionsLegendName(name) {
       const optionsSetup = this.optionsSetup;
       const series = this.options.series;
       const legendName = optionsSetup.legendName;
@@ -272,7 +275,7 @@ export default {
           series[i].name = name[i];
         }
         this.options.legend['data'] = name;
-      }else {
+      } else {
         const arr = legendName.split('|');
         for (let i = 0; i < arr.length; i++) {
           series[i].name = arr[i];

report-ui/src/views/bigscreenDesigner/designer/widget/line/widgetLinechart.vue

@@ -134,20 +134,25 @@ export default {
       const optionsSetup = this.optionsSetup;
       const xAxis = {
         type: "category",
-        show: optionsSetup.hideX, // 坐标轴是否显示
-        name: optionsSetup.xName, // 坐标轴名称
+        // 坐标轴是否显示
+        show: optionsSetup.hideX,
+        // 坐标轴名称
+        name: optionsSetup.nameX,
         nameTextStyle: {
           color: optionsSetup.nameColorX,
           fontSize: optionsSetup.nameFontSizeX
         },
-        nameRotate: optionsSetup.textAngle, // 文字角度
-        inverse: optionsSetup.reversalX, // 轴反转
+        // 轴反转
+        inverse: optionsSetup.reversalX,
         axisLabel: {
           show: true,
-          interval: optionsSetup.textInterval, // 文字间隔
-          rotate: optionsSetup.textAngle, // 文字角度
+          // 文字间隔
+          interval: optionsSetup.textInterval,
+          // 文字角度
+          rotate: optionsSetup.textAngleX,
           textStyle: {
-            color: optionsSetup.Xcolor, // x轴 坐标文字颜色
+            // 坐标文字颜色
+            color: optionsSetup.colorX,
             fontSize: optionsSetup.fontSizeX
           }
         },
@@ -172,19 +177,25 @@ export default {
       const yAxis = {
         type: "value",
         scale: optionsSetup.scale,
-        splitNumber: optionsSetup.splitNumber,// 均分
-        show: optionsSetup.isShowY, // 坐标轴是否显示
-        name: optionsSetup.textNameY, // 坐标轴名称
-        nameTextStyle: { // 别名
+        // 均分
+        splitNumber: optionsSetup.splitNumberY,
+        // 坐标轴是否显示
+        show: optionsSetup.isShowY,
+        // 坐标轴名称
+        name: optionsSetup.textNameY,
+        nameTextStyle: {
           color: optionsSetup.nameColorY,
-          fontSize: optionsSetup.namefontSizeY
+          fontSize: optionsSetup.nameFontSizeY
         },
-        inverse: optionsSetup.reversalY, // 轴反转
+        // 轴反转
+        inverse: optionsSetup.reversalY,
         axisLabel: {
           show: true,
-          rotate: optionsSetup.ytextAngle, // 文字角度
+          // 文字角度
+          rotate: optionsSetup.textAngleY,
           textStyle: {
-            color: optionsSetup.colorY, // y轴 坐标文字颜色
+            // 坐标文字颜色
+            color: optionsSetup.colorY,
             fontSize: optionsSetup.fontSizeY
           }
         },