Merge remote-tracking branch 'origin/chart/13.9' into debug

services/chart/future_good/chart_info.go

@@ -592,13 +592,13 @@ func handleResultData(regionType string, yDataList []chart_info.YData, futureGoo
 	newYDataList = yDataList
 
 	if regionType == `国内` {
-		for i := range futureGoodEdbInfoList {
+		for i := 1; i < 12; i++ {
 			if i > maxIndex {
 				break
 			}
 			xDataList = append(xDataList, chart_info.XData{
-				Name:   fmt.Sprint("M+", i+1),
-				NameEn: fmt.Sprint("M+", i+1),
+				Name:   fmt.Sprint("M+", i),
+				NameEn: fmt.Sprint("M+", i),
 			})
 		}
 		return
@@ -703,30 +703,28 @@ func handleResultData(regionType string, yDataList []chart_info.YData, futureGoo
 		}
 	}
 
-	maxI := len(xDataList)
+	maxI := 0
 	for _, yData := range newYDataList {
 		lenEdb := len(yData.XEdbInfoIdList)
-		for i := lenEdb - 1; i >= 0; i-- {
-			if yData.XEdbInfoIdList[i] == 0 || utils.InArrayByInt(yData.NoDataEdbList, yData.XEdbInfoIdList[i]) {
-				maxI = i
-				if maxI > i {
+		for i := 0; i < lenEdb; i++ {
+			if yData.XEdbInfoIdList[i] != 0 && !utils.InArrayByInt(yData.NoDataEdbList, yData.XEdbInfoIdList[i]) {
+				if maxI < i {
 					maxI = i
 				}
-			} else {
-				break
 			}
 		}
 	}
 
-	//xDataList = xDataList[0:maxI]
-	//for yIndex, yData := range newYDataList {
-	//	if len(yData.XEdbInfoIdList) > maxI {
-	//		newYDataList[yIndex].XEdbInfoIdList = yData.XEdbInfoIdList[0:maxI]
-	//	}
-	//	if len(yData.Value) > maxI {
-	//		newYDataList[yIndex].Value = yData.Value[0:maxI]
-	//	}
-	//}
+	xDataList = xDataList[0:maxI]
+	for yIndex, yData := range newYDataList {
+		if len(yData.XEdbInfoIdList) > maxI+1 {
+			newYDataList[yIndex].XEdbInfoIdList = yData.XEdbInfoIdList[0 : maxI+1]
+		}
+		if len(yData.Value) > maxI+1 {
+			newYDataList[yIndex].Value = yData.Value[0 : maxI+1]
+		}
+	}
+
 	return
 }