|
@@ -1074,7 +1074,8 @@ function setStackOrCombinChart(e){
|
|
|
|
|
|
|
|
//预测指标配置
|
|
//预测指标配置
|
|
|
let predict_params = item.EdbInfoCategoryType === 1 ? getPredictParams(item) : {};
|
|
let predict_params = item.EdbInfoCategoryType === 1 ? getPredictParams(item) : {};
|
|
|
-
|
|
|
|
|
|
|
+ //图表可配置的线条数就10条,第11条用第1条的配置，索引取下模
|
|
|
|
|
+ const lineIndex = chartTheme ? index%chartTheme.lineOptionList.length : index
|
|
|
let seriesItemObj={
|
|
let seriesItemObj={
|
|
|
data:[],
|
|
data:[],
|
|
|
dataGrouping:{
|
|
dataGrouping:{
|
|
@@ -1086,7 +1087,7 @@ function setStackOrCombinChart(e){
|
|
|
nameZh:temName,
|
|
nameZh:temName,
|
|
|
nameEn:temNameEN,
|
|
nameEn:temNameEN,
|
|
|
color: item.ChartColor,
|
|
color: item.ChartColor,
|
|
|
- lineWidth: Number(item.ChartWidth),
|
|
|
|
|
|
|
+ lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptionList[lineIndex].lineWidth) || 1,
|
|
|
fillColor: (e.ChartInfo.ChartType === 3 || (e.ChartInfo.ChartType === 6 && item.ChartStyle === 'areaspline')) ? item.ChartColor : undefined,
|
|
fillColor: (e.ChartInfo.ChartType === 3 || (e.ChartInfo.ChartType === 6 && item.ChartStyle === 'areaspline')) ? item.ChartColor : undefined,
|
|
|
visible:true,
|
|
visible:true,
|
|
|
LatestDate:item.LatestDate,
|
|
LatestDate:item.LatestDate,
|
hbchen