|
@@ -178,16 +178,16 @@ func GetChartInfoDetail(c *gin.Context) {
|
|
|
//fmt.Println("start_date:", startDate)
|
|
|
//fmt.Println("end_date:", endDate)
|
|
|
|
|
|
+ // 柱方图的一些配置
|
|
|
+ var barConfig request.BarChartInfoReq
|
|
|
barChartInfoDateList := make([]request.BarChartInfoDateReq, 0)
|
|
|
barChartInfoSort := request.BarChartInfoSortReq{}
|
|
|
- // 柱方图的一些配置
|
|
|
if chartInfo != nil && chartInfo.ChartType == 7 {
|
|
|
if chartInfo.BarConfig == `` {
|
|
|
response.FailMsg("柱方图未配置", "柱方图未配置", c)
|
|
|
return
|
|
|
}
|
|
|
|
|
|
- var barConfig request.BarChartInfoReq
|
|
|
err := json.Unmarshal([]byte(chartInfo.BarConfig), &barConfig)
|
|
|
if err != nil {
|
|
|
response.FailMsg("柱方图配置异常", "柱方图配置异常", c)
|
|
@@ -213,6 +213,17 @@ func GetChartInfoDetail(c *gin.Context) {
|
|
|
return
|
|
|
}
|
|
|
|
|
|
+ for _, v := range edbList {
|
|
|
+ // 指标别名
|
|
|
+ if barConfig.EdbInfoIdList != nil && len(barConfig.EdbInfoIdList) > 0 {
|
|
|
+ for _, reqEdb := range barConfig.EdbInfoIdList {
|
|
|
+ if v.EdbInfoId == reqEdb.EdbInfoId {
|
|
|
+ v.EdbAliasName = reqEdb.Name
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
sourceArr = append(sourceArr, "弘则研究")
|
|
|
chartInfo.ChartSource = strings.Join(sourceArr, ",")
|
|
|
|