From b7a3359ab59385eec5bca07c666bfbe749e98601 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 10:46:48 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/monitor/monitor.html |   87 +++++++++++++++++++++++++++++++++++--------
 1 files changed, 71 insertions(+), 16 deletions(-)

diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index e11fd52..c2199f8 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -13,6 +13,8 @@
     <script src="js/jquery.countup.min.js"></script>
     <script src="js/jquery.waypoints.min.js"></script>
     <script src="../../static/layui/layui.js"></script>
+    <script src="../../static/js/common.js"></script>
+    <script src="js/monitor.js"></script>
     <style>
         .crn-speed {
             width: 100%;
@@ -91,7 +93,7 @@
         <div class="button-left"></div>
         <div class="button-right"></div>
         <div class="time-tools">
-            2019-04-27 10:30:01 鏄熸湡涓�
+            <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>
         </div>
         <div class="title">
             鑷姩浠撳簱WCS鐩戞帶骞冲彴
@@ -294,7 +296,7 @@
                             鍦ㄥ簱
                         </div>
                         <div class="elem-footer">
-                            3,300
+                            <span id="stock-count">0</span>
                         </div>
                     </div>
                     <div class="top-footer-elem">
@@ -304,7 +306,7 @@
                             绌哄簱
                         </div>
                         <div class="elem-footer">
-                            161
+                            <span id="empty-count">0</span>
                         </div>
                     </div>
                     <div class="top-footer-elem">
@@ -314,7 +316,7 @@
                             浣跨敤涓�
                         </div>
                         <div class="elem-footer">
-                            666
+                            <span id="used-count">0</span>
                         </div>
                     </div>
                 </div>
@@ -365,9 +367,13 @@
     };
     var data = [];
 
-//    鎶樼嚎鍥�
-    let lineCharts = echarts.init(document.getElementById('line-charts'));
-    lineChartOption = {
+
+    /***********************************************************************************/
+    /************************************* 鎶樼嚎鍥� ***************************************/
+    /***********************************************************************************/
+
+    var lineCharts = echarts.init(document.getElementById('line-charts'));
+    var lineChartOption = {
         // animation: false,
         grid: {
             top: '0%',
@@ -432,11 +438,39 @@
         }]
     };
 
-    lineCharts.setOption(lineChartOption);
+    // 璁块棶閲忔姤琛ㄥ姞杞�
+    function initlinChart() {
+        var reportView = lineChartOption;
+        var xAxisDate = [];
+        var seriesDate=[];
+        $.ajax({
+            url: baseUrl+"/monitor/pakin/rep",
+            method: 'GET',
+            success: function (res) {
+                if (res.code === 200){
+                    var json = res.data;
+                    for (var i = 0; i < json.length; i++) {
+                        xAxisDate[i]=json[i].node;
+                        seriesDate[i]=json[i].val;
+                    }
+                    reportView.xAxis.data=xAxisDate;
+                    reportView.series[0].data=seriesDate;
+                    lineCharts.setOption(reportView)
+                } else if (res.code === 403){
+                    top.location.href = "/";
+                } else {
+                    layer.msg(res.msg);
+                }
+            }
+        });
+    }
 
-//    楗煎浘
-    let pieCharts = echarts.init(document.getElementById('pie-charts'));
-    pieChartOption = {
+    /***********************************************************************************/
+    /************************************* 楗煎浘 *****************************************/
+    /***********************************************************************************/
+
+    var pieCharts = echarts.init(document.getElementById('pie-charts'));
+    var pieChartOption = {
         // animation: false,
         grid: {
             top: '0%',
@@ -452,7 +486,7 @@
         legend: {
             orient: 'vertical',
             left: 10,
-            data: ['1', '2', '3']
+            data: ['鍦ㄥ簱', '绌�']
         },
         series: [
             {
@@ -475,9 +509,10 @@
                     show: false
                 },
                 data: [
-                    {value: 335, name: '1'},
-                    {value: 310, name: '2'},
-                    {value: 234, name: '3'},
+                    {value: 1, name: '鍦ㄥ簱'},
+                    {value: 1, name: '绌�'},
+                    {value: 1, name: '浣跨敤'},
+                    {value: 1, name: '绂佺敤'},
                 ],
                 itemStyle: {
                     emphasis: {
@@ -498,7 +533,27 @@
             }
         ]
     };
-    pieCharts.setOption(pieChartOption);
+    // 楗煎浘鍔犺浇
+    function initPieChart() {
+        $.ajax({
+            url: baseUrl+"/monitor/loc/rep",
+            method: 'GET',
+            success: function (res) {
+                if (res.code === 200){
+                    pieChartOption.series[0].data = res.data.pie;
+                    pieCharts.setOption(pieChartOption);
+
+                    $('#stock-count').text(res.data.stockCunt);
+                    $('#empty-count').text(res.data.emptyCount);
+                    $('#none-count').text(res.data.noneCount);
+                } else if (res.code === 403){
+                    top.location.href = "/";
+                } else {
+                    layer.msg(res.msg);
+                }
+            }
+        });
+    }
 
 </script>
 </html>

--
Gitblit v1.9.1