From d2daeb92cc0f15bad7593efec58557d5ce7d44a3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 十一月 2020 16:55:29 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/js/monitor.js | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index 2cfaaac..e4da56e 100644
--- a/src/main/webapp/views/monitor/js/monitor.js
+++ b/src/main/webapp/views/monitor/js/monitor.js
@@ -9,7 +9,7 @@
setInterval(function () {
getOther();
setDate();
- initlinChart();
+ initlineChart();
initPieChart();
}, 1000);
@@ -53,16 +53,23 @@
http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId")}, function (res) {
if (res.code === 200){
+ // 宸�
$('#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);
+ // 涓笂
+ 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);
- // 璁℃暟鍔ㄧ敾
- $('.counter').countUp();
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
--
Gitblit v1.9.1