diff --git a/src/utils/tools.js b/src/utils/tools.js index 21f12bd7..0fd8930a 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -668,20 +668,37 @@ export function handleEchartFontSize (option) { const newSeries = [] const chartType = chartOption.series[0].type chartOption.series.forEach((series) => { - const seriesNew = { - ...series, - label: { - ...series.label, - fontSize: echartLabelFontSize - }, - markLine: { - ...series.markLine, + if (series.markLine) { + const seriesNew = { + ...series, label: { + ...series.label, fontSize: echartLabelFontSize + }, + markLine: { + ...series.markLine, + label: { + ...series.markLine.label, + fontSize: echartLabelFontSize + } } } + newSeries.push(seriesNew) + } else { + const seriesNew = { + ...series, + label: { + ...series.label, + fontSize: echartLabelFontSize + }, + markLine: { + label: { + fontSize: echartLabelFontSize + } + } + } + newSeries.push(seriesNew) } - newSeries.push(seriesNew) }) if (chartType === 'pie') { diff --git a/src/views/charts/charts/chart-echart-mixin.js b/src/views/charts/charts/chart-echart-mixin.js index 46f5bb51..fe06f5f5 100644 --- a/src/views/charts/charts/chart-echart-mixin.js +++ b/src/views/charts/charts/chart-echart-mixin.js @@ -114,20 +114,38 @@ export default { const newSeries = [] const chartType = chartOption.series[0].type chartOption.series.forEach((series) => { - const seriesNew = { - ...series, - label: { - ...series.label, - fontSize: echartLabelFontSize - }, - markLine: { - ...series.markLine, + if (series.markLine) { + const seriesNew = { + ...series, label: { + ...series.label, fontSize: echartLabelFontSize + }, + markLine: { + ...series.markLine, + label: { + ...series.markLine.label, + fontSize: echartLabelFontSize + } } } + newSeries.push(seriesNew) + } else { + const seriesNew = { + ...series, + label: { + ...series.label, + fontSize: echartLabelFontSize + }, + markLine: { + ...series.markLine, + label: { + fontSize: echartLabelFontSize + } + } + } + newSeries.push(seriesNew) } - newSeries.push(seriesNew) }) if (chartType === 'pie') {