From 21a4bf818a8a3e90d1b4f86d3e61304ceccbb49f Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期一, 25 三月 2024 09:52:53 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/monitor/index.html |   34 +++++++++++++---------------------
 1 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/main/webapp/views/monitor/index.html b/src/main/webapp/views/monitor/index.html
index b86eec2..82888f6 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>
@@ -99,7 +93,7 @@
             document.msExitFullscreen();
         }
     }
-    let url = 'http://192.168.4.188:8085/fnwms'
+    let url = 'http://10.12.55.200:8080/fnwms'
     var item = [{locNo: '1',locSts: '1',mk: '1',packStatus$: '1'}]
     var year = '2020';
     var month = '05';
@@ -120,8 +114,8 @@
         setDate();
     },1000)
     setInterval(()=>{
-        //location.reload()
-    },10000)
+        location.reload()
+    },600000)
     function initTest() {
         var box = ''
         var el
@@ -141,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>"
@@ -163,13 +157,12 @@
         $('#bar-hour').text(hour);
         $('#bar-minute').text(minute);
         $('#bar-second').text(second);
-        $('#bar-week').text(week);
     }
     /**
      * 鑾峰彇鏃堕棿
      */
     function getDate() {
-        http.get("http://localhost:9090/fnwcs/monitor/date", null, function (res) {
+        http.get("http://10.12.55.200:8080/fnwcs/monitor/date", null, function (res) {
             if (res.code === 200){
                 year = res.data.year;
                 month = res.data.month;
@@ -202,7 +195,7 @@
             }
         },
         legend: {
-            textStyle:{color:'#FFF'},
+            textStyle:{color:'#FFF',},
         },
         grid: {
             left: '3%',
@@ -218,7 +211,7 @@
                         color: '#FFF'
                     }
                 },
-                data: ['鍏朵粬', '娴嬭瘯搴撲綅', '闈欑疆搴撲綅', '娴嬭瘯鍓嶆殏瀛樺簱涓�', '娴嬭瘯澶辫触搴撲綅']
+                data: ['娴嬭瘯搴撲綅', '闈欑疆搴撲綅', '鏆傚瓨搴撲綅', 'NG搴撲綅']
             }
         ],
         yAxis: [
@@ -287,7 +280,7 @@
             }
         },
         legend: {
-            textStyle:{color:'#FFF'},
+            textStyle:{color:'#FFF',fontSize:14},
         },
         grid: {
             left: '3%',
@@ -335,7 +328,7 @@
                 stack: 'Ad',
                 label: {
                     show: true,
-                    fontSize: 16,fontWeight: 'bold',
+                    fontSize: 14,fontWeight: 'bold',
                     position: 'top',offset: [-15,5],
                 },
                 data: [9, 3]
@@ -354,10 +347,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