|
|
@@ -3483,13 +3483,13 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
}
|
|
|
|
|
|
// 自定义右轴
|
|
|
- if seasonConfig.RightAxis.IndicatorType == 1 {
|
|
|
+ //if seasonConfig.RightAxis.IndicatorType == 1 {
|
|
|
//dataResp.RightAxis.EdbInfoList = quarterDataList[0].DataList
|
|
|
startTime, _ := time.Parse(utils.FormatDate, mappingItem.StartDate)
|
|
|
for i := len(quarterDataList) - 1; i > len(quarterDataList)-2 && i > 0; i-- {
|
|
|
rightMappingItem := mappingItem
|
|
|
// 计算同比值
|
|
|
- tbzDataList, maxValue, minValue, e := GetEdbDataTbzForSeason(mappingItem.Frequency, quarterDataList[i].DataList, startTime)
|
|
|
+ tbzDataList, minValue, maxValue, e := GetEdbDataTbzForSeason(mappingItem.Frequency, quarterDataList[i].DataList, startTime)
|
|
|
if e != nil {
|
|
|
err = errors.New("计算同比值失败, Err:" + e.Error())
|
|
|
return
|
|
|
@@ -3500,8 +3500,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
dataResp.RightAxis.EdbInfoList = append(dataResp.RightAxis.EdbInfoList, rightMappingItem)
|
|
|
dataResp.RightAxis.SeasonRightAxis = seasonConfig.RightAxis
|
|
|
}
|
|
|
-
|
|
|
- }
|
|
|
+ //}
|
|
|
}
|
|
|
|
|
|
return
|
zwxi