截面组合图

controllers/data_manage/chart_theme.go

@@ -182,6 +182,12 @@ func (c *ChartThemeController) GetThemePreviewData() {
 		chartInfo.LeftMax = "60000"
 		extraConfigStr = `{"DateList":[{"Type":3,"Date":"2023-11-01","Value":0,"Color":"","Name":""},{"Type":1,"Date":"","Value":0,"Color":"","Name":""}]}`
 		chartInfo.ChartName = "雷达图"
+	case utils.CHART_TYPE_SECTION_COMBINE:
+		edbInfoIdList = []int{19, 20, 21, 22, 23, 24}
+		chartInfo.LeftMin = "0"
+		chartInfo.LeftMax = "4000"
+		extraConfigStr = `{"DateConfList":[],"IsHeap":1,"XDataList":[{"Name":"内销","NameEn":""},{"Name":"出口","NameEn":""},{"Name":"销量","NameEn":""},{"Name":"产量","NameEn":""}],"UnitList":{"LeftName":"万台","LeftNameEn":"","RightName":"%","RightNameEn":"%","RightTwoName":"","RightTwoNameEn":""},"BaseChartSeriesName":"增量","SortType":0,"SeriesList":[{"ChartSeriesId":1,"SeriesName":"增量","SeriesNameEn":"","ChartStyle":"bar","ChartColor":"#FF0000","ChartWidth":2,"IsPoint":1,"IsNumber":1,"IsAxis":0,"MaxData":4000,"MinData":0,"IsOrder":true,"EdbInfoList":[{"ChartSeriesEdbMappingId":0,"ChartSeriesId":0,"EdbInfoId":0,"DateConf":{},"DateConfName":""}],"DataList":[1455,1076,2532,3729],"NoDataEdbIdList":[]},{"ChartSeriesId":2,"SeriesName":"增速","SeriesNameEn":"","ChartStyle":"line","ChartColor":"#FF0000","ChartWidth":2,"IsPoint":1,"IsNumber":1,"IsAxis":1,"MaxData":15,"MinData":10,"IsOrder":true,"EdbInfoList":[{"ChartSeriesEdbMappingId":0,"ChartSeriesId":0,"EdbInfoId":0,"DateConf":{},"DateConfName":""}],"DataList":[13,12,12,14],"NoDataEdbIdList":[]}]}`
+		chartInfo.ChartName = "图表标题"
 	default:
 		br.Msg = "暂不支持该类型"
 		br.IsSendEmail = false
@@ -679,7 +685,6 @@ func (c *ChartThemeController) ListBySource() {
 		list[i].Config = newConfig
 	}
 
-
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

services/data/chart_extra_config.go

@@ -513,11 +513,10 @@ func GetChartSectionCombineData(chartInfoId int, mappingList []*data_manage.Char
 		unitList.RightTwoNameEn = right2Unit.NameEn
 	}
 
-	dataListResp.XDataList = extraConfig.XDataList
 	dataListResp.SeriesList = extraConfig.SeriesList
 	dataListResp.DateConfList = extraConfig.DateConfList
 	dataListResp.BaseChartSeriesName = extraConfig.BaseChartSeriesName
-	dataListResp.UnitList = extraConfig.UnitList
+	dataListResp.UnitList = unitList
 	dataListResp.IsHeap = extraConfig.IsHeap
 	dataListResp.SortType = extraConfig.SortType
 	return

services/data/chart_theme.go

@@ -121,6 +121,39 @@ func GetThemePreviewChartEdbData(chartType int, calendar, startDate, endDate str
 	case utils.CHART_TYPE_RADAR: //雷达图
 		radarConf := extraConfig.(data_manage.RadarChartInfoReq)
 		xEdbIdValue, dataResp, err = RadarChartData(mappingList, edbDataListMap, radarConf)
+	case utils.CHART_TYPE_SECTION_COMBINE: // 截面组合图
+		var sectionConf data_manage.ChartSectionAllExtraConf
+		if extraConfigStr == `` {
+			errMsg = "截面散点图未配置"
+			err = errors.New(errMsg)
+			return
+		}
+		err = json.Unmarshal([]byte(extraConfigStr), &sectionConf)
+		if err != nil {
+			errMsg = "截面散点配置异常"
+			err = errors.New(errMsg + err.Error())
+			return
+		}
+
+		// edbIdList 指标展示顺序；x轴的指标顺序
+		xEdbIdValue = make([]int, 0)
+		for _, v := range mappingList {
+			xEdbIdValue = append(xEdbIdValue, v.EdbInfoId)
+		}
+		dataResp = &data_manage.ChartSectionCombineDataResp{
+			DateConfList:        sectionConf.DateConfList,
+			IsHeap:              sectionConf.IsHeap,
+			XDataList:           sectionConf.XDataList,
+			UnitList:            sectionConf.UnitList,
+			BaseChartSeriesName: sectionConf.BaseChartSeriesName,
+			SortType:            sectionConf.SortType,
+			SeriesList:          sectionConf.SeriesList,
+		}
+
+		// 这个数据没有必要返回给前端
+		for _, v := range edbList {
+			v.DataList = nil
+		}
 	}
 	return
 }