Merge branch '14.3' into debug

controllers/chart_common.go

@@ -317,11 +317,11 @@ func GetLineEquationChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, k
 
 	var getAData, getBData, getR2Data bool
 	switch lineChartInfoConfig.Source {
-	case utils.CHART_SOURCE_LINE_EQUATION_ONE:
+	case utils.CHART_MULTIPLE_GRAPH_LINE_EQUATION_ONE:
 		getAData = true
-	case utils.CHART_SOURCE_LINE_EQUATION_TWO:
+	case utils.CHART_MULTIPLE_GRAPH_LINE_EQUATION_TWO:
 		getBData = true
-	case utils.CHART_SOURCE_LINE_EQUATION_THREE:
+	case utils.CHART_MULTIPLE_GRAPH_LINE_EQUATION_THREE:
 		getR2Data = true
 	}
 
@@ -335,11 +335,11 @@ func GetLineEquationChartInfoDetailFromUniqueCode(chartInfo *models.ChartInfo, k
 
 	var resultResp interface{}
 	switch lineChartInfoConfig.Source {
-	case utils.CHART_SOURCE_LINE_EQUATION_ONE:
+	case utils.CHART_MULTIPLE_GRAPH_LINE_EQUATION_ONE:
 		resultResp = dataResp.AData
-	case utils.CHART_SOURCE_LINE_EQUATION_TWO:
+	case utils.CHART_MULTIPLE_GRAPH_LINE_EQUATION_TWO:
 		resultResp = dataResp.BData
-	case utils.CHART_SOURCE_LINE_EQUATION_THREE:
+	case utils.CHART_MULTIPLE_GRAPH_LINE_EQUATION_THREE:
 		resultResp = dataResp.R2Data
 	}
 

services/data/line_equation/chart_info.go

@@ -28,6 +28,8 @@ type LineEquationDataResp struct {
 	ChartWidth          int
 	EdbName             string
 	EdbNameEn           string
+	Unit                string
+	UnitEn              string
 	IsAxis              int
 	DataList            []models.EdbDataList
 }

utils/constants.go

@@ -156,9 +156,9 @@ const (
 	CHART_MULTIPLE_GRAPH_CORRELATION             = 2 // 相关性图
 	CHART_MULTIPLE_GRAPH_ROLLING_CORRELATION_ONE = 3 // 滚动相关性图1
 	CHART_MULTIPLE_GRAPH_ROLLING_CORRELATION_TWO = 4 // 滚动相关性图2
-	CHART_SOURCE_LINE_EQUATION_ONE               = 5 // 拟合方程-斜率图
-	CHART_SOURCE_LINE_EQUATION_TWO               = 6 // 拟合方程-截距图
-	CHART_SOURCE_LINE_EQUATION_THREE             = 7 // 拟合方程-相关性图
+	CHART_MULTIPLE_GRAPH_LINE_EQUATION_ONE       = 5 // 拟合方程-斜率图
+	CHART_MULTIPLE_GRAPH_LINE_EQUATION_TWO       = 6 // 拟合方程-截距图
+	CHART_MULTIPLE_GRAPH_LINE_EQUATION_THREE     = 7 // 拟合方程-相关性图
 )
 
 // FrequencyDaysMap 频度日期的map关系