From b621bb1034544a8c3c90257c96e4a1460747aa6d Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期二, 17 十一月 2020 09:35:39 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java | 4 + src/main/java/com/zy/asrs/domain/vo/LocChartPie.java | 37 ++++++++++++ src/main/webapp/views/monitor/js/monitor.js | 3 src/main/java/com/zy/asrs/controller/MonitorController.java | 33 ++++++++++ src/main/webapp/views/monitor/monitor.html | 46 +++++++++++--- 5 files changed, 110 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java index 407b3d0..6c4dbef 100644 --- a/src/main/java/com/zy/asrs/controller/MonitorController.java +++ b/src/main/java/com/zy/asrs/controller/MonitorController.java @@ -3,6 +3,7 @@ import com.core.common.Arith; import com.core.common.Cools; import com.core.common.R; +import com.zy.asrs.domain.vo.LocChartPie; import com.zy.asrs.mapper.ReportQueryMapper; import com.zy.common.service.CommonService; import org.springframework.beans.factory.annotation.Autowired; @@ -44,7 +45,7 @@ } /** - * 鍏ュ簱鎶ヨ〃 + * 鍏ュ簱鎶ヨ〃 -- 鎶樼嚎鍥� */ @GetMapping("/pakin/rep") public R monitorPakinRep(){ @@ -57,6 +58,36 @@ return R.ok(report); } + @GetMapping("/loc/rep") + public R monitorLocRep(){ + List<Map<String, Object>> result = new ArrayList<>(); + + LocChartPie locUseRate = reportQueryMapper.getLocUseRate(); + if(locUseRate!=null) { + Map<String, Object> map = new HashMap<>(); + map.put("name", "鍦ㄥ簱搴撲綅"); + map.put("value", locUseRate.getFqty()); + result.add(map); + + Map<String, Object> map1 = new HashMap<>(); + map1.put("name", "绌哄簱浣�"); + map1.put("value", locUseRate.getOqty()); + result.add(map1); + + Map<String, Object> map2 = new HashMap<>(); + map2.put("name", "浣跨敤搴撲綅"); + map2.put("value", locUseRate.getUqty()); + result.add(map2); + + Map<String, Object> map3 = new HashMap<>(); + map3.put("name", "绂佺敤搴撲綅"); + map3.put("value", locUseRate.getXqty()); + result.add(map3); + } + return R.ok(result); + } + + diff --git a/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java new file mode 100644 index 0000000..1492d1b --- /dev/null +++ b/src/main/java/com/zy/asrs/domain/vo/LocChartPie.java @@ -0,0 +1,37 @@ +package com.zy.asrs.domain.vo; + +/** + * 搴撲綅鍗犵敤鐧惧垎姣� + * @author admin + * @date 2018骞�12鏈�12鏃� + */ +public class LocChartPie { + private int fqty; + private int oqty; + private int uqty; + private int xqty; + public int getFqty() { + return fqty; + } + public void setFqty(int fqty) { + this.fqty = fqty; + } + public int getOqty() { + return oqty; + } + public void setOqty(int oqty) { + this.oqty = oqty; + } + public int getUqty() { + return uqty; + } + public void setUqty(int uqty) { + this.uqty = uqty; + } + public int getXqty() { + return xqty; + } + public void setXqty(int xqty) { + this.xqty = xqty; + } +} \ No newline at end of file diff --git a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java index aa3770b..f2b91f4 100644 --- a/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java +++ b/src/main/java/com/zy/asrs/mapper/ReportQueryMapper.java @@ -1,5 +1,6 @@ package com.zy.asrs.mapper; +import com.zy.asrs.domain.vo.LocChartPie; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Select; import org.springframework.stereotype.Repository; @@ -23,4 +24,7 @@ "order by Min(wm.io_time) asc\n") List<Map<String, Object>> queryPakinRep(); + @Select("select * from asr_loc_use_view") + LocChartPie getLocUseRate(); + } diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js index 26b0138..4f325c8 100644 --- a/src/main/webapp/views/monitor/js/monitor.js +++ b/src/main/webapp/views/monitor/js/monitor.js @@ -8,7 +8,8 @@ setInterval(function () { setDate(); - initVisits(); + initlinChart(); + // initPieChart(); }, 1000); function setDate() { diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html index ca55311..7bdb4b6 100644 --- a/src/main/webapp/views/monitor/monitor.html +++ b/src/main/webapp/views/monitor/monitor.html @@ -368,9 +368,12 @@ var data = []; - // 鎶樼嚎鍥� + /***********************************************************************************/ + /************************************* 鎶樼嚎鍥� ***************************************/ + /***********************************************************************************/ + var lineCharts = echarts.init(document.getElementById('line-charts')); - lineChartOption = { + var lineChartOption = { // animation: false, grid: { top: '0%', @@ -436,7 +439,7 @@ }; // 璁块棶閲忔姤琛ㄥ姞杞� - function initVisits() { + function initlinChart() { var reportView = lineChartOption; var xAxisDate = []; var seriesDate=[]; @@ -462,9 +465,12 @@ }); } -// 楗煎浘 - let pieCharts = echarts.init(document.getElementById('pie-charts')); - pieChartOption = { + /***********************************************************************************/ + /************************************* 楗煎浘 *****************************************/ + /***********************************************************************************/ + + var pieCharts = echarts.init(document.getElementById('pie-charts')); + var pieChartOption = { // animation: false, grid: { top: '0%', @@ -480,7 +486,7 @@ legend: { orient: 'vertical', left: 10, - data: ['1', '2', '3'] + data: ['鍦ㄥ簱搴撲綅', '绌哄簱浣�', '浣跨敤搴撲綅', '绂佺敤搴撲綅'] }, series: [ { @@ -503,9 +509,10 @@ show: false }, data: [ - {value: 335, name: '1'}, - {value: 310, name: '2'}, - {value: 234, name: '3'}, + {value: 1, name: '鍦ㄥ簱搴撲綅'}, + {value: 1, name: '绌哄簱浣�'}, + {value: 1, name: '浣跨敤搴撲綅'}, + {value: 1, name: '绂佺敤搴撲綅'}, ], itemStyle: { emphasis: { @@ -526,7 +533,24 @@ } ] }; - pieCharts.setOption(pieChartOption); + // pieCharts.setOption(pieChartOption) + // 楗煎浘鍔犺浇 + function initPieChart() { + $.ajax({ + url: baseUrl+"/monitor/loc/rep", + method: 'GET', + success: function (res) { + if (res.code === 200){ + pieChartOption.series[0].data = res.data; + pieCharts.setOption(pieChartOption) + } else if (res.code === 403){ + top.location.href = "/"; + } else { + layer.msg(res.msg); + } + } + }); + } </script> </html> -- Gitblit v1.9.1