|
@@ -424,14 +424,17 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
|
|
|
var extraConfig interface{}
|
|
|
switch chartType {
|
|
|
case 6: //时序组合图
|
|
|
- //判断是否堆积
|
|
|
- timeConf := extraConfig.(chart_info.ChartTimeCombineExtraConf)
|
|
|
- if extraConfigStr == "" { //历史数据,默认开启堆积
|
|
|
- timeConf = chart_info.ChartTimeCombineExtraConf{
|
|
|
- IsHeap: 1,
|
|
|
+ var tmpConfig chart_info.ChartTimeCombineExtraConf
|
|
|
+ if extraConfigStr != `` {
|
|
|
+ err = json.Unmarshal([]byte(extraConfigStr), &tmpConfig)
|
|
|
+ if err != nil {
|
|
|
+ errMsg = "雷达图配置异常"
|
|
|
+ err = errors.New(errMsg)
|
|
|
+ return
|
|
|
}
|
|
|
}
|
|
|
- dataResp = chart_info.ChartTimeCombineDataResp{IsHeap: timeConf.IsHeap}
|
|
|
+
|
|
|
+ extraConfig = tmpConfig
|
|
|
case 7: // 柱形图
|
|
|
var barConfig request.BarChartInfoReq
|
|
|
if extraConfigStr == `` {
|