diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js index 17b8a499..119bd461 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js @@ -697,6 +697,14 @@ export const widgetBarLineStack = { placeholder: '', value: false }, + { + type: 'el-switch', + label: '百分比符号显示', + name: 'percentSignBar', + required: false, + placeholder: '', + value: false + }, { type: 'el-input-number', label: '距离', @@ -748,6 +756,14 @@ export const widgetBarLineStack = { placeholder: '', value: false }, + { + type: 'el-switch', + label: '百分比符号显示', + name: 'percentSignLine', + required: false, + placeholder: '', + value: false + }, { type: 'el-input-number', label: '距离', diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js index 3f4185fb..2bfd340a 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js @@ -703,12 +703,12 @@ export const widgetBarlinechart = { ], }, { - name: '折线数值设定', + name: '柱体数值设定', list: [ { type: 'el-switch', label: '显示', - name: 'isShowLine', + name: 'isShowBar', required: false, placeholder: '', value: false @@ -716,7 +716,7 @@ export const widgetBarlinechart = { { type: 'el-switch', label: '百分比符号显示', - name: 'percentSignLine', + name: 'percentSignBar', required: false, placeholder: '', value: false @@ -724,7 +724,7 @@ export const widgetBarlinechart = { { type: 'el-input-number', label: '距离', - name: 'distanceLine', + name: 'distanceBar', required: false, placeholder: '', value: 5 @@ -732,7 +732,7 @@ export const widgetBarlinechart = { { type: 'el-input-number', label: '字体字号', - name: 'fontSizeLine', + name: 'fontSizeBar', required: false, placeholder: '', value: 14 @@ -740,7 +740,7 @@ export const widgetBarlinechart = { { type: 'vue-color', label: '字体颜色', - name: 'subTextColorLine', + name: 'subTextColorBar', required: false, placeholder: '', value: '#fff' @@ -748,7 +748,7 @@ export const widgetBarlinechart = { { type: 'el-select', label: '字体粗细', - name: 'fontWeightLine', + name: 'fontWeightBar', required: false, placeholder: '', selectOptions: [ @@ -762,12 +762,12 @@ export const widgetBarlinechart = { ], }, { - name: '柱体数值设定', + name: '折线数值设定', list: [ { type: 'el-switch', label: '显示', - name: 'isShowBar', + name: 'isShowLine', required: false, placeholder: '', value: false @@ -775,7 +775,7 @@ export const widgetBarlinechart = { { type: 'el-switch', label: '百分比符号显示', - name: 'percentSignBar', + name: 'percentSignLine', required: false, placeholder: '', value: false @@ -783,7 +783,7 @@ export const widgetBarlinechart = { { type: 'el-input-number', label: '距离', - name: 'distanceBar', + name: 'distanceLine', required: false, placeholder: '', value: 5 @@ -791,7 +791,7 @@ export const widgetBarlinechart = { { type: 'el-input-number', label: '字体字号', - name: 'fontSizeBar', + name: 'fontSizeLine', required: false, placeholder: '', value: 14 @@ -799,7 +799,7 @@ export const widgetBarlinechart = { { type: 'vue-color', label: '字体颜色', - name: 'subTextColorBar', + name: 'subTextColorLine', required: false, placeholder: '', value: '#fff' @@ -807,7 +807,7 @@ export const widgetBarlinechart = { { type: 'el-select', label: '字体粗细', - name: 'fontWeightBar', + name: 'fontWeightLine', required: false, placeholder: '', selectOptions: [ diff --git a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js index 21a94887..5078699a 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js +++ b/report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js @@ -707,12 +707,20 @@ export const widgetMoreBarLine = { ], }, { - name: '折线数值设定', + name: '柱体数值设定', list: [ { type: 'el-switch', label: '显示', - name: 'isShowLine', + name: 'isShowBar', + required: false, + placeholder: '', + value: false + }, + { + type: 'el-switch', + label: '百分比符号显示', + name: 'percentSignBar', required: false, placeholder: '', value: false @@ -720,7 +728,7 @@ export const widgetMoreBarLine = { { type: 'el-input-number', label: '距离', - name: 'distanceLine', + name: 'distanceBar', required: false, placeholder: '', value: 5 @@ -728,7 +736,7 @@ export const widgetMoreBarLine = { { type: 'el-input-number', label: '字体字号', - name: 'fontSizeLine', + name: 'fontSizeBar', required: false, placeholder: '', value: 14 @@ -736,7 +744,7 @@ export const widgetMoreBarLine = { { type: 'vue-color', label: '字体颜色', - name: 'subTextColorLine', + name: 'subTextColorBar', required: false, placeholder: '', value: '#fff' @@ -744,7 +752,7 @@ export const widgetMoreBarLine = { { type: 'el-select', label: '字体粗细', - name: 'fontWeightLine', + name: 'fontWeightBar', required: false, placeholder: '', selectOptions: [ @@ -758,12 +766,20 @@ export const widgetMoreBarLine = { ], }, { - name: '柱体数值设定', + name: '折线数值设定', list: [ { type: 'el-switch', label: '显示', - name: 'isShowBar', + name: 'isShowLine', + required: false, + placeholder: '', + value: false + }, + { + type: 'el-switch', + label: '百分比符号显示', + name: 'percentSignLine', required: false, placeholder: '', value: false @@ -771,7 +787,7 @@ export const widgetMoreBarLine = { { type: 'el-input-number', label: '距离', - name: 'distanceBar', + name: 'distanceLine', required: false, placeholder: '', value: 5 @@ -779,7 +795,7 @@ export const widgetMoreBarLine = { { type: 'el-input-number', label: '字体字号', - name: 'fontSizeBar', + name: 'fontSizeLine', required: false, placeholder: '', value: 14 @@ -787,7 +803,7 @@ export const widgetMoreBarLine = { { type: 'vue-color', label: '字体颜色', - name: 'subTextColorBar', + name: 'subTextColorLine', required: false, placeholder: '', value: '#fff' @@ -795,7 +811,7 @@ export const widgetMoreBarLine = { { type: 'el-select', label: '字体粗细', - name: 'fontWeightBar', + name: 'fontWeightLine', required: false, placeholder: '', selectOptions: [ diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue index d2c28201..444c2550 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue @@ -458,6 +458,7 @@ export default { fontSize: optionsSetup.fontSizeBar, color: optionsSetup.subTextColorBar, fontWeight: optionsSetup.fontWeightBar, + formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}' }, //颜色,圆角属性 itemStyle: { @@ -501,6 +502,7 @@ export default { fontSize: optionsSetup.fontSizeLine, color: optionsSetup.subTextColorLine, fontWeight: optionsSetup.fontWeightLine, + formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}' }, }); } @@ -563,6 +565,7 @@ export default { fontSize: optionsSetup.fontSizeBar, color: optionsSetup.subTextColorBar, fontWeight: optionsSetup.fontWeightBar, + formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}' }, //颜色,圆角属性 itemStyle: { @@ -605,6 +608,7 @@ export default { fontSize: optionsSetup.fontSizeLine, color: optionsSetup.subTextColorLine, fontWeight: optionsSetup.fontWeightLine, + formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}' }, }); } diff --git a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue index 2ec01c11..83af5f38 100644 --- a/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue +++ b/report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue @@ -495,6 +495,7 @@ export default { fontSize: optionsSetup.fontSizeBar, color: optionsSetup.subTextColorBar, fontWeight: optionsSetup.fontWeightBar, + formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}' }; series[i].barWidth = optionsSetup.maxWidth; series[i].itemStyle.normal["barBorderRadius"] = optionsSetup.radius; @@ -532,6 +533,7 @@ export default { fontSize: optionsSetup.fontSizeLine, color: optionsSetup.subTextColorLine, fontWeight: optionsSetup.fontWeightLine, + formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}' }; } } @@ -583,6 +585,7 @@ export default { fontSize: optionsSetup.fontSizeBar, color: optionsSetup.subTextColorBar, fontWeight: optionsSetup.fontWeightBar, + formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}' }; obj.barWidth = optionsSetup.maxWidth; obj.itemStyle = { @@ -626,6 +629,7 @@ export default { fontSize: optionsSetup.fontSizeLine, color: optionsSetup.subTextColorLine, fontWeight: optionsSetup.fontWeightLine, + formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}' }; obj.data = val.series[i].data; series.push(obj);