diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java index 8619a35..aafe3cd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java @@ -59,6 +59,12 @@ public class StatisticsController extends BaseController { colormap.put("橙色", "#FFD6BD"); colormap.put("黄色", "#FFFEBD"); colormap.put("其他", "#DEDCE0"); + + Normal normal = new Normal(true, null); + Label label = new Label(); + label.setNormal(normal); + label.setEmphasis(normal); + if (type == 1) { // 地图数据 List provinceRiskList = statisticsService.queryProvinceRisks(); @@ -67,19 +73,26 @@ public class StatisticsController extends BaseController { Map mapsData = new HashMap<>(); Option areaBarOption = buildBarOption("建档&高危人数", null); + areaBarOption.getLegend().getData().add("近30天建档人数"); + areaBarOption.getLegend().getData().add("当前高危总人数"); + areaBarOption.getLegend().setOrient("horizontal"); + areaBarOption.getLegend().setLeft("40px"); + areaBarOption.getTooltip().setShow(true); List areaBarSeriesList = new ArrayList<>(); Series patientSeries = new Series(); - patientSeries.setName("建档人数"); + patientSeries.setName("近30天建档人数"); patientSeries.setType("bar"); + patientSeries.setLabel(label); List patientDataList = new ArrayList<>(); patientSeries.setData(patientDataList); Series riskSeries = new Series(); - riskSeries.setName("高危人数"); + riskSeries.setName("当前高危总人数"); riskSeries.setType("bar"); + riskSeries.setLabel(label); List riskDataList = new ArrayList<>(); riskSeries.setData(riskDataList); - areaBarSeriesList.add(patientSeries); areaBarSeriesList.add(riskSeries); + areaBarSeriesList.add(patientSeries); areaBarOption.setSeries(areaBarSeriesList); for (AreaData areaData:provinceRiskList) { @@ -114,10 +127,6 @@ public class StatisticsController extends BaseController { dataList.add(data); } - Normal normal = new Normal(true, null); - Label label = new Label(); - label.setNormal(normal); - label.setEmphasis(normal); Option option = buildMapOption("孕妇建档数", null); List seriesList = new ArrayList<>(); Series series = new Series(); @@ -219,7 +228,6 @@ public class StatisticsController extends BaseController { option.setTooltip(tooltip); Legend legend = new Legend(); List tempList = new ArrayList(); - tempList.add("高危数"); legend.setData(tempList); option.setLegend(legend); Grid grid = new Grid();