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/monitor.html |   41 ++++++++++++++++++++++++++++-------------
 1 files changed, 28 insertions(+), 13 deletions(-)

diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index e185f29..75a6899 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -87,7 +87,8 @@
             text-align: center;
             padding: 20px 40px;
             font-size: 35px;
-            font-weight: bold
+            font-weight: bold;
+            /*color: #FF5722;*/
         }
 
     </style>
@@ -186,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>
@@ -383,6 +384,20 @@
     });
 
     /***********************************************************************************/
+    /************************************* 澶撮儴鎸夐挳 *************************************/
+    /***********************************************************************************/
+    // 宸�
+    $('.button-left').click(function () {
+        exitFull();
+    });
+    // 鍙�
+    $('.button-right').click(function () {
+        full();
+    });
+
+
+
+    /***********************************************************************************/
     /************************************ 鍫嗗灈鏈洪�熷害 *************************************/
     /***********************************************************************************/
 
@@ -392,21 +407,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鎺у埗绾挎潯鏍峰紡
@@ -544,7 +559,7 @@
                 center: ['75%', '50%'],    // 榛樿鍏ㄥ眬灞呬腑
                 radius: '30%',
                 min: 0,
-                max: 4,
+                max: 25,
                 startAngle: 135,
                 endAngle: 45,
                 splitNumber: 2,

--
Gitblit v1.9.1