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 |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index 8889133..e4da56e 100644
--- a/src/main/webapp/views/monitor/js/monitor.js
+++ b/src/main/webapp/views/monitor/js/monitor.js
@@ -7,8 +7,9 @@
 var week = '鏄熸湡涓�';
 
 setInterval(function () {
+    getOther();
     setDate();
-    initlinChart();
+    initlineChart();
     initPieChart();
 }, 1000);
 
@@ -45,3 +46,36 @@
 
 }
 
+/**
+ * 鑾峰彇鍏朵粬鏁版嵁
+ */
+function getOther() {
+    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);
+
+            // 涓笂
+            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);
+
+        } else if (res.code === 403){
+            parent.location.href = baseUrl+"/login";
+        }  else {
+            layer.msg("杩炴帴鏈嶅姟鍣ㄥけ璐�", {icon: 2});
+        }
+    })
+
+}
+

--
Gitblit v1.9.1