ehs_tanghHe
/
tanghe-report
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat--柱线图数值设定增加是否显示百分比符号

Browse Source
qianming 2 years ago
parent 5cba850653
commit edd559599e
5 changed files with 66 additions and 26 deletions
Show Stats Download Patch File Download Diff File

16
report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-bar-line-stack.js
Unescape Escape View File

@ -697,6 +697,14 @@ export const widgetBarLineStack = {
placeholder: '', placeholder: '',
value: false value: false
}, },
{
type: 'el-switch',
label: '百分比符号显示',
name: 'percentSignBar',
required: false,
placeholder: '',
value: false
},
{ {
type: 'el-input-number', type: 'el-input-number',
label: '距离', label: '距离',
@ -748,6 +756,14 @@ export const widgetBarLineStack = {
placeholder: '', placeholder: '',
value: false value: false
}, },
{
type: 'el-switch',
label: '百分比符号显示',
name: 'percentSignLine',
required: false,
placeholder: '',
value: false
},
{ {
type: 'el-input-number', type: 'el-input-number',
label: '距离', label: '距离',

28
report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-barlinechart.js
Unescape Escape View File

@ -703,12 +703,12 @@ export const widgetBarlinechart = {
], ],
}, },
{ {
name: '折线数值设定', name: '柱体数值设定',
list: [ list: [
{ {
type: 'el-switch', type: 'el-switch',
label: '显示', label: '显示',
name: 'isShowLine', name: 'isShowBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: false value: false
@ -716,7 +716,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-switch', type: 'el-switch',
label: '百分比符号显示', label: '百分比符号显示',
name: 'percentSignLine', name: 'percentSignBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: false value: false
@ -724,7 +724,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '距离', label: '距离',
name: 'distanceLine', name: 'distanceBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: 5 value: 5
@ -732,7 +732,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体字号', label: '字体字号',
name: 'fontSizeLine', name: 'fontSizeBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: 14 value: 14
@ -740,7 +740,7 @@ export const widgetBarlinechart = {
{ {
type: 'vue-color', type: 'vue-color',
label: '字体颜色', label: '字体颜色',
name: 'subTextColorLine', name: 'subTextColorBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff' value: '#fff'
@ -748,7 +748,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-select', type: 'el-select',
label: '字体粗细', label: '字体粗细',
name: 'fontWeightLine', name: 'fontWeightBar',
required: false, required: false,
placeholder: '', placeholder: '',
selectOptions: [ selectOptions: [
@ -762,12 +762,12 @@ export const widgetBarlinechart = {
], ],
}, },
{ {
name: '柱体数值设定', name: '折线数值设定',
list: [ list: [
{ {
type: 'el-switch', type: 'el-switch',
label: '显示', label: '显示',
name: 'isShowBar', name: 'isShowLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: false value: false
@ -775,7 +775,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-switch', type: 'el-switch',
label: '百分比符号显示', label: '百分比符号显示',
name: 'percentSignBar', name: 'percentSignLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: false value: false
@ -783,7 +783,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '距离', label: '距离',
name: 'distanceBar', name: 'distanceLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: 5 value: 5
@ -791,7 +791,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体字号', label: '字体字号',
name: 'fontSizeBar', name: 'fontSizeLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: 14 value: 14
@ -799,7 +799,7 @@ export const widgetBarlinechart = {
{ {
type: 'vue-color', type: 'vue-color',
label: '字体颜色', label: '字体颜色',
name: 'subTextColorBar', name: 'subTextColorLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff' value: '#fff'
@ -807,7 +807,7 @@ export const widgetBarlinechart = {
{ {
type: 'el-select', type: 'el-select',
label: '字体粗细', label: '字体粗细',
name: 'fontWeightBar', name: 'fontWeightLine',
required: false, required: false,
placeholder: '', placeholder: '',
selectOptions: [ selectOptions: [

40
report-ui/src/views/bigscreenDesigner/designer/tools/configure/barlineCharts/widget-more-bar-line.js
Unescape Escape View File

@ -707,12 +707,20 @@ export const widgetMoreBarLine = {
], ],
}, },
{ {
name: '折线数值设定', name: '柱体数值设定',
list: [ list: [
{ {
type: 'el-switch', type: 'el-switch',
label: '显示', label: '显示',
name: 'isShowLine', name: 'isShowBar',
required: false,
placeholder: '',
value: false
},
{
type: 'el-switch',
label: '百分比符号显示',
name: 'percentSignBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: false value: false
@ -720,7 +728,7 @@ export const widgetMoreBarLine = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '距离', label: '距离',
name: 'distanceLine', name: 'distanceBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: 5 value: 5
@ -728,7 +736,7 @@ export const widgetMoreBarLine = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体字号', label: '字体字号',
name: 'fontSizeLine', name: 'fontSizeBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: 14 value: 14
@ -736,7 +744,7 @@ export const widgetMoreBarLine = {
{ {
type: 'vue-color', type: 'vue-color',
label: '字体颜色', label: '字体颜色',
name: 'subTextColorLine', name: 'subTextColorBar',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff' value: '#fff'
@ -744,7 +752,7 @@ export const widgetMoreBarLine = {
{ {
type: 'el-select', type: 'el-select',
label: '字体粗细', label: '字体粗细',
name: 'fontWeightLine', name: 'fontWeightBar',
required: false, required: false,
placeholder: '', placeholder: '',
selectOptions: [ selectOptions: [
@ -758,12 +766,20 @@ export const widgetMoreBarLine = {
], ],
}, },
{ {
name: '柱体数值设定', name: '折线数值设定',
list: [ list: [
{ {
type: 'el-switch', type: 'el-switch',
label: '显示', label: '显示',
name: 'isShowBar', name: 'isShowLine',
required: false,
placeholder: '',
value: false
},
{
type: 'el-switch',
label: '百分比符号显示',
name: 'percentSignLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: false value: false
@ -771,7 +787,7 @@ export const widgetMoreBarLine = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '距离', label: '距离',
name: 'distanceBar', name: 'distanceLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: 5 value: 5
@ -779,7 +795,7 @@ export const widgetMoreBarLine = {
{ {
type: 'el-input-number', type: 'el-input-number',
label: '字体字号', label: '字体字号',
name: 'fontSizeBar', name: 'fontSizeLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: 14 value: 14
@ -787,7 +803,7 @@ export const widgetMoreBarLine = {
{ {
type: 'vue-color', type: 'vue-color',
label: '字体颜色', label: '字体颜色',
name: 'subTextColorBar', name: 'subTextColorLine',
required: false, required: false,
placeholder: '', placeholder: '',
value: '#fff' value: '#fff'
@ -795,7 +811,7 @@ export const widgetMoreBarLine = {
{ {
type: 'el-select', type: 'el-select',
label: '字体粗细', label: '字体粗细',
name: 'fontWeightBar', name: 'fontWeightLine',
required: false, required: false,
placeholder: '', placeholder: '',
selectOptions: [ selectOptions: [

4
report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetBarLineStackChart.vue
Unescape Escape View File

@ -458,6 +458,7 @@ export default {
fontSize: optionsSetup.fontSizeBar, fontSize: optionsSetup.fontSizeBar,
color: optionsSetup.subTextColorBar, color: optionsSetup.subTextColorBar,
fontWeight: optionsSetup.fontWeightBar, fontWeight: optionsSetup.fontWeightBar,
formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}'
}, },
//颜色，圆角属性 //颜色，圆角属性
itemStyle: { itemStyle: {
@ -501,6 +502,7 @@ export default {
fontSize: optionsSetup.fontSizeLine, fontSize: optionsSetup.fontSizeLine,
color: optionsSetup.subTextColorLine, color: optionsSetup.subTextColorLine,
fontWeight: optionsSetup.fontWeightLine, fontWeight: optionsSetup.fontWeightLine,
formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}'
}, },
}); });
} }
@ -563,6 +565,7 @@ export default {
fontSize: optionsSetup.fontSizeBar, fontSize: optionsSetup.fontSizeBar,
color: optionsSetup.subTextColorBar, color: optionsSetup.subTextColorBar,
fontWeight: optionsSetup.fontWeightBar, fontWeight: optionsSetup.fontWeightBar,
formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}'
}, },
//颜色，圆角属性 //颜色，圆角属性
itemStyle: { itemStyle: {
@ -605,6 +608,7 @@ export default {
fontSize: optionsSetup.fontSizeLine, fontSize: optionsSetup.fontSizeLine,
color: optionsSetup.subTextColorLine, color: optionsSetup.subTextColorLine,
fontWeight: optionsSetup.fontWeightLine, fontWeight: optionsSetup.fontWeightLine,
formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}'
}, },
}); });
} }

4
report-ui/src/views/bigscreenDesigner/designer/widget/barline/widgetMoreBarLineChart.vue
Unescape Escape View File

@ -495,6 +495,7 @@ export default {
fontSize: optionsSetup.fontSizeBar, fontSize: optionsSetup.fontSizeBar,
color: optionsSetup.subTextColorBar, color: optionsSetup.subTextColorBar,
fontWeight: optionsSetup.fontWeightBar, fontWeight: optionsSetup.fontWeightBar,
formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}'
}; };
series[i].barWidth = optionsSetup.maxWidth; series[i].barWidth = optionsSetup.maxWidth;
series[i].itemStyle.normal["barBorderRadius"] = optionsSetup.radius; series[i].itemStyle.normal["barBorderRadius"] = optionsSetup.radius;
@ -532,6 +533,7 @@ export default {
fontSize: optionsSetup.fontSizeLine, fontSize: optionsSetup.fontSizeLine,
color: optionsSetup.subTextColorLine, color: optionsSetup.subTextColorLine,
fontWeight: optionsSetup.fontWeightLine, fontWeight: optionsSetup.fontWeightLine,
formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}'
}; };
} }
} }
@ -583,6 +585,7 @@ export default {
fontSize: optionsSetup.fontSizeBar, fontSize: optionsSetup.fontSizeBar,
color: optionsSetup.subTextColorBar, color: optionsSetup.subTextColorBar,
fontWeight: optionsSetup.fontWeightBar, fontWeight: optionsSetup.fontWeightBar,
formatter: !!optionsSetup.percentSignBar ? '{c}%' : '{c}'
}; };
obj.barWidth = optionsSetup.maxWidth; obj.barWidth = optionsSetup.maxWidth;
obj.itemStyle = { obj.itemStyle = {
@ -626,6 +629,7 @@ export default {
fontSize: optionsSetup.fontSizeLine, fontSize: optionsSetup.fontSizeLine,
color: optionsSetup.subTextColorLine, color: optionsSetup.subTextColorLine,
fontWeight: optionsSetup.fontWeightLine, fontWeight: optionsSetup.fontWeightLine,
formatter: !!optionsSetup.percentSignLine ? '{c}%' : '{c}'
}; };
obj.data = val.series[i].data; obj.data = val.series[i].data;
series.push(obj); series.push(obj);

Write Preview
Loading…
Cancel
Save