From bf7f18b252078aa07b7df4a2b51a36e320663730 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 18 七月 2024 19:00:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 74 ++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 29 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index f3780fb..42d17c5 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>
@@ -140,43 +141,43 @@
<p class="english">warehouse data</p>
</div>
<div class="charge-info-elem">
- <img src="img/a.png">
+ <img src="img/a1.png">
<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">
- <img src="img/b.png">
+ <img src="img/b1.png">
<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">
- <img src="img/c.png">
+ <img src="img/c1.png">
<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">
- <img src="img/d.png">
+ <img src="img/d1.png">
<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>
@@ -185,7 +186,7 @@
<div class="image-border image-border2"></div>
<div class="image-border image-border3"></div>
<div class="image-border image-border4"></div>
- <span>娴欐睙涓壃鐗╂祦瑁呭鏈夐檺鍏徃</span>
+ <span>娴欐睙涓壃</span>
<img src="../../static/image/barcode.png">
</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: 130,
- splitNumber: 13,
+ max: 160,
+ splitNumber: 16,
radius: '50%',
axisLine: { // 鍧愭爣杞寸嚎
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
@@ -473,9 +489,9 @@
center: ['25%', '55%'], // 榛樿鍏ㄥ眬灞呬腑
radius: '30%',
min: 0,
- max: 30,
- endAngle: 30,
- splitNumber: 6,
+ max: 40,
+ endAngle: 40,
+ splitNumber: 5,
axisLine: { // 鍧愭爣杞寸嚎
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
color: [[0.32, '#0fe507'], [0.86, '#1e90ff'], [1, '#ff4500']],
@@ -544,9 +560,9 @@
center: ['75%', '50%'], // 榛樿鍏ㄥ眬灞呬腑
radius: '30%',
min: 0,
- max: 25,
+ max: 50,
startAngle: 135,
- endAngle: 45,
+ endAngle: 50,
splitNumber: 2,
axisLine: { // 鍧愭爣杞寸嚎
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
--
Gitblit v1.9.1