From 215cf0154e43279ea4cc7aa0db51b85f885e42be Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 25 七月 2023 10:27:52 +0800
Subject: [PATCH] 捡料
---
src/main/webapp/views/monitor/js/monitor.js | 105 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 96 insertions(+), 9 deletions(-)
diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index eb192f3..c99b0f8 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();
@@ -50,17 +53,37 @@
* 鑾峰彇鍏朵粬鏁版嵁
*/
function getOther() {
- http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId")}, function (res) {
+ http.get(baseUrl+"/monitor/other", {crnId: getUrlVal("crnId"), ledId: getUrlVal("ledId")}, 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 {
@@ -70,3 +93,67 @@
}
+// 鍏ㄥ睆 -----------------------------------------------------------------------
+
+//寮�濮嬪叏灞�
+function full() {
+ var docElm = document.documentElement;
+ //W3C
+ if (docElm.requestFullscreen) {
+ docElm.requestFullscreen();
+ }
+ //FireFox
+ else if (docElm.mozRequestFullScreen) {
+ docElm.mozRequestFullScreen();
+ }
+ //Chrome绛�
+ else if (docElm.webkitRequestFullScreen) {
+ docElm.webkitRequestFullScreen();
+ }
+ //IE11
+ else if (elem.msRequestFullscreen) {
+ elem.msRequestFullscreen();
+ }
+}
+
+//閫�鍑哄叏灞�
+function exitFull() {
+ if (document.exitFullscreen) {
+ document.exitFullscreen();
+ }
+ else if (document.mozCancelFullScreen) {
+ document.mozCancelFullScreen();
+ }
+ else if (document.webkitCancelFullScreen) {
+ document.webkitCancelFullScreen();
+ }
+ else if (document.msExitFullscreen) {
+ document.msExitFullscreen();
+ }
+}
+
+//浜嬩欢鐩戝惉
+document.addEventListener("fullscreenchange", function () {
+ try {
+ fullscreenState.innerHTML = (document.fullscreen) ? "" : "not ";
+ } catch (e) {}
+}, false);
+document.addEventListener("mozfullscreenchange", function () {
+ fullscreenState.innerHTML = (document.mozFullScreen) ? "" : "not ";
+}, false);
+document.addEventListener("webkitfullscreenchange", function () {
+ fullscreenState.innerHTML = (document.webkitIsFullScreen) ? "" : "not ";
+}, false);
+document.addEventListener("msfullscreenchange", function () {
+ fullscreenState.innerHTML = (document.msFullscreenElement) ? "" : "not ";
+}, false);
+document.onkeyup = function (e) {
+ if (window.event)//濡傛灉window.event瀵硅薄瀛樺湪锛屽氨浠ユ浜嬩欢瀵硅薄涓哄噯
+ e = window.event;
+ var key = e.charCode || e.keyCode;
+ if (key === 13 || key === 49 || key === 97) {
+ full();
+ } else if (key === 50 || key === 98) {
+ exitFull();
+ }
+}
--
Gitblit v1.9.1