diff --git a/models/report/report.go b/models/report/report.go index 097af25..e36da2f 100644 --- a/models/report/report.go +++ b/models/report/report.go @@ -12,7 +12,7 @@ type AWMDisplay struct { UseField string `json:"useField"` Data []FilterDataInfo `json:"data"` Capacity int `json:"capacity"` - MU float64 `json:"mu"` + MU string `json:"mu"` Cate string `json:"cate"` MuTitle string `json:"muTitle"` MuUom string `json:"muUom"` diff --git a/services/report/implments/FilterDataInfo.service.impl.go b/services/report/implments/FilterDataInfo.service.impl.go index 17685d9..52cc58e 100644 --- a/services/report/implments/FilterDataInfo.service.impl.go +++ b/services/report/implments/FilterDataInfo.service.impl.go @@ -645,10 +645,10 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM } else { mu = float64(yesterdayCapacity) * yesterdayAvg / float64(yesterdayLength) } - mu, err = strconv.ParseFloat(fmt.Sprintf("%.2f", mu), 64) - if err != nil { - return result, err - } + //mu, err = strconv.ParseFloat(fmt.Sprintf("%.4f", mu), 64) + //if err != nil { + // return result, err + //} // 处理今天的数据 displayArcLi := make([]model.FilterDataInfo, 0) var sum float64 @@ -684,7 +684,7 @@ func (impl *FilterDataInfoServiceImplement) GetDisplayData() (result []model.AWM displayData.MuTitle = muTitle displayData.MuUom = muUom displayData.Capacity = capacity - displayData.MU = mu + displayData.MU = fmt.Sprintf("%.2f", mu * 100) + "%" displayData.Data = displayArcLi displayData.Start = startStr displayData.End = endStr