测试bug修复

src/views/dataEntry_manage/mixins/chartPublic.js

@@ -731,7 +731,7 @@ export const chartSetMixin = {
 
       /* 主题样式*/
       const chartTheme =  this.chartInfo.ChartThemeStyle ? JSON.parse(this.chartInfo.ChartThemeStyle) : null;
-
+      console.log(this.chartInfo,'chartTheme',chartTheme);
       //拼接标题 数据列
       let data = [];
       let ydata = [];
@@ -837,12 +837,12 @@ export const chartSetMixin = {
           nameEn:item.EdbNameEn?`${item.EdbNameEn}${dynamic_tag_en}`:`${item.EdbAliasName||item.EdbName}${dynamic_tag}`,
           color: item.ChartColor,
           lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptionList[index].lineWidth),
-          marker: {
-            enabled:chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none',
+          marker: chartTheme && chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none'?{
+            enabled:true,
             symbol: chartTheme.lineOptionList[index].markType || 'circle',
             fillColor:chartTheme.lineOptionList[index].markColor,
             radius: chartTheme.lineOptionList[index].markSize
-          },
+          }:{},
           ...predict_params
         };
         item.DataList = item.DataList || [];
@@ -1129,12 +1129,12 @@ export const chartSetMixin = {
           yAxis: 0,
           name: this.isPredictorChart?j.Year:j.ChartLegend,
           lineWidth: (chartTheme&&chartTheme.lineOptionList[index].lineWidth) || 1,
-          marker: {
-            enabled:chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none',
+          marker: chartTheme && chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none'?{
+            enabled:true,
             symbol: chartTheme.lineOptionList[index].markType || 'circle',
             fillColor:chartTheme.lineOptionList[index].markColor,
             radius: chartTheme.lineOptionList[index].markSize
-          },
+          }:{},
           ...predict_params
         };
         const data_array = this.calendar_type === '农历' && this.isPredictorChart?_.cloneDeep(j.Items):_.cloneDeep(j.DataList);

src/views/ppt_manage/mixins/mixins.js

@@ -211,12 +211,12 @@ export default {
           nameEn:nameEn,
           color: item.ChartColor,
           lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptionList[index].lineWidth),
-          marker: {
-            enabled:chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none',
+          marker: chartTheme && chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none'?{
+            enabled:true,
             symbol: chartTheme.lineOptionList[index].markType || 'circle',
             fillColor:chartTheme.lineOptionList[index].markColor,
             radius: chartTheme.lineOptionList[index].markSize
-          },
+          }:{},
           ...predict_params
         };
         item.DataList = item.DataList || [];
@@ -465,12 +465,12 @@ export default {
           yAxis: 0,
           name: j.ChartLegend,
           lineWidth: (chartTheme&&chartTheme.lineOptionList[index].lineWidth) || 1,
-          marker: {
-            enabled:chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none',
+          marker: chartTheme && chartTheme.lineOptionList[index].dataMark && chartTheme.lineOptionList[index].dataMark!='none'?{
+            enabled:true,
             symbol: chartTheme.lineOptionList[index].markType || 'circle',
             fillColor:chartTheme.lineOptionList[index].markColor,
             radius: chartTheme.lineOptionList[index].markSize
-          },
+          }:{},
           ...predict_params
         };
         const data_array = _.cloneDeep(j.DataList);