|
@@ -202,7 +202,7 @@ func GetEnNameMapByCnNameList(cnNameList []string) (contentEnMap map[string]stri
|
|
|
}
|
|
|
|
|
|
|
|
|
-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) {
|
|
|
|
|
|
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)
|
|
|
- baseSeries := new(data_manage.ChartSectionSeriesItem)
|
|
|
+ baseSeries := new(data_manage.ChartSectionSeriesItem)
|
|
|
var firstUnit, leftUnit, rightUnit, right2Unit *data_manage.XData
|
|
|
for _, seriesItem := range extraConfig.SeriesList {
|
|
|
var maxDate time.Time
|