From 678f43f99d4fe259c6ce3dabbc2563776c2a25f1 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 28 十二月 2020 17:40:11 +0800
Subject: [PATCH] #

---
 src/main/webapp/views/monitor/monitor.html |   63 +++++++++++++++++++++----------
 1 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 82ee207..31dacad 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -80,6 +80,16 @@
             }
         }
 
+        #led-content {
+            display: none;
+        }
+        #led-p-content {
+            text-align: center;
+            padding: 20px 40px;
+            font-size: 35px;
+            font-weight: bold;
+            /*color: #FF5722;*/
+        }
 
     </style>
 </head>
@@ -177,7 +187,7 @@
                     <div class="image-border image-border3"></div>
                     <div class="image-border image-border4"></div>
                     <span>娴欐睙涓壃鐗╂祦瑁呭鏈夐檺鍏徃</span>
-                    <img src="img/wxCode.jpg">
+                    <img src="../../static/image/barcode.png">
                 </div>
             </div>
         </div>
@@ -195,18 +205,12 @@
                         <div class="speed-content">
                             <div id="crn-chart" class="speed-chart">
                             </div>
-<!--                            <div id="xSpeed-chart" class="speed-chart">-->
-<!--&lt;!&ndash;                                <span>鍫嗗灈鏈鸿蛋琛岄�熷害锛�</span><span id="xSpeed" class="counter">5.00</span><span>绫�/绉�</span>&ndash;&gt;-->
-<!--                            </div>-->
-<!--                            <div id="ySpeed-chart" class="speed-chart">-->
-<!--&lt;!&ndash;                                <span>鍫嗗灈鏈哄崌闄嶉�熷害锛�</span><span id="ySpeed" class="counter">5.00</span><span>绫�/绉�</span>&ndash;&gt;-->
-<!--                            </div>-->
                         </div>
                     </div>
 
                     <!-- 涓笅 -->
                     <div class="scroll-pane">
-                        <div class="layui-carousel" id="test1">
+                        <div class="layui-carousel" id="banner">
                             <div carousel-item>
                                 <div class="item-img" id="img-1" style="background-color: red"></div>
                                 <div class="item-img" id="img-2" style="background-color: gold"></div>
@@ -214,6 +218,10 @@
                                 <div class="item-img" id="img-4" style="background-color: white"></div>
                                 <div class="item-img" id="img-5" style="background-color: darkgoldenrod"></div>
                             </div>
+                        </div>
+
+                        <div id="led-content">
+                            <pre id="led-p-content"></pre>
                         </div>
 
 <!--                        &lt;!&ndash; 涓乏 &ndash;&gt;-->
@@ -368,12 +376,27 @@
         var element = layui.element;
         // 杞挱鍥�
         carousel.render({
-            elem: '#test1'
+            elem: '#banner'
             ,width: '100%' //璁剧疆瀹瑰櫒瀹藉害
             ,arrow: 'hover' // 鍒囨崲绠ご榛樿鏄剧ず鐘舵�侊紝鍙�夊�间负 hover锛堟偓鍋滄樉绀猴級 always锛堝缁堟樉绀猴級 none锛堝缁堜笉鏄剧ず锛�
             ,interval: '3000' // 鑷姩鍒囨崲鐨勬椂闂撮棿闅旓紝鍗曚綅锛歮s锛堟绉掞級锛屼笉鑳戒綆浜�800
+            ,anim: 'fade'
         });
     });
+
+    /***********************************************************************************/
+    /************************************* 澶撮儴鎸夐挳 *************************************/
+    /***********************************************************************************/
+    // 宸�
+    $('.button-left').click(function () {
+        exitFull();
+    });
+    // 鍙�
+    $('.button-right').click(function () {
+        full();
+    });
+
+
 
     /***********************************************************************************/
     /************************************ 鍫嗗灈鏈洪�熷害 *************************************/
@@ -385,21 +408,21 @@
         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: '璧拌閫熷害',
                 type: 'gauge',
                 min: 0,
-                max: 110,
-                splitNumber: 11,
+                max: 130,
+                splitNumber: 13,
                 radius: '50%',
                 axisLine: {            // 鍧愭爣杞寸嚎
                     lineStyle: {       // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
@@ -537,7 +560,7 @@
                 center: ['75%', '50%'],    // 榛樿鍏ㄥ眬灞呬腑
                 radius: '30%',
                 min: 0,
-                max: 4,
+                max: 25,
                 startAngle: 135,
                 endAngle: 45,
                 splitNumber: 2,

--
Gitblit v1.9.1