From a33004421d7c2b19e45d6151a020637e2932fe0a Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 15 九月 2023 13:42:31 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/monitor/index.html |   72 +++++++++++++++++++++++++++---------
 1 files changed, 54 insertions(+), 18 deletions(-)

diff --git a/src/main/webapp/views/monitor/index.html b/src/main/webapp/views/monitor/index.html
index 4a06c80..c2bcb81 100644
--- a/src/main/webapp/views/monitor/index.html
+++ b/src/main/webapp/views/monitor/index.html
@@ -15,7 +15,7 @@
         <div class="head">
             <div class="head-title">鑷姩浠撳簱鐩戞帶骞冲彴</div>
             <div class="time-tools">
-                <span id="bar-year"></span>-<span id="bar-month"></span>-<span id="bar-day"></span> <span id="bar-hour"></span>:<span id="bar-minute"></span>:<span id="bar-second"></span>&nbsp;&nbsp;<span id="bar-week"></span>
+                <span id="bar-year"></span>-<span id="bar-month"></span>-<span id="bar-day"></span> <span id="bar-hour"></span>:<span id="bar-minute"></span>:<span id="bar-second"></span>
             </div>
         </div>
         <div class="body">
@@ -23,7 +23,7 @@
                 <div class="box">
                     <div class="box-title">娴嬭瘯鐘舵��</div>
                     <div class="box-body">
-                        <div class="table-head" style="display: flex"><div style="flex: 1">搴撲綅鍙�</div><div style="flex: 1">搴撲綅鐘舵��</div><div style="flex: 1">鍖呭彿</div><div style="flex: 1">娴嬭瘯鐘舵��</div></div>
+                        <div class="table-head" style="display: flex"><div style="flex: 1">搴撲綅鍙�</div><div style="flex: 1">搴撲綅鐘舵��</div><div style="flex: 3">鍖呭彿</div><div style="flex: 1">娴嬭瘯鐘舵��</div></div>
                         <div class="swiper" style="height: 85%">
                             <div class="swiper-wrapper table-item">
                             </div>
@@ -42,13 +42,7 @@
                 </div>
                 <div class="box">
                     <div class="box-title">鍚堟牸鐜�</div>
-                    <div style="display: flex;"class="box-body">
-                        <div class="box-body" id="barLabelRotation"></div>
-                        <!--<div class="box-body3" >-->
-                        <!--    <div class="percentage" id="thisWeek">60%</div>-->
-                        <!--    <div class="percentage" id="lastWeek">40%</div>-->
-                        <!--</div>-->
-                    </div>
+                    <div class="box-body" id="barLabelRotation"></div>
                 </div>
             </div>
         </div>
@@ -56,7 +50,50 @@
 </body>
 </html>
 <script>
-    let url = 'http://192.168.4.188:8085/fnwms'
+    // 宸�
+    $('.time-tools').click(function () {
+        exitFull();
+    });
+    $('.head-title').click(function () {
+        full();
+    });
+    //寮�濮嬪叏灞�
+    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();
+        }
+    }
+    let url = 'http://192.168.4.188:8088/fnwms'
     var item = [{locNo: '1',locSts: '1',mk: '1',packStatus$: '1'}]
     var year = '2020';
     var month = '05';
@@ -77,8 +114,8 @@
         setDate();
     },1000)
     setInterval(()=>{
-        //location.reload()
-    },10000)
+        location.reload()
+    },600000)
     function initTest() {
         var box = ''
         var el
@@ -98,7 +135,7 @@
         for (var i = 0; i < item.length; i++) {
             el = "<div class='swiper-slide "+ css + " '><div style='flex: 1'>"
                 + item[i].locNo + "</div><div style='flex: 1'>"
-                + item[i].locSts  + "</div><div style='flex: 1'>"
+                + item[i].locSts  + "</div><div style='flex: 3'>"
                 + item[i].mk  + "</div><div style='flex: 1'>"
                 + item[i].packStatus$
                 + "</div></div>"
@@ -159,7 +196,7 @@
             }
         },
         legend: {
-            textStyle:{color:'#FFF'},
+            textStyle:{color:'#FFF',},
         },
         grid: {
             left: '3%',
@@ -244,7 +281,7 @@
             }
         },
         legend: {
-            textStyle:{color:'#FFF'},
+            textStyle:{color:'#FFF',fontSize:14},
         },
         grid: {
             left: '3%',
@@ -292,7 +329,7 @@
                 stack: 'Ad',
                 label: {
                     show: true,
-                    fontSize: 16,fontWeight: 'bold',
+                    fontSize: 14,fontWeight: 'bold',
                     position: 'top',offset: [-15,5],
                 },
                 data: [9, 3]
@@ -311,10 +348,9 @@
         legend: {
             icon: 'roundRect',
             data: ['鍑哄簱', '鍏ュ簱'],
-            textStyle:{color:'#FFF'},
+            textStyle:{color:'#FFF',fontSize:14},
         },
         grid: { // 鍥捐〃璺濈杈规鐨勮窛绂伙紝鍙敤鐧惧垎姣斿拰鏁板瓧锛坧x锛夐厤缃�
-            top: '20%',
             left: '3%',
             right: '5%',
             bottom: '5%',

--
Gitblit v1.9.1