diff --git a/frontend/src/views/chart/chart/common/common.js b/frontend/src/views/chart/chart/common/common.js index de42b6f63a..627293d9ff 100644 --- a/frontend/src/views/chart/chart/common/common.js +++ b/frontend/src/views/chart/chart/common/common.js @@ -352,7 +352,7 @@ export function seniorCfg(chart_option, chart) { label: { show: true, color: ele.color, - fontSize: 10, + fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10, position: xAxis.position === 'bottom' ? 'insideStartTop' : 'insideEndTop', formatter: function(param) { return ele.name + ' : ' + valueFormatter(param.value, axisFormatterCfg) @@ -374,7 +374,7 @@ export function seniorCfg(chart_option, chart) { label: { show: true, color: ele.color, - fontSize: 10, + fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10, position: yAxis.position === 'left' ? 'insideStartTop' : 'insideEndTop', formatter: function(param) { return ele.name + ' : ' + valueFormatter(param.value, axisFormatterCfg) diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js index 21f4ea5abd..ebc0c25254 100644 --- a/frontend/src/views/chart/chart/common/common_antv.js +++ b/frontend/src/views/chart/chart/common/common_antv.js @@ -850,7 +850,7 @@ export function getAnalyse(chart) { style: { textBaseline: 'bottom', fill: ele.color, - fontSize: 10 + fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10 } }) } else { @@ -864,7 +864,7 @@ export function getAnalyse(chart) { style: { textBaseline: 'bottom', fill: ele.color, - fontSize: 10 + fontSize: ele.fontSize ? parseInt(ele.fontSize) : 10 } }) } diff --git a/frontend/src/views/chart/components/senior/AssistLine.vue b/frontend/src/views/chart/components/senior/AssistLine.vue index 0b9c24af06..97d97ee6c2 100644 --- a/frontend/src/views/chart/components/senior/AssistLine.vue +++ b/frontend/src/views/chart/components/senior/AssistLine.vue @@ -121,6 +121,11 @@ export default { senior = JSON.parse(chart.senior) } if (senior.assistLine) { + for (let i = 0; i < senior.assistLine.length; i++) { + if (!senior.assistLine[i].fontSize) { + senior.assistLine[i].fontSize = '10' + } + } this.assistLine = senior.assistLine } else { this.assistLine = [] diff --git a/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue index 655a2a4a7c..85c3ee260c 100644 --- a/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue +++ b/frontend/src/views/chart/components/senior/dialog/AssistLineEdit.vue @@ -41,7 +41,7 @@ - + + + + + + - +