From c2f47f6dd093dae7e004018fe18b52c7b1c886a4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 十一月 2020 09:14:59 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 85 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index b2be8fb..e185f29 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -80,6 +80,15 @@
}
}
+ #led-content {
+ display: none;
+ }
+ #led-p-content {
+ text-align: center;
+ padding: 20px 40px;
+ font-size: 35px;
+ font-weight: bold
+ }
</style>
</head>
@@ -195,18 +204,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 +217,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,7 +375,7 @@
var element = layui.element;
// 杞挱鍥�
carousel.render({
- elem: '#test1'
+ elem: '#banner'
,width: '100%' //璁剧疆瀹瑰櫒瀹藉害
,arrow: 'hover' // 鍒囨崲绠ご榛樿鏄剧ず鐘舵�侊紝鍙�夊�间负 hover锛堟偓鍋滄樉绀猴級 always锛堝缁堟樉绀猴級 none锛堝缁堜笉鏄剧ず锛�
,interval: '3000' // 鑷姩鍒囨崲鐨勬椂闂撮棿闅旓紝鍗曚綅锛歮s锛堟绉掞級锛屼笉鑳戒綆浜�800
@@ -403,13 +410,13 @@
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
}
},
- axisLabel: { // 鍧愭爣杞村皬鏍囪
+ axisLabel: { // 鍧愭爣杞存暟瀛�
fontWeight: 'bolder',
color: '#fff',
shadowColor: '#fff', //榛樿閫忔槑
@@ -436,7 +443,7 @@
shadowColor: '#fff', //榛樿閫忔槑
shadowBlur: 5
},
- title: {
+ title: { // 閫熷害鍗曚綅
textStyle: { // 鍏朵綑灞炴�ч粯璁や娇鐢ㄥ叏灞�鏂囨湰鏍峰紡锛岃瑙乀EXTSTYLE
fontWeight: 'bolder',
fontSize: 20,
@@ -446,7 +453,7 @@
shadowBlur: 10
}
},
- detail: {
+ detail: { // 閫熷害鍊�
backgroundColor: 'rgba(30,144,255,0.8)',
borderWidth: 1,
borderColor: '#fff',
@@ -458,7 +465,7 @@
color: '#fff'
}
},
- data: [{value: 40, name: 'm/min'}]
+ data: [{value: 40, name: 'x\nm/min'}]
},
{
name: '鍗囬檷閫熷害',
@@ -471,7 +478,7 @@
splitNumber: 6,
axisLine: { // 鍧愭爣杞寸嚎
lineStyle: { // 灞炴�ineStyle鎺у埗绾挎潯鏍峰紡
- color: [[0.29, 'lime'], [0.86, '#1e90ff'], [1, '#ff4500']],
+ color: [[0.32, '#0fe507'], [0.86, '#1e90ff'], [1, '#ff4500']],
width: 2,
shadowColor: '#fff', //榛樿閫忔槑
shadowBlur: 10
@@ -523,13 +530,13 @@
shadowBlur: 5,
width: 80,
height: 30,
- offsetCenter: [25, '20%'], // x, y锛屽崟浣峱x
+ offsetCenter: [35, '20%'], // x, y锛屽崟浣峱x
textStyle: { // 鍏朵綑灞炴�ч粯璁や娇鐢ㄥ叏灞�鏂囨湰鏍峰紡锛岃瑙乀EXTSTYLE
fontWeight: 'bolder',
color: '#fff'
}
},
- data: [{value: 1.5, name: 'm/min'}]
+ data: [{value: 1.5, name: 'y'}]
},
{
name: '璐у弶閫熷害',
@@ -543,11 +550,17 @@
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
}
+ },
+ axisLabel: { // 鍧愭爣杞村皬鏍囪
+ fontWeight: 'bolder',
+ color: '#fff',
+ shadowColor: '#fff', //榛樿閫忔槑
+ shadowBlur: 10
},
axisTick: { // 鍧愭爣杞村皬鏍囪
length: 12, // 灞炴�ength鎺у埗绾块暱
@@ -585,12 +598,30 @@
shadowBlur: 5
},
title: {
- show: false
+ offsetCenter: [0, '-30%'], // x, y锛屽崟浣峱x
+ textStyle: { // 鍏朵綑灞炴�ч粯璁や娇鐢ㄥ叏灞�鏂囨湰鏍峰紡锛岃瑙乀EXTSTYLE
+ fontWeight: 'bolder',
+ fontStyle: 'italic',
+ color: '#fff',
+ shadowColor: '#fff', //榛樿閫忔槑
+ shadowBlur: 10
+ }
},
detail: {
- show: false
+ //backgroundColor: 'rgba(30,144,255,0.8)',
+ // borderWidth: 1,
+ borderColor: '#fff',
+ shadowColor: '#fff', //榛樿閫忔槑
+ shadowBlur: 5,
+ width: 80,
+ height: 30,
+ offsetCenter: [40, '5%'], // x, y锛屽崟浣峱x
+ textStyle: { // 鍏朵綑灞炴�ч粯璁や娇鐢ㄥ叏灞�鏂囨湰鏍峰紡锛岃瑙乀EXTSTYLE
+ fontWeight: 'bolder',
+ color: '#fff'
+ }
},
- data: [{value: 0.5, name: 'm/min'}]
+ data: [{value: 0.5, name: 'z'}]
},
{
name: '璐у弶浣嶇疆',
@@ -604,7 +635,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
@@ -729,9 +760,9 @@
// },
itemStyle:{
normal:{
- color:'#0cbad9', //鎶樼偣棰滆壊
+ color:'#ef550e', //鎶樼偣棰滆壊
lineStyle:{
- color:'#07a093' //鎶樼嚎棰滆壊
+ color:'#ec670f' //鎶樼嚎棰滆壊
}
}
}
@@ -856,5 +887,13 @@
});
}
+ // eCharts 璺熼殢绐楀彛鏀瑰彉
+ window.onresize = function(){
+ crnChart.resize();
+ lineCharts.resize();
+ pieCharts.resize();
+ }
+
+
</script>
</html>
--
Gitblit v1.9.1