From 9fb00ee422c7e1b6bf3712d1fe192af9cdba5975 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期四, 19 十一月 2020 15:22:02 +0800 Subject: [PATCH] # --- src/main/webapp/views/monitor/js/monitor.js | 17 ++++++++--------- src/main/java/com/zy/asrs/controller/MonitorController.java | 19 +++++++++++++++++++ src/main/webapp/views/monitor/monitor.html | 2 +- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java index f746714..0cdb798 100644 --- a/src/main/java/com/zy/asrs/controller/MonitorController.java +++ b/src/main/java/com/zy/asrs/controller/MonitorController.java @@ -56,6 +56,8 @@ public R monitorOther(@RequestParam("crnId") Integer crnId) { Double xSpeed = 0.0D; Double ySpeed = 0.0D; + Double zSpeed = 0.0D; + Short forkPos = 1; Double xDistance = 0.0D; Double yDistance = 0.0D; Double xDuration = 0.0D; @@ -68,6 +70,21 @@ if (crnProtocol != null) { xSpeed = Double.valueOf(crnProtocol.getXSpeed()); ySpeed = Double.valueOf(crnProtocol.getYSpeed()); + zSpeed = Double.valueOf(crnProtocol.getZSpeed()); + switch (crnProtocol.getForkPos()) { + case 0: + forkPos = 1; + break; + case 1: + forkPos = 0; + break; + case 2: + forkPos = 2; + break; + default: + forkPos = 1; + break; + } xDistance = Double.valueOf(crnProtocol.getXDistance()); yDistance = Double.valueOf(crnProtocol.getYDistance()); xDuration = Double.valueOf(crnProtocol.getXDuration()); @@ -85,6 +102,8 @@ return R.ok( Cools.add("xSpeed", xSpeed) // 琛岃蛋閫熷害 .add("ySpeed", ySpeed) // 鍗囬檷閫熷害 + .add("zSpeed", zSpeed) // 鍙夌墮閫熷害 + .add("forkPos", forkPos) // 鍙夌墮閫熷害 // .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟 // .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟 .add("xDistance", xDistance) // 绱璧拌璺濈km diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js index e681b21..e4da56e 100644 --- a/src/main/webapp/views/monitor/js/monitor.js +++ b/src/main/webapp/views/monitor/js/monitor.js @@ -60,17 +60,16 @@ $('#yDuration').text(res.data.yDuration); // 涓笂 - crnChartOption.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0; - crnChartOption.series[1].data[0].value = (Math.random()*7).toFixed(2) - 0; - crnChartOption.series[2].data[0].value = (Math.random()*2).toFixed(2) - 0; - crnChartOption.series[3].data[0].value = (Math.random()*2).toFixed(2) - 0; + crnChartOption.series[0].data[0].value = res.data.xSpeed - 0; // 璧拌 + crnChartOption.series[1].data[0].value = res.data.ySpeed - 0; // 鍗囬檷 + crnChartOption.series[2].data[0].value = res.data.zSpeed - 0; // 鍙夌墮 + crnChartOption.series[3].data[0].value = res.data.forkPos - 0; // 璐у弶浣嶇疆 + // crnChartOption.series[0].data[0].value = (Math.random()*100).toFixed(2) - 0; + // crnChartOption.series[1].data[0].value = (Math.random()*7).toFixed(2) - 0; + // crnChartOption.series[2].data[0].value = (Math.random()*2).toFixed(2) - 0; + // crnChartOption.series[3].data[0].value = (Math.random()*2).toFixed(2) - 0; crnChart.setOption(crnChartOption); - $('#xSpeed').text(res.data.xSpeed); - $('#ySpeed').text(res.data.ySpeed); - - // 璁℃暟鍔ㄧ敾 - $('.counter').countUp(); } else if (res.code === 403){ parent.location.href = baseUrl+"/login"; } else { diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html index 9e54756..4ec9ea3 100644 --- a/src/main/webapp/views/monitor/monitor.html +++ b/src/main/webapp/views/monitor/monitor.html @@ -458,7 +458,7 @@ color: '#fff' } }, - data: [{value: 40, name: 'm/min\nx'}] + data: [{value: 40, name: 'x\nm/min'}] }, { name: '鍗囬檷閫熷害', -- Gitblit v1.9.1