Commit 7ff90d64af329b763a6d4a902e593465388a0096
1 parent
d3f5d1057b
Exists in
master
and in
8 other branches
add statistics(map) common index
Showing 2 changed files with 14 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
View file @
7ff90d6
... | ... | @@ -55,10 +55,10 @@ |
55 | 55 | public void getTotalIndex(HttpServletResponse response, @RequestParam(value = "type")Integer type, @RequestParam(value = "pid", required = false)String pid) { |
56 | 56 | Map<String,Object> result= new HashMap<String, Object>(); |
57 | 57 | Map<String, String> colormap = new HashMap<>(); |
58 | - colormap.put("紫色", "#FCC0F6"); | |
59 | - colormap.put("红色", "#FFBDBE"); | |
60 | - colormap.put("橙色", "#FFD6BD"); | |
61 | - colormap.put("黄色", "#FFFEBD"); | |
58 | + colormap.put("紫色", "#ff00ff"); | |
59 | + colormap.put("红色", "#ff0000"); | |
60 | + colormap.put("橙色", "#ff8800"); | |
61 | + colormap.put("黄色", "#ffff00"); | |
62 | 62 | colormap.put("其他", "#DEDCE0"); |
63 | 63 | |
64 | 64 | Normal normal = new Normal(true, null); |
... | ... | @@ -358,6 +358,7 @@ |
358 | 358 | option.setxAxis(xAxis); |
359 | 359 | AxisPointer yAxis = new AxisPointer(); |
360 | 360 | yAxis.setType("category"); |
361 | + yAxis.setAxisLabel(new AxisPointer()); | |
361 | 362 | List<Object> dataList = new ArrayList<Object>(); |
362 | 363 | yAxis.setData(dataList); |
363 | 364 | option.setyAxis(yAxis); |
platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/echarts/AxisPointer.java
View file @
7ff90d6
... | ... | @@ -11,6 +11,15 @@ |
11 | 11 | private List<Object> boundaryGap; |
12 | 12 | private List<Object> data; |
13 | 13 | private Integer interval = 0; |
14 | + private AxisPointer axisLabel; | |
15 | + | |
16 | + public AxisPointer getAxisLabel() { | |
17 | + return axisLabel; | |
18 | + } | |
19 | + | |
20 | + public void setAxisLabel(AxisPointer axisLabel) { | |
21 | + this.axisLabel = axisLabel; | |
22 | + } | |
14 | 23 | |
15 | 24 | public Integer getInterval() { |
16 | 25 | return interval; |