fix

controllers/data_manage/chart_info.go

@@ -3348,21 +3348,21 @@ func (this *ChartInfoController) ChartInfoConvertDetail() {
 	// 图表额外数据参数
 	extraConfigStr := chartInfo.ExtraConfig
 	// 柱方图的一些配置
-	var barConfig data_manage.BarChartInfoReq
-	if chartInfo != nil && chartInfo.ChartType == 7 {
-		if chartInfo.BarConfig == `` {
-			br.Msg = "柱方图未配置"
-			br.ErrMsg = "柱方图未配置"
-			return
-		}
-		err := json.Unmarshal([]byte(chartInfo.BarConfig), &barConfig)
-		if err != nil {
-			br.Msg = "柱方图配置异常"
-			br.ErrMsg = "柱方图配置异常"
-			return
-		}
-		extraConfigStr = chartInfo.BarConfig
-	}
+	//var barConfig data_manage.BarChartInfoReq
+	//if chartInfo != nil && chartInfo.ChartType == 7 {
+	//	if chartInfo.BarConfig == `` {
+	//		br.Msg = "柱方图未配置"
+	//		br.ErrMsg = "柱方图未配置"
+	//		return
+	//	}
+	//	err := json.Unmarshal([]byte(chartInfo.BarConfig), &barConfig)
+	//	if err != nil {
+	//		br.Msg = "柱方图配置异常"
+	//		br.ErrMsg = "柱方图配置异常"
+	//		return
+	//	}
+	//	extraConfigStr = chartInfo.BarConfig
+	//}
 	yearMax := 0
 	if dateType == utils.DateTypeNYears {
 		for _, v := range mappingList {

models/data_manage/chart_info.go

@@ -837,6 +837,11 @@ func EditChartInfoAndMapping(req *EditChartInfoReq, edbInfoIdStr string, calenda
 			mapItem.ChartWidth = v.ChartWidth
 			mapItem.Source = utils.CHART_SOURCE_DEFAULT
 			mapItem.EdbAliasName = v.EdbAliasName
+			mapItem.IsConvert = v.IsConvert
+			mapItem.ConvertType = v.ConvertType
+			mapItem.ConvertValue = v.ConvertValue
+			mapItem.ConvertUnit = v.ConvertUnit
+			mapItem.ConvertEnUnit = v.ConvertEnUnit
 			tmpId, err := to.Insert(mapItem)
 			if err != nil {
 				fmt.Println("AddChartEdbMapping Err:" + err.Error())

services/data/chart_info.go

@@ -560,13 +560,19 @@ func getEdbDataMapList(chartInfoId, chartType int, calendar, startDate, endDate
 				item.MinData = item.MinData / v.ConvertValue
 			case 3:
 				for i, data := range dataList {
-					dataList[i].Value =  math.Log(data.Value) / math.Log(v.ConvertValue)
+					dataList[i].Value = math.Log(data.Value) / math.Log(v.ConvertValue)
 				}
 				item.MaxData = math.Log(item.MaxData) / math.Log(v.ConvertValue)
 				item.MinData = math.Log(item.MinData) / math.Log(v.ConvertValue)
 			}
+			if v.ConvertUnit != "" {
+				item.Unit = v.ConvertUnit
+			}
+			if v.ConvertEnUnit != "" {
+				item.UnitEn = v.ConvertEnUnit
+			}
 		}
-		
+
 		edbDataListMap[v.EdbInfoId] = dataList
 
 		if diffSeconds != 0 && v.EdbInfoType == 0 {
@@ -2195,6 +2201,11 @@ func AddChartInfo(req data_manage.AddChartInfoReq, sysUserId int, sysUserRealNam
 		mapItem.ChartWidth = v.ChartWidth
 		mapItem.Source = utils.CHART_SOURCE_DEFAULT
 		mapItem.EdbAliasName = v.EdbAliasName
+		mapItem.IsConvert = v.IsConvert
+		mapItem.ConvertType = v.ConvertType
+		mapItem.ConvertValue = v.ConvertValue
+		mapItem.ConvertUnit = v.ConvertUnit
+		mapItem.ConvertEnUnit = v.ConvertEnUnit
 		mapList = append(mapList, mapItem)
 	}
 	err = data_manage.AddChartEdbMapping(mapList)