Browse Source

时序组合图报错

xyxie 8 months ago
parent
commit
52d1736c6a
1 changed files with 9 additions and 6 deletions
  1. 9 6
      services/chart/chart_info.go

+ 9 - 6
services/chart/chart_info.go

@@ -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 == `` {