|
@@ -298,12 +298,18 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
|
|
|
|
|
|
xEdbIdValue, yDataList, err = BarChartData(baseEdbInfoMapping, edbList, futureGoodEdbInfoList, edbDataListMap, barChartInfoDateList, regionType, baseEdbInfoMapping.EndDate)
|
|
|
|
|
|
- xDataList = []data_manage.XData{
|
|
|
- {
|
|
|
- Name: "现货价",
|
|
|
- NameEn: "Spot Price",
|
|
|
- },
|
|
|
+ if len(barChartInfoConf.XDataList) > 0 {
|
|
|
+ xDataList = barChartInfoConf.XDataList
|
|
|
+ } else {
|
|
|
+ for _, v := range edbInfoMappingList {
|
|
|
+ xDataList = append(xDataList, data_manage.XData{
|
|
|
+ Name: v.EdbName,
|
|
|
+ NameEn: v.EdbNameEn,
|
|
|
+ IsHide: 0,
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
//yDataList =make([]data_manage.YData,0)
|
|
|
//data_manage.YData{
|
|
|
// Date: "",
|
|
@@ -403,7 +409,10 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
|
|
|
if err != nil {
|
|
|
return
|
|
|
}
|
|
|
- xDataList = append(xDataList, tmpXDataList...)
|
|
|
+ if len(barChartInfoConf.XDataList) == 0 {
|
|
|
+ xDataList = append(xDataList, tmpXDataList...)
|
|
|
+ }
|
|
|
+
|
|
|
yDataList = newYDataList
|
|
|
|
|
|
return
|