|
|
@@ -101,7 +101,10 @@ func (this *RangeChartChartInfoController) Preview() {
|
|
|
br.ErrMsg = "获取区间计算图表, 图表计算值失败, Err:" + e.Error()
|
|
|
return
|
|
|
}
|
|
|
-
|
|
|
+ if req.ExtraConfig.DataConvertType > 0 && req.ExtraConfig.DataConvertConf.Unit != "" && req.ExtraConfig.DataConvertConf.Unit != "无" {
|
|
|
+ chartInfo.Unit = req.ExtraConfig.DataConvertConf.Unit
|
|
|
+ chartInfo.UnitEn = req.ExtraConfig.DataConvertConf.EnUnit
|
|
|
+ }
|
|
|
//添加配置信息
|
|
|
if req.ExtraConfig.MultipleGraphConfigId == 0 {
|
|
|
multipleGraphConfig := &data_manage.MultipleGraphConfig{
|
|
|
@@ -420,7 +423,10 @@ func (this *RangeChartChartInfoController) Detail() {
|
|
|
//判断是否需要展示英文标识
|
|
|
chartInfo.IsEnChart = data.CheckIsEnChart(chartInfo.ChartNameEn, edbList[0:1], chartInfo.Source, chartInfo.ChartType)
|
|
|
// todo 中英文处理
|
|
|
- chartInfo.UnitEn = extraConfig.DataConvertConf.EnUnit
|
|
|
+ if extraConfig.DataConvertType > 0 && extraConfig.DataConvertConf.Unit != "" && extraConfig.DataConvertConf.Unit != "无" {
|
|
|
+ chartInfo.Unit = extraConfig.DataConvertConf.Unit
|
|
|
+ chartInfo.UnitEn = extraConfig.DataConvertConf.EnUnit
|
|
|
+ }
|
|
|
|
|
|
sourceNameList, sourceNameEnList := data.GetEdbSourceByEdbInfoIdList(edbList)
|
|
|
chartInfo.ChartSource = strings.Join(sourceNameList, ",")
|
