|
@@ -1428,12 +1428,12 @@ const setSplineOpt=(data)=>{
|
|
|
visible:true,
|
|
|
LatestDate:item.LatestDate,
|
|
|
LatestValue:item.LatestValue,
|
|
|
- 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 || [];
|
|
@@ -1858,12 +1858,12 @@ const setSeasonOpt=(data)=>{
|
|
|
name:item.ChartLegend,
|
|
|
color:colorsArr.slice(-chartDataHandle.length)[index],
|
|
|
visible:true,
|
|
|
- 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||[]
|