From 9c4652e269ccd6f2c37f371f7efa7f7959c11232 Mon Sep 17 00:00:00 2001 From: isqianming Date: Wed, 11 Aug 2021 19:13:18 +0800 Subject: [PATCH] update --- .../src/views/report/bigscreen/designer/tools.js | 11 ++++++----- .../designer/widget/bar/widgetBarStackChart.vue | 13 +++++++------ 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/report-ui/src/views/report/bigscreen/designer/tools.js b/report-ui/src/views/report/bigscreen/designer/tools.js index f15b19e6..910dd7bb 100644 --- a/report-ui/src/views/report/bigscreen/designer/tools.js +++ b/report-ui/src/views/report/bigscreen/designer/tools.js @@ -6155,8 +6155,9 @@ const widgetTools = [ selectOptions: [ {code: 'left', name: '左对齐'}, {code: 'right', name: '右对齐'}, + //{code: 'mid', name: '居中'}, ], - value: '' + value: 'left' }, { type: 'el-select', @@ -6168,7 +6169,7 @@ const widgetTools = [ {code: 'top', name: '顶部'}, {code: 'bottom', name: '底部'}, ], - value: '' + value: 'top' }, { type: 'el-select', @@ -6180,11 +6181,11 @@ const widgetTools = [ {code: 'vertical', name: '竖排'}, {code: 'horizontal', name: '横排'}, ], - value: '' + value: 'horizontal' }, ], }, - { + /*{ name: '自定义配色', list: [ { @@ -6195,7 +6196,7 @@ const widgetTools = [ value: [{color: '#ff7f50'}, {color: '#87cefa'}, {color: '#da70d6'}, {color: '#32cd32'}, {color: '#6495ed'}], }, ], - }, + },*/ ], ], // 数据 diff --git a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue index 41eff3ec..4413748e 100644 --- a/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue +++ b/report-ui/src/views/report/bigscreen/designer/widget/bar/widgetBarStackChart.vue @@ -94,16 +94,16 @@ export default { // 修改图标options属性 editorOptions() { this.setOptionsTitle(); - //this.setOptionsX(); - //this.setOptionsY(); + this.setOptionsX(); + this.setOptionsY(); this.setOptionsTop(); this.setOptionsTooltip(); this.setOptionsMargin(); - //this.setOptionsLegend(); + this.setOptionsLegend(); //this.setOptionsColor(); this.setOptionsData(); }, - // 标题修改 + // 标题修改 对应数据内容例如ABC等的调整 setOptionsTitle() { const optionsCollapse = this.optionsSetup; const title = {}; @@ -195,7 +195,7 @@ export default { }; this.options.yAxis = yAxis; }, - // 数值设定 or 柱体设置 + // 数值设定 or 柱体设置 数值设定字体大小,默认值没回显 setOptionsTop() { const optionsCollapse = this.optionsSetup; const series = this.options.series; @@ -303,7 +303,8 @@ export default { return newArr; }, //静态数据 - staticDataFn(val, optionsSetup) { + staticDataFn(val) { + const optionsSetup = this.optionsSetup; const series = this.options.series; let xAxisList = [] let yAxisList = []