zwxi 9 月之前
父節點
當前提交
a306902913
共有 2 個文件被更改,包括 12 次插入3 次删除
  1. 10 1
      controllers/data_manage/chart_info.go
  2. 2 2
      models/data_manage/chart_info.go

+ 10 - 1
controllers/data_manage/chart_info.go

@@ -4316,8 +4316,17 @@ func (this *ChartInfoController) PreviewSeasonChartInfo() {
 			v.EdbAliasName = name
 		}
 	}
+
+	var seasonExtraConfig string
+	seasonExtra, tErr := json.Marshal(req.SeasonExtraConfig)
+	if tErr != nil {
+		br.Msg = "季节性图表配置信息异常"
+		br.ErrMsg = "季节性图表配置信息异常,Err:" + tErr.Error()
+		return
+	}
+	seasonExtraConfig = string(seasonExtra)
 	// 获取图表中的指标数据
-	edbList, xEdbIdValue, yDataList, dataResp, err, errMsg := data.GetChartEdbData(0, chartType, "", "", "", mappingList, "", req.SeasonExtraConfig)
+	edbList, xEdbIdValue, yDataList, dataResp, err, errMsg := data.GetChartEdbData(0, chartType, "", "", "", mappingList, "", seasonExtraConfig)
 	if err != nil {
 		br.Msg = "获取失败"
 		if errMsg != `` {

+ 2 - 2
models/data_manage/chart_info.go

@@ -1471,7 +1471,7 @@ type SeasonRightAxis struct {
 // 自定义同期上下限
 type MaxMinLimits struct {
 	Color  string `description:"颜色"`
-	year   int    `description:"上下限取值范围"`
+	Year   int    `description:"上下限取值范围"`
 	Legend string `description:"图例名称"`
 }
 
@@ -2439,5 +2439,5 @@ type RadarYData struct {
 // PreviewSeasonChartReq 预览季节性图的请求入参
 type PreviewSeasonChartReq struct {
 	ChartEdbInfoList  []*ChartSaveItem `description:"指标及配置信息"`
-	SeasonExtraConfig string           `description:"季节图额外配置信息,json字符串"`
+	SeasonExtraConfig SeasonExtraItem           `description:"季节图额外配置信息,json字符串"`
 }