|
@@ -424,6 +424,12 @@ func GetChartDataByEdbInfoList(chartInfoId int, dateType, startYear int, startDa
|
|
|
edbInfoMapping.ConvertUnit = req.DataConvertConf.Unit
|
|
|
edbInfoMapping.ConvertEnUnit = req.DataConvertConf.Unit
|
|
|
}
|
|
|
+ if edbInfoMapping.ConvertUnit == "无" {
|
|
|
+ edbInfoMapping.ConvertUnit = ""
|
|
|
+ }
|
|
|
+ if edbInfoMapping.ConvertEnUnit == "无" {
|
|
|
+ edbInfoMapping.ConvertEnUnit = ""
|
|
|
+ }
|
|
|
dataList := edbInfoMapping.DataList.([]*data_manage.EdbDataList)
|
|
|
// 处理上下限
|
|
|
var maxData, minData float64
|
|
@@ -551,6 +557,12 @@ func GetChartDataByEdbInfoListBySeries(chartInfoId int, dateType, startYear int,
|
|
|
edbInfoMapping.ConvertUnit = req.DataConvertConf.Unit
|
|
|
edbInfoMapping.ConvertEnUnit = req.DataConvertConf.Unit
|
|
|
}
|
|
|
+ if edbInfoMapping.ConvertUnit == "无" {
|
|
|
+ edbInfoMapping.ConvertUnit = ""
|
|
|
+ }
|
|
|
+ if edbInfoMapping.ConvertEnUnit == "无" {
|
|
|
+ edbInfoMapping.ConvertEnUnit = ""
|
|
|
+ }
|
|
|
edbInfoMapping.DataList = dataList
|
|
|
// 处理上下限
|
|
|
var maxData, minData float64
|