From 0667e24617d81e4be4262237efcb7c7f37f2ce73 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 23 十一月 2020 09:24:20 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/monitor/css/monitor.css |    1 
 src/main/webapp/views/monitor/js/monitor.js   |   64 +++++++++++++++++++++
 src/main/webapp/views/monitor/monitor.html    |   30 +++++++--
 src/main/webapp/static/js/common.js           |   65 ---------------------
 4 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 75edf6a..183c4b5 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -193,68 +193,3 @@
         if (new RegExp("(" + k + ")").test(fmt)) fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? (o[k]) : (("00" + o[k]).substr(("" + o[k]).length)));
     return fmt;
 }
-
-// 鍏ㄥ睆 -----------------------------------------------------------------------
-
-//寮�濮嬪叏灞�
-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();
-    }
-}
diff --git a/src/main/webapp/views/monitor/css/monitor.css b/src/main/webapp/views/monitor/css/monitor.css
index a5407f2..f83aae5 100644
--- a/src/main/webapp/views/monitor/css/monitor.css
+++ b/src/main/webapp/views/monitor/css/monitor.css
@@ -27,6 +27,7 @@
     position: relative;
     height: 10%;
     width: 100%;
+    z-index: 999;
 }
 .title{
     position: absolute;
diff --git a/src/main/webapp/views/monitor/js/monitor.js b/src/main/webapp/views/monitor/js/monitor.js
index ac48e85..5fc35d8 100644
--- a/src/main/webapp/views/monitor/js/monitor.js
+++ b/src/main/webapp/views/monitor/js/monitor.js
@@ -93,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();
+    }
+}
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 10b87fe..75a6899 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -384,6 +384,20 @@
     });
 
     /***********************************************************************************/
+    /************************************* 澶撮儴鎸夐挳 *************************************/
+    /***********************************************************************************/
+    // 宸�
+    $('.button-left').click(function () {
+        exitFull();
+    });
+    // 鍙�
+    $('.button-right').click(function () {
+        full();
+    });
+
+
+
+    /***********************************************************************************/
     /************************************ 鍫嗗灈鏈洪�熷害 *************************************/
     /***********************************************************************************/
 
@@ -393,14 +407,14 @@
         tooltip: {
             formatter: '{a} <br/>{c} {b}'
         },
-        toolbox: {
-            show: true,
-            feature: {
-                mark: {show: true},
-                restore: {show: true},
-                saveAsImage: {show: true}
-            }
-        },
+        // toolbox: {  // 淇濆瓨鍥剧墖
+        //     show: true,
+        //     feature: {
+        //         mark: {show: true},
+        //         restore: {show: true},
+        //         saveAsImage: {show: true}
+        //     }
+        // },
         series: [
             {
                 name: '璧拌閫熷害',

--
Gitblit v1.9.1