Merge branch 'eta_2.2.9_residual_analysis_1104@guomengyuan' into debug

models/residual_analysis_model/calculate_residual_analysis_config.go

@@ -171,8 +171,9 @@ type DetailEdbInfoList struct {
 
 // ResidualAnalysisDetailResp 详情响应接口
 type ResidualAnalysisDetailResp struct {
-	ConfigInfo  *CalculateResidualAnalysisConfig
-	EdbInfoList []*DetailEdbInfoList
+	ConfigInfo   *CalculateResidualAnalysisConfig
+	EdbInfoList  []*DetailEdbInfoList
+	ResidualType int `description:"残差类型: 1-映射残差 2-拟合残差"`
 }
 
 // GetResidualAnalysisConfigById 根据配置id查询配置信息

services/residual_analysis_service/residual_analysis_service.go

@@ -188,6 +188,7 @@ func fillResidualChartInfo(edbInfoMappingA *data_manage.ChartEdbInfoMapping, edb
 			mappingEdb[i].EdbName = edbInfoMappingA.EdbName + "映射残差/" + edbInfoMappingB.EdbName
 			mappingEdb[i].IsAxis = 1
 			mappingEdb[i].ChartColor = `#00F`
+			mappingEdb[i].IsOrder = false
 		} else {
 			mappingEdb[i].IsAxis = 0
 			mappingEdb[i].ChartColor = `#F00`
@@ -714,8 +715,9 @@ func ResidualAnalysisDetail(edbInfoId int) (residual_analysis_model.ResidualAnal
 	}
 
 	resp := residual_analysis_model.ResidualAnalysisDetailResp{
-		ConfigInfo:  &configInfo,
-		EdbInfoList: edbInfoListResp,
+		ConfigInfo:   &configInfo,
+		EdbInfoList:  edbInfoListResp,
+		ResidualType: mapping.ResidualType,
 	}
 
 	return resp, nil