zwxi 1 anno fa
parent
commit
75688f8280

+ 1 - 1
controllers/data_manage/chart_info.go

@@ -3383,7 +3383,7 @@ func (this *ChartInfoController) ChartInfoConvertDetail() {
 	startDate, endDate = utils.GetDateByDateTypeV2(dateType, startDate, endDate, startYear, yearMax)
 
 	// 获取图表中的指标数据
-	edbList, xEdbIdValue, yDataList, dataResp, err, errMsg := data.GetChartConvertEdbData(chartInfoId, chartType, calendar, startDate, endDate, mappingList, string(this.Ctx.Input.RequestBody), chartInfo.SeasonExtraConfig)
+	edbList, xEdbIdValue, yDataList, dataResp, err, errMsg := data.GetChartConvertEdbData(chartInfoId, chartType, calendar, startDate, endDate, mappingList, extraConfigStr, chartInfo.SeasonExtraConfig)
 	if err != nil {
 		br.Msg = "获取失败"
 		if errMsg != `` {

+ 5 - 0
models/data_manage/chart_info.go

@@ -1553,6 +1553,11 @@ type BarChartInfoReq struct {
 	YEdbList      []BarChartInfoEdbItemReq `description:"Y轴选择的指标列表"`
 	Unit          string                   `description:"中文单位"`
 	UnitEn        string                   `description:"英文单位"`
+	IsConvert     int                      `description:"是否数据转换 0不转 1转"`
+	ConvertType   int                      `description:"数据转换类型 1乘 2除 3对数"`
+	ConvertValue  float64                  `description:"数据转换值"`
+	ConvertUnit   string                   `description:"数据转换单位"`
+	ConvertEnUnit string                   `description:"数据转换单位"`
 }
 
 // BarChartInfoEdbItemReq 柱方图预览请求数据(指标相关)