|
@@ -2836,6 +2836,10 @@ func GetChartConvertEdbData(chartInfoId, chartType int, calendar, startDate, end
|
|
|
|
|
|
// 特殊图形数据处理
|
|
|
switch chartType {
|
|
|
+ case 2: // 季节性图
|
|
|
+ if seasonExtraConfig != "" {
|
|
|
+ dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
|
|
|
+ }
|
|
|
case 7: // 柱形图
|
|
|
barChartConf := extraConfig.(data_manage.BarChartInfoReq)
|
|
|
xEdbIdValue, yDataList, err = BarChartData(mappingList, edbDataListMap, barChartConf.DateList, barChartConf.Sort)
|
|
@@ -2952,6 +2956,7 @@ func getEdbConvertDataMapList(chartInfoId, chartType int, calendar, startDate, e
|
|
|
var diffSeconds int64
|
|
|
if chartType == 2 { //季节性图
|
|
|
startDateReal = startDate
|
|
|
+ item.IsAxis = v.IsAxis
|
|
|
} else {
|
|
|
if v.EdbInfoType == 0 && v.LeadUnit != "" && v.LeadValue > 0 { //领先指标
|
|
|
var startTimeRealTemp time.Time
|