From 61694606d640cac824c36ee5bca709b6cc0ecb10 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 十一月 2020 16:44:49 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/js/monitor.js | 39 +++++++++++++++++++++++++++++++--------
1 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index eb192f3..ac48e85 100644
--- a/src/main/webapp/views/monitor/js/monitor.js
+++ b/src/main/webapp/views/monitor/js/monitor.js
@@ -7,11 +7,14 @@
var week = '鏄熸湡涓�';
setInterval(function () {
- getOther();
setDate();
- initlinChart();
+ initlineChart();
initPieChart();
}, 1000);
+
+setInterval(function () {
+ getOther();
+}, 500);
function setDate() {
getDate();
@@ -53,14 +56,34 @@
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);
+ // 涓笂
+ 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();
+ // 涓笅
+ if (res.data.isShow) {
+ $('#banner').hide();
+ $('#led-content').show();
+ $('#led-p-content').text(res.data.content);
+ } else {
+ $('#led-content').hide();
+ $('#banner').show();
+ $('#led-p-content').text("");
+ }
+
} else if (res.code === 403){
parent.location.href = baseUrl+"/login";
} else {
--
Gitblit v1.9.1