Browse Source

组合图图表样式预览

xyxie 7 months ago
parent
commit
4718e7aeb2
2 changed files with 14 additions and 2 deletions
  1. 2 2
      controllers/data_manage/chart_theme.go
  2. 12 0
      services/data/chart_theme.go

+ 2 - 2
controllers/data_manage/chart_theme.go

@@ -202,10 +202,10 @@ func (c *ChartThemeController) GetThemePreviewData() {
 		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}
+		edbInfoIdList = []int{19, 20, 21, 22, 23, 24, 25, 28}
 		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":"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":[]}]}`
+		extraConfigStr = `{\"DateConfList\":[],\"IsHeap\":0,\"XDataList\":[{\"Name\":\"内销\"},{\"Name\":\"出口\"},{\"Name\":\"销量\"},{\"Name\":\"产量\"}],\"UnitList\":{\"LeftName\":\"万台\",\"RightName\":\"%\",\"RightTwoName\":\"\"},\"BaseChartSeriesName\":\"增量\",\"SortType\":0,\"SeriesList\":[{\"ChartSeriesId\":0,\"SeriesName\":\"增量\",\"ChartStyle\":\"column\",\"ChartColor\":\"rgba(0, 0, 255, 1)\",\"ChartWidth\":1,\"IsPoint\":0,\"IsNumber\":0,\"IsAxis\":1,\"EdbInfoList\":[{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":19,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}},{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":20,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}},{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":21,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}},{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":22,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}}]},{\"ChartSeriesId\":0,\"SeriesName\":\"增速\",\"ChartStyle\":\"spline\",\"ChartColor\":\"rgba(255, 0, 200, 1)\",\"ChartWidth\":1,\"IsPoint\":0,\"IsNumber\":0,\"IsAxis\":0,\"EdbInfoList\":[{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":23,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}},{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":24,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}},{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":25,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}},{\"ChartSeriesEdbMappingId\":0,\"ChartSeriesId\":0,\"EdbInfoId\":26,\"DateConfName\":\"\",\"DateConfType\":0,\"DateConf\":{\"MoveForward\":0,\"DateChange\":[]}}]}]}`
 		chartInfo.ChartName = "图表标题"
 	default:
 		br.Msg = "暂不支持该类型"

+ 12 - 0
services/data/chart_theme.go

@@ -140,6 +140,18 @@ func GetThemePreviewChartEdbData(chartType int, calendar, startDate, endDate str
 		for _, v := range mappingList {
 			xEdbIdValue = append(xEdbIdValue, v.EdbInfoId)
 		}
+		for k, _ := range sectionConf.SeriesList {
+			if k == 0 {
+				sectionConf.SeriesList[k].DataList = []float64{1455, 1076, 2532, 3729}
+				sectionConf.SeriesList[k].MaxData = 3729
+				sectionConf.SeriesList[k].MinData = 1076
+			}
+			if k == 1 {
+				sectionConf.SeriesList[k].DataList = []float64{13, 12, 12, 14}
+				sectionConf.SeriesList[k].MaxData = 14
+				sectionConf.SeriesList[k].MinData = 12
+			}
+		}
 		dataResp = &data_manage.ChartSectionCombineDataResp{
 			DateConfList:        sectionConf.DateConfList,
 			IsHeap:              sectionConf.IsHeap,