From ebcaed76a00f824e57ccd7e2c38efe725e160374 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 16:02:01 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/css/monitor.css | 2 +-
src/main/webapp/views/monitor/js/monitor.js | 6 ++++--
src/main/java/com/zy/asrs/controller/MonitorController.java | 22 +++++++++++++++++-----
src/main/webapp/views/monitor/monitor.html | 26 +++++++++++++-------------
4 files changed, 35 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index 633a26e..f077b4d 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -56,6 +56,11 @@
public R monitorOther(@RequestParam("crnId") Integer crnId) {
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
+ Double xDistance = 0.0D;
+ Double yDistance = 0.0D;
+ Double xDuration = 0.0D;
+ Double yDuration = 0.0D;
+
if (null != crnId) {
CrnThread crnThread = (CrnThread) SlaveConnection.get(SlaveType.Crn, crnId);
if (crnThread != null) {
@@ -63,6 +68,10 @@
if (crnProtocol != null) {
xSpeed = Double.valueOf(crnProtocol.getXSpeed());
ySpeed = Double.valueOf(crnProtocol.getYSpeed());
+ xDistance = Double.valueOf(crnProtocol.getXDistance());
+ yDistance = Double.valueOf(crnProtocol.getYDistance());
+ xDuration = Double.valueOf(crnProtocol.getXDuration());
+ yDuration = Double.valueOf(crnProtocol.getYDuration());
}
}
}
@@ -70,15 +79,18 @@
xSpeed = Double.valueOf(new Random().nextInt(10));
ySpeed = Double.valueOf(new Random().nextInt(10));
- int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
- int totalLoc = reportQueryMapper.getTotalLocByCrnId();
+// int totalWrk = reportQueryMapper.getTotalWrkByCrnId(crnId);
+// int totalLoc = reportQueryMapper.getTotalLocByCrnId();
return R.ok(
Cools.add("xSpeed", xSpeed) // 琛岃蛋閫熷害
.add("ySpeed", ySpeed) // 鍗囬檷閫熷害
- .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
- .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
-
+// .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
+// .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
+ .add("xDistance", xDistance) // 绱璧拌璺濈km
+ .add("yDistance", yDistance) // 绱鍗囬檷璺濈km
+ .add("xDuration", xDuration) // 绱璧拌鏃堕暱h
+ .add("yDuration", yDuration) // 绱鍗囬檷鏃堕暱h
);
}
diff --git a/src/main/webapp/views/monitor/css/monitor.css b/src/main/webapp/views/monitor/css/monitor.css
index 2080826..6a95bb2 100644
--- a/src/main/webapp/views/monitor/css/monitor.css
+++ b/src/main/webapp/views/monitor/css/monitor.css
@@ -172,7 +172,7 @@
}
.footer span {
position: absolute;
- left: 20%;
+ left: 18%;
top: 50%;
transform:translateY(-50%);
-webkit-transform:translateY(-50%); /*鍏煎-webkit-寮曟搸娴忚鍣�*/
diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index eb192f3..2cfaaac 100644
--- a/src/main/webapp/views/monitor/js/monitor.js
+++ b/src/main/webapp/views/monitor/js/monitor.js
@@ -53,8 +53,10 @@
http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId")}, function (res) {
if (res.code === 200){
- $('#totalLoc').text(res.data.totalLoc);
- $('#totalWrk').text(res.data.totalWrk);
+ $('#xDistance').text(res.data.xDistance);
+ $('#yDistance').text(res.data.yDistance);
+ $('#xDuration').text(res.data.xDuration);
+ $('#yDuration').text(res.data.yDuration);
$('#xSpeed').text(res.data.xSpeed);
$('#ySpeed').text(res.data.ySpeed);
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 2d519b2..f430014 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -124,40 +124,40 @@
<img src="img/a.png">
<div class="info-detail">
<div class="real-data">
- <i class="count" id="totalLoc">0</i>
- <span class="unit">涓�</span>
+ <i class="count" id="xDistance">0</i>
+ <span class="unit">km</span>
</div>
- <div class="content">搴撲綅鎬绘暟(涓�)</div>
+ <div class="content">绱璧拌璺濈(鍗冪背)</div>
</div>
</div>
<div class="charge-info-elem">
<img src="img/b.png">
<div class="info-detail">
<div class="real-data">
- <i class="count" id="totalWrk">0</i>
- <span class="unit">鎵�</span>
+ <i class="count" id="yDistance">0</i>
+ <span class="unit">km</span>
</div>
- <div class="content">鎬讳换鍔℃暟(鎵�)</div>
+ <div class="content">绱鍗囬檷璺濈(鍗冪背)</div>
</div>
</div>
<div class="charge-info-elem">
<img src="img/c.png">
<div class="info-detail">
<div class="real-data">
- <i class="count" id="">33</i>
- <span class="unit">鎵�</span>
+ <i class="count" id="xDuration">0</i>
+ <span class="unit">h</span>
</div>
- <div class="content">浠婃棩鍏ュ簱(鎵�)</div>
+ <div class="content">绱璧拌鏃堕暱(灏忔椂)</div>
</div>
</div>
<div class="charge-info-elem">
<img src="img/d.png">
<div class="info-detail">
<div class="real-data">
- <i class="count">14296</i>
- <span class="unit">鍗冪摝鏃�</span>
+ <i class="count" id="yDuration">0</i>
+ <span class="unit">h</span>
</div>
- <div class="content">浠婃棩鐢垫�婚噺(鍗冪摝鏃�)</div>
+ <div class="content">绱鍗囬檷鏃堕暱(灏忔椂)</div>
</div>
</div>
</div>
@@ -166,7 +166,7 @@
<div class="image-border image-border2"></div>
<div class="image-border image-border3"></div>
<div class="image-border image-border4"></div>
- <span>涓壃鐗╂祦瀹㈡埛鏈嶅姟涓績</span>
+ <span>娴欐睙涓壃鐗╂祦瑁呭鏈夐檺鍏徃</span>
<img src="img/wxCode.jpg">
</div>
</div>
--
Gitblit v1.9.1