|
@@ -380,7 +380,8 @@ export default {
|
|
|
|
|
|
|
|
//预测指标配置
|
|
//预测指标配置
|
|
|
let predict_params = item.EdbInfoCategoryType === 1 ? this.getPredictParams(item,chartStyle) : {};
|
|
let predict_params = item.EdbInfoCategoryType === 1 ? this.getPredictParams(item,chartStyle) : {};
|
|
|
-
|
|
|
|
|
|
|
+ //图表可配置的线条数就10条,第11条用第1条的配置，索引取下模
|
|
|
|
|
+ const lineIndex = chartTheme ? index%chartTheme.lineOptionList.length : index
|
|
|
//中英文名称
|
|
//中英文名称
|
|
|
const nameCh = dynamic_arr.length > 1
|
|
const nameCh = dynamic_arr.length > 1
|
|
|
? `${item.EdbAliasName||item.EdbName}(${item.SourceName})${dynamic_tag}`
|
|
? `${item.EdbAliasName||item.EdbName}(${item.SourceName})${dynamic_tag}`
|
|
@@ -396,7 +397,7 @@ export default {
|
|
|
nameCh:nameCh,
|
|
nameCh:nameCh,
|
|
|
nameEn:nameEn,
|
|
nameEn:nameEn,
|
|
|
color: item.ChartColor,
|
|
color: item.ChartColor,
|
|
|
- lineWidth: Number(item.ChartWidth),
|
|
|
|
|
|
|
+ lineWidth: Number(item.ChartWidth)||(chartTheme&&chartTheme.lineOptionList[lineIndex].lineWidth) || 1,
|
|
|
// fillColor: (this.chartInfo.ChartType === 3 || (this.chartInfo.ChartType === 6 && item.ChartStyle === 'areaspline')) ? item.ChartColor : undefined,
|
|
// fillColor: (this.chartInfo.ChartType === 3 || (this.chartInfo.ChartType === 6 && item.ChartStyle === 'areaspline')) ? item.ChartColor : undefined,
|
|
|
borderWidth: 1,
|
|
borderWidth: 1,
|
|
|
borderColor: item.ChartColor,
|
|
borderColor: item.ChartColor,
|
hbchen