|
@@ -358,7 +358,9 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
|
|
|
// 特殊图形数据处理
|
|
|
switch chartType {
|
|
|
case 2: // 季节性图
|
|
|
- dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
|
|
|
+ if seasonExtraConfig != "" {
|
|
|
+ dataResp, err = SeasonChartData(edbList, seasonExtraConfig)
|
|
|
+ }
|
|
|
case 7: // 柱形图
|
|
|
barChartConf := extraConfig.(data_manage.BarChartInfoReq)
|
|
|
xEdbIdValue, yDataList, err = BarChartData(mappingList, edbDataListMap, barChartConf.DateList, barChartConf.Sort)
|
|
@@ -3215,7 +3217,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
|
|
|
var seasonConfig data_manage.SeasonExtraItem
|
|
|
err = json.Unmarshal([]byte(seasonExtraConfig), &seasonConfig)
|
|
|
if err != nil {
|
|
|
- err = errors.New("截面散点配置异常, Err:" + err.Error())
|
|
|
+ err = errors.New("季节性图配置异常, Err:" + err.Error())
|
|
|
return
|
|
|
}
|
|
|
|