|
|
@@ -357,8 +357,10 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
|
|
|
}
|
|
|
|
|
|
// 基础指标
|
|
|
+ baseEdbIds := make([]int, 0)
|
|
|
for _, tmp := range edbInfoMappingList {
|
|
|
edbInfoIdList = append(edbInfoIdList, tmp.EdbInfoId)
|
|
|
+ baseEdbIds = append(baseEdbIds, tmp.EdbInfoId)
|
|
|
tmpVal, ok := yDataMap[tmp.EdbInfoId]
|
|
|
valueList = append(valueList, tmpVal)
|
|
|
if !ok || tmpVal == 0 {
|
|
|
@@ -386,7 +388,7 @@ func GetChartEdbData(chartInfoId int, startDate, endDate string, baseEdbInfoMapp
|
|
|
|
|
|
for i := lenEdbId - 1; i >= 0; i-- {
|
|
|
// 如果没有在无数据的指标列表中找到，那么就找到了最大x轴的下标
|
|
|
- if _, ok := noDataEdbIdMap[edbInfoIdList[i]]; !ok {
|
|
|
+ if _, ok := noDataEdbIdMap[edbInfoIdList[i]]; !ok || utils.InArrayByInt(baseEdbIds, edbInfoIdList[i]) {
|
|
|
// 如果最大x轴的下标 小于 当前下标，那么就重新赋值
|
|
|
if maxIndex < i-1 {
|
|
|
maxIndex = i - 1
|
