zwxi 8 mēneši atpakaļ
vecāks
revīzija
b58ab9bd75
2 mainītis faili ar 21 papildinājumiem un 6 dzēšanām
  1. 5 1
      models/data_manage/chart_info.go
  2. 16 5
      services/data/chart_info.go

+ 5 - 1
models/data_manage/chart_info.go

@@ -1466,6 +1466,7 @@ type SeasonRightAxis struct {
 	LineColor     string `description:"线条颜色"`
 	LineWidth     int    `description:"线条宽度"`
 	LineStyle     string `description:"线条样式"`
+	IsShow        bool   `description:"是否显示"`
 }
 
 // 自定义同期上下限
@@ -1473,6 +1474,7 @@ type MaxMinLimits struct {
 	Color  string `description:"颜色"`
 	Year   int    `description:"上下限取值范围"`
 	Legend string `description:"图例名称"`
+	IsShow bool   `description:"是否显示"`
 }
 
 // 自定义同期均线
@@ -1483,6 +1485,7 @@ type SamePeriodAverage struct {
 	LineType  string  `description:"线型"`
 	LineWidth int     `description:"线宽"`
 	Value     float64 `description:"均线值"`
+	IsShow    bool    `description:"是否显示"`
 }
 
 // 自定义同期标准差
@@ -1493,6 +1496,7 @@ type SamePeriodStandardDeviation struct {
 	Multiple int     `description:"标准差倍数"`
 	MaxValue float64 `description:"上限"`
 	MinValue float64 `description:"上限"`
+	IsShow   bool    `description:"是否显示"`
 }
 
 type SeasonChartResp struct {
@@ -2439,5 +2443,5 @@ type RadarYData struct {
 // PreviewSeasonChartReq 预览季节性图的请求入参
 type PreviewSeasonChartReq struct {
 	ChartEdbInfoList  []*ChartSaveItem `description:"指标及配置信息"`
-	SeasonExtraConfig SeasonExtraItem           `description:"季节图额外配置信息,json字符串"`
+	SeasonExtraConfig SeasonExtraItem  `description:"季节图额外配置信息,json字符串"`
 }

+ 16 - 5
services/data/chart_info.go

@@ -3224,9 +3224,9 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 	for _, mappingItem := range dataList {
 		quarterDataList := mappingItem.DataList.(data_manage.QuarterDataList)
 		// 上下限区间
-		//if seasonConfig.MaxMinLimits.Value > 0 {
+		//if seasonConfig.MaxMinLimits.Year > 0 {
 			dataResp.MaxMinLimits.List = make([]*data_manage.MaxMinLimitsData, 0)
-			dataTimeMap := make(map[string]time.Time)
+			dataTimeMap := make(map[time.Time]time.Time)
 			dataTimeList := make([]string, 0)
 			maxValueMap := make(map[time.Time]float64)
 			minValueMap := make(map[time.Time]float64)
@@ -3265,7 +3265,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 							minValueMap[newDate] = handleDataMap[date]
 						}
 
-						dataTimeMap[date] = newDate
+						dataTimeMap[newDate] = newDate
 					}
 				} else {
 					// 旬度、月度、季度、半年度 不插值,需要先把日期列表和数据map取出来
@@ -3292,7 +3292,7 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 						} else {
 							minValueMap[newDate] = vv.Value
 						}
-						dataTimeMap[vv.DataTime] = newDate
+						dataTimeMap[newDate] = newDate
 					}
 				}
 			}
@@ -3325,9 +3325,20 @@ func SeasonChartData(dataList []*data_manage.ChartEdbInfoMapping, seasonExtraCon
 			dataResp.MaxMinLimits.List = maxMinDataList
 			dataResp.MaxMinLimits.Color = seasonConfig.MaxMinLimits.Color
 			dataResp.MaxMinLimits.Legend = seasonConfig.MaxMinLimits.Legend
+		//}
+
+		// 自定义同期均线
+		if seasonConfig.SamePeriodAverage.Year > 0 {
+
 		}
 
-	//}
+		// 自定义同期标准差
+		if seasonConfig.SamePeriodAverage.Year > 0 {
+
+		}
+
+
+	}
 
 	return
 }