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 | 119 +++++++++++++++++++++++++++++++++++++----------------------
1 files changed, 75 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index b2f9b2c..42d17c5 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>
@@ -131,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>
@@ -176,8 +186,8 @@
<div class="image-border image-border2"></div>
<div class="image-border image-border3"></div>
<div class="image-border image-border4"></div>
- <span>娴欐睙涓壃鐗╂祦瑁呭鏈夐檺鍏徃</span>
- <img src="img/wxCode.jpg">
+ <span>娴欐睙涓壃</span>
+ <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">-->
-<!--<!– <span>鍫嗗灈鏈鸿蛋琛岄�熷害锛�</span><span id="xSpeed" class="counter">5.00</span><span>绫�/绉�</span>–>-->
-<!-- </div>-->
-<!-- <div id="ySpeed-chart" class="speed-chart">-->
-<!--<!– <span>鍫嗗灈鏈哄崌闄嶉�熷害锛�</span><span id="ySpeed" class="counter">5.00</span><span>绫�/绉�</span>–>-->
-<!-- </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>
<!-- <!– 涓乏 –>-->
@@ -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,25 +408,25 @@
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: 160,
+ splitNumber: 16,
radius: '50%',
axisLine: { // 鍧愭爣杞寸嚎
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
- color: [[0.09, 'lime'], [0.82, '#1e90ff'], [1, '#ff4500']],
+ color: [[0.09, '#0fe507'], [0.82, '#1e90ff'], [1, '#ff4500']],
width: 3,
shadowColor: '#fff', //榛樿閫忔槑
shadowBlur: 10
@@ -458,7 +481,7 @@
color: '#fff'
}
},
- data: [{value: 40, name: 'm/min\nx'}]
+ data: [{value: 40, name: 'x\nm/min'}]
},
{
name: '鍗囬檷閫熷害',
@@ -466,12 +489,12 @@
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, 'lime'], [0.86, '#1e90ff'], [1, '#ff4500']],
+ color: [[0.32, '#0fe507'], [0.86, '#1e90ff'], [1, '#ff4500']],
width: 2,
shadowColor: '#fff', //榛樿閫忔槑
shadowBlur: 10
@@ -537,13 +560,13 @@
center: ['75%', '50%'], // 榛樿鍏ㄥ眬灞呬腑
radius: '30%',
min: 0,
- max: 4,
+ max: 50,
startAngle: 135,
- endAngle: 45,
+ endAngle: 50,
splitNumber: 2,
axisLine: { // 鍧愭爣杞寸嚎
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
- color: [[0.2, 'lime'], [0.8, '#1e90ff'], [1, '#ff4500']],
+ color: [[0.2, '#0fe507'], [0.8, '#1e90ff'], [1, '#ff4500']],
width: 2,
shadowColor: '#fff', //榛樿閫忔槑
shadowBlur: 10
@@ -628,7 +651,7 @@
splitNumber: 2,
axisLine: { // 鍧愭爣杞寸嚎
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
- color: [[0.2, 'lime'], [0.8, '#1e90ff'], [1, '#ff4500']],
+ color: [[0.2, '#0fe507'], [0.8, '#1e90ff'], [1, '#ff4500']],
width: 2,
shadowColor: '#fff', //榛樿閫忔槑
shadowBlur: 10
@@ -753,9 +776,9 @@
// },
itemStyle:{
normal:{
- color:'#0cbad9', //鎶樼偣棰滆壊
+ color:'#ef550e', //鎶樼偣棰滆壊
lineStyle:{
- color:'#07a093' //鎶樼嚎棰滆壊
+ color:'#ec670f' //鎶樼嚎棰滆壊
}
}
}
@@ -880,5 +903,13 @@
});
}
+ // eCharts 璺熼殢绐楀彛鏀瑰彉
+ window.onresize = function(){
+ crnChart.resize();
+ lineCharts.resize();
+ pieCharts.resize();
+ }
+
+
</script>
</html>
--
Gitblit v1.9.1