图例修改

controllers/data_manage/chart_theme.go

@@ -205,7 +205,7 @@ func (c *ChartThemeController) GetThemePreviewData() {
 		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":[]}]}`
+		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":"column","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":"spline","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 = "暂不支持该类型"

services/data/chart_extra_config.go

@@ -242,7 +242,7 @@ func GetEnNameMapByCnNameList(cnNameList []string) (contentEnMap map[string]stri
 	return
 }
 
-// handleSectionScatterChartData 截面组合图的数据处理
+// handleSectionScatterChartData 截面组合图的英文文案处理
 func handleChartSectionCombineData(extraConfig data_manage.ChartSectionAllExtraConf) (newExtraConfig data_manage.ChartSectionAllExtraConf, err error, errMsg string) {
 	translateNameList := make([]string, 0)
 	translateNameMap := make(map[string]bool, 0)
@@ -542,7 +542,6 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 	}
 	dataListResp.XDataList = xDataList
 
-	// todo 处理纵轴, 如果只存在一个右轴会有问题
 	unitList := new(data_manage.ChartSectionCombineUnit)
 	if baseSeries.IsAxis == 1 { //左轴，右轴
 		leftUnit = firstUnit
@@ -618,6 +617,9 @@ func GetChartSectionCombineData(chartInfo *data_manage.ChartInfo, mappingList []
 			}
 		}
 	}
+
+	// 处理系列排序
+
 	dataListResp.SeriesList = extraConfig.SeriesList
 	dataListResp.DateConfList = extraConfig.DateConfList
 	dataListResp.BaseChartSeriesName = extraConfig.BaseChartSeriesName

services/data/chart_info.go

@@ -526,7 +526,7 @@ func GetChartEdbData(chartInfoId, chartType int, calendar, startDate, endDate st
 	case 6: //时序组合图
 		//判断是否堆积
 		timeConf := extraConfig.(data_manage.ChartTimeCombineExtraConf)
-		if extraConfig == nil { //历史数据，默认开启堆积
+		if extraConfigStr == "" { //历史数据，默认开启堆积
 			timeConf = data_manage.ChartTimeCombineExtraConf{
 				IsHeap: 1,
 			}

services/data/chart_theme.go

@@ -148,6 +148,10 @@ func GetThemePreviewChartEdbData(chartType int, calendar, startDate, endDate str
 			BaseChartSeriesName: sectionConf.BaseChartSeriesName,
 			SortType:            sectionConf.SortType,
 			SeriesList:          sectionConf.SeriesList,
+			LeftMin:             "0",
+			LeftMax:             "4000",
+			RightMin:            "10",
+			RightMax:            "15",
 		}
 
 		// 这个数据没有必要返回给前端