From 3d66f39f6fa20f13a13c7dd81aea3407eeb6d5b6 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 11 一月 2021 15:33:50 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 58 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index e185f29..9b71103 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>
@@ -144,9 +145,9 @@
<div class="info-detail">
<div class="real-data">
<i class="count" id="xDistance">0</i>
- <span class="unit">km</span>
+ <span class="unit">m</span>
</div>
- <div class="content">绱璧拌璺濈(鍗冪背)</div>
+ <div class="content">绱璧拌璺濈(绫�)</div>
</div>
</div>
<div class="charge-info-elem">
@@ -154,9 +155,9 @@
<div class="info-detail">
<div class="real-data">
<i class="count" id="yDistance">0</i>
- <span class="unit">km</span>
+ <span class="unit">m</span>
</div>
- <div class="content">绱鍗囬檷璺濈(鍗冪背)</div>
+ <div class="content">绱鍗囬檷璺濈(绫�)</div>
</div>
</div>
<div class="charge-info-elem">
@@ -164,9 +165,9 @@
<div class="info-detail">
<div class="real-data">
<i class="count" id="xDuration">0</i>
- <span class="unit">h</span>
+ <span class="unit">s</span>
</div>
- <div class="content">绱璧拌鏃堕暱(灏忔椂)</div>
+ <div class="content">绱璧拌鏃堕暱(绉�)</div>
</div>
</div>
<div class="charge-info-elem">
@@ -174,9 +175,9 @@
<div class="info-detail">
<div class="real-data">
<i class="count" id="yDuration">0</i>
- <span class="unit">h</span>
+ <span class="unit">s</span>
</div>
- <div class="content">绱鍗囬檷鏃堕暱(灏忔椂)</div>
+ <div class="content">绱鍗囬檷鏃堕暱(绉�)</div>
</div>
</div>
</div>
@@ -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>
@@ -379,8 +380,23 @@
,width: '100%' //璁剧疆瀹瑰櫒瀹藉害
,arrow: 'hover' // 鍒囨崲绠ご榛樿鏄剧ず鐘舵�侊紝鍙�夊�间负 hover锛堟偓鍋滄樉绀猴級 always锛堝缁堟樉绀猴級 none锛堝缁堜笉鏄剧ず锛�
,interval: '3000' // 鑷姩鍒囨崲鐨勬椂闂撮棿闅旓紝鍗曚綅锛歮s锛堟绉掞級锛屼笉鑳戒綆浜�800
+ ,anim: 'fade'
});
});
+
+ /***********************************************************************************/
+ /************************************* 澶撮儴鎸夐挳 *************************************/
+ /***********************************************************************************/
+ // 宸�
+ $('.button-left').click(function () {
+ exitFull();
+ });
+ // 鍙�
+ $('.button-right').click(function () {
+ full();
+ });
+
+
/***********************************************************************************/
/************************************ 鍫嗗灈鏈洪�熷害 *************************************/
@@ -392,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鎺у埗绾挎潯鏍峰紡
@@ -544,7 +560,7 @@
center: ['75%', '50%'], // 榛樿鍏ㄥ眬灞呬腑
radius: '30%',
min: 0,
- max: 4,
+ max: 25,
startAngle: 135,
endAngle: 45,
splitNumber: 2,
--
Gitblit v1.9.1