Browse Source

Merge branch 'feature/pool_chart_color' of hongze/hongze_yb into master

xyxie 1 year ago
parent
commit
ba14a83b42
2 changed files with 21 additions and 1 deletions
  1. 7 1
      services/chart/cross_variety/chart.go
  2. 14 0
      utils/common.go

+ 7 - 1
services/chart/cross_variety/chart.go

@@ -332,7 +332,13 @@ func GetChartData(chartInfoId int, config request.ChartConfigReq) (edbList []*ch
 			CoordinatePointData: coordinatePointList,
 		})
 	}
-
+	// 处理颜色
+	colorMap := utils.GetColorMap()
+	for k, _ := range dataList {
+		if c, ok1 := colorMap[k]; ok1 {
+			dataList[k].Color = c
+		}
+	}
 	dataResp = ChartInfoResp{
 		XName:       xTagInfo.ChartTagName + "百分位",
 		XNameEn:     xTagInfo.ChartTagNameEn,

+ 14 - 0
utils/common.go

@@ -1430,3 +1430,17 @@ func GetDateByDateTypeV2(dateType int, tmpStartDate, tmpEndDate string, startYea
 
 	return
 }
+
+func GetColorMap() map[int]string {
+	colorMap := make(map[int]string)
+	colors := []string{"#0000FF", "#FF0000", "#999999", "#000000", "#7CB5EC", "#90ED7D", "#F7A35C", "#8085E9",
+		"#F15C80", "#E4D354", "#2B908F", "#F45B5B", "#91E8E1", "#FDA8C7", "#8A4294",
+		"#578B5A", "#0033FF", "#849EC1", "#FFDF0C", "#005496", "#00F0FF", "#4D535B",
+		"#4F4C34", "#804141", "#86BABD", "#8AA3FF", "#960000", "#A173DB", "#A39340",
+		"#CE814A", "#D1D2E6", "#EAB7B7", "#FF2E7A", "#FF4AF8", "#FF785B", "#FF9696", "#FFA800", "#FFBC97", "#FFDFDF"}
+	for k, v := range colors {
+		colorMap[k] = v
+	}
+
+	return colorMap
+}