fix

models/data_manage/chart_info.go

@@ -279,6 +279,8 @@ type MarkersLine struct {
 	TextColor        string          `json:"textColor" description:"文本颜色"`
 	TextFontSize     int             `json:"textFontSize" description:"文本的字号大小"`
 	IsShow           bool            `json:"isShow" description:"是否显示连线及文本"`
+	EdbType          int             `json:"edbType" description:"指标类型 0图中第一个指标 1其他指标 前端回显用"`
+	EdbInfoId        int             `json:"edbInfoId" description:"指标id"`
 	Calculation      int             `json:"calculation" description:"计算方式 1区间均值 2区间均值加N倍标准差 3区间个数分位 4区间数值分位"`
 	CalculationValue int             `json:"calculationValue" description:"计算方式对应的值 2就是几倍标准差 3就是分位值 4就是数值值·"`
 	TimeIntervalType int             `json:"timeInterval" description:"时间区间 0跟随图表 1自定义"`
@@ -287,7 +289,7 @@ type MarkersLine struct {
 }
 
 type MarkersLineTime struct {
-	TimeType int               `json:"timeType" description:"时间类型 1固定 2动态"`
+	TimeType int               `json:"timeType" description:"时间类型 1固定 2动态 3至今(仅结束时间)"`
 	Date     string            `json:"date" description:"日期"`
 	Conf     EdbDateChangeConf `json:"conf" description:"动态时间配置"`
 }
@@ -1571,7 +1573,7 @@ type SeasonRightAxisResp struct {
 type MaxMinLimitsResp struct {
 	List   []*MaxMinLimitsData `description:"自定义上下限列表"`
 	Color  string              `description:"颜色"`
-	Year  int                 `description:"上下限取值范围"`
+	Year   int                 `description:"上下限取值范围"`
 	Legend string              `description:"图例名称"`
 	IsShow bool                `description:"是否显示"`
 	IsAdd  bool                `description:"是否添加"`

services/data/chart_info.go

@@ -3467,22 +3467,25 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 		}
 
 		// 自定义右轴
-		if seasonConfig.RightAxis.IndicatorType == 1 {
-			startTime, _ := time.Parse(utils.FormatDate, mappingItem.StartDate)
-			for i := len(quarterDataList) - 1; i > len(quarterDataList)-2 && i > 0; i-- {
-				rightMappingItem := mappingItem
-				// 计算同比值
-				tbzDataList, minValue, maxValue, e := GetEdbDataTbzForSeason(mappingItem.Frequency, quarterDataList[i].DataList, startTime)
-				if e != nil {
-					err = errors.New("计算同比值失败, Err:" + e.Error())
-					return
+		if seasonConfig.RightAxis.IndicatorType != 0 {
+			if seasonConfig.RightAxis.IndicatorType == 1 {
+				startTime, _ := time.Parse(utils.FormatDate, mappingItem.StartDate)
+				for i := len(quarterDataList) - 1; i > len(quarterDataList)-2 && i > 0; i-- {
+					var rightMappingItem data_manage.ChartEdbInfoMapping
+					rightMappingItem = *mappingItem
+					// 计算同比值
+					tbzDataList, minValue, maxValue, e := GetEdbDataTbzForSeason(mappingItem.Frequency, quarterDataList[i].DataList, startTime)
+					if e != nil {
+						err = errors.New("计算同比值失败, Err:" + e.Error())
+						return
+					}
+					rightMappingItem.DataList = tbzDataList
+					rightMappingItem.MaxData = maxValue
+					rightMappingItem.MinData = minValue
+					dataResp.RightAxis.EdbInfoList = append(dataResp.RightAxis.EdbInfoList, &rightMappingItem)
 				}
-				rightMappingItem.DataList = tbzDataList
-				rightMappingItem.MaxData = maxValue
-				rightMappingItem.MinData = minValue
-				dataResp.RightAxis.EdbInfoList = append(dataResp.RightAxis.EdbInfoList, rightMappingItem)
-				dataResp.RightAxis.SeasonRightAxis = seasonConfig.RightAxis
 			}
+			dataResp.RightAxis.SeasonRightAxis = seasonConfig.RightAxis
 		}
 	}