From b3f6b5c7eaea41af7b1f37084501f01dd1f280b3 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Wed, 11 May 2022 12:37:16 +0800
Subject: [PATCH] =?UTF-8?q?CN-525=20echarts=E5=9B=BE=E5=86=85=E6=96=87?=
 =?UTF-8?q?=E5=AD=97=E5=8A=A8=E6=80=81=E8=B0=83=E6=95=B4=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?,=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9A=E6=8A=98?=
 =?UTF-8?q?=E7=BA=BF=E5=9B=BEmarkline=E6=A0=87=E7=AD=BE=E6=9C=AA=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=AE=8C=E5=85=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/tools.js                            | 35 +++++++++++++-----
 src/views/charts/charts/chart-echart-mixin.js | 36 ++++++++++++++-----
 2 files changed, 53 insertions(+), 18 deletions(-)

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') {