Browse Source

Merge branch 'eta_2.4.2_area_graph_1216@guomengyuan' into debug

gmy 4 days ago
parent
commit
082b54ef06
1 changed files with 11 additions and 0 deletions
  1. 11 0
      controllers/data_manage/chart_info.go

+ 11 - 0
controllers/data_manage/chart_info.go

@@ -2795,6 +2795,17 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 		chartInfo.ChartClassify = append(chartInfo.ChartClassify, chartClassifyParent)
 		chartInfo.ChartClassify = append(chartInfo.ChartClassify, chartClassifyParent)
 	}
 	}
 	chartInfo.ChartClassify = append(chartInfo.ChartClassify, chartViewClassify)
 	chartInfo.ChartClassify = append(chartInfo.ChartClassify, chartViewClassify)
+
+	// 面积图 面积堆积 数据处理
+	if chartInfo.ChartType == utils.CHART_TYPE_AREA {
+		err, errMsg = fillAreaGraphData(extraConfigStr, edbList)
+		if err != nil {
+			msg = "获取失败"
+			errMsg = "面积图面积堆积数据处理失败,Err:" + err.Error()
+			return
+		}
+	}
+
 	resp.EdbInfoList = edbList
 	resp.EdbInfoList = edbList
 	//判断是否需要展示英文标识
 	//判断是否需要展示英文标识
 	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList, chartInfo.Source, chartInfo.ChartType)
 	chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList, chartInfo.Source, chartInfo.ChartType)