xyxie 8 months ago
parent
commit
ce4ac3d3db
2 changed files with 3 additions and 3 deletions
  1. 2 3
      services/data/chart_extra_config.go
  2. 1 0
      services/data/chart_info.go

+ 2 - 3
services/data/chart_extra_config.go

@@ -202,7 +202,7 @@ func GetEnNameMapByCnNameList(cnNameList []string) (contentEnMap map[string]stri
 }
 
 // GetChartSectionCombineData 截面组合图的数据处理
-func GetChartSectionCombineData(chartInfoId int, mappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap map[int][]*data_manage.EdbDataList, extraConfig data_manage.ChartSectionAllExtraConf) (edbIdList []int, chartDataResp data_manage.SectionScatterInfoResp, err error) {
+func GetChartSectionCombineData(chartInfoId int, mappingList []*data_manage.ChartEdbInfoMapping, edbDataListMap map[int][]*data_manage.EdbDataList, extraConfig data_manage.ChartSectionAllExtraConf) (edbIdList []int, dataListResp data_manage.ChartSectionCombineDataResp, err error) {
 	// 指标数据数组(10086:{"2022-12-02":100.01,"2022-12-01":102.3})
 	edbDataMap := make(map[int]map[string]float64)
 	for edbInfoId, edbDataList := range edbDataListMap {
@@ -229,8 +229,7 @@ func GetChartSectionCombineData(chartInfoId int, mappingList []*data_manage.Char
 	// 遍历每个系列
 	// 遍历每个指标,根据选中的日期,进行日期变换得到最终的日期,根据最终的日期获取对应的值
 	// 组装数据
-	dataListResp := new(data_manage.ChartSectionCombineDataResp) //y轴的数据列表
-	baseSeries := new(data_manage.ChartSectionSeriesItem)        //y轴的系列
+	baseSeries := new(data_manage.ChartSectionSeriesItem) //y轴的系列
 	var firstUnit, leftUnit, rightUnit, right2Unit *data_manage.XData
 	for _, seriesItem := range extraConfig.SeriesList {
 		var maxDate time.Time

+ 1 - 0
services/data/chart_info.go

@@ -394,6 +394,7 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 
 		//todo 检查基准系列是否设置
 		//todo 如果是详情接口,应该要从其他表里查询配置
+		extraConfig = sectionExtraConfig
 	default:
 		xEdbIdValue = make([]int, 0)
 		yDataList = make([]data_manage.YData, 0)