Merge branch 'feature/eta1.9.7_range' into debug

services/data/range_analysis/chart_info.go

@@ -421,6 +421,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.([]*models.EdbDataList)
 		// 处理上下限
 		var maxData, minData float64
@@ -548,6 +554,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