From fa29b45fb2f25087b106bfa234a1ec6feebb3f8d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 16 十一月 2020 10:33:02 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 115 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 71 insertions(+), 44 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 0eba122..e11fd52 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -5,15 +5,18 @@
<title>ASRS鐩戞帶</title>
<link href="css/monitor.css" rel="stylesheet">
<link href="css/Pacifico.css" rel="stylesheet">
+ <link href="../../static/layui/css/layui.css" rel="stylesheet">
+ <link href="css/lunbo.css" rel="stylesheet">
<script src="js/jquery-3.3.1.min.js"></script>
<script src="js/vincent.js"></script>
<script src="js/echarts/echarts.min.js"></script>
<script src="js/jquery.countup.min.js"></script>
<script src="js/jquery.waypoints.min.js"></script>
+ <script src="../../static/layui/layui.js"></script>
<style>
.crn-speed {
width: 100%;
- height: 20%;
+ height: 35%;
text-align: center;
overflow: hidden;
text-overflow: ellipsis;
@@ -24,18 +27,18 @@
.crn-speed span {
display:inline-block;
margin:20px auto;
- font-size:64px;
+ font-size:56px;
font-family:'Pacifico',serif
}
.speed-content {
display: inline-block;
}
+
.scroll-pane {
width: 100%;
- height: 80%;
+ height: 65%;
}
-
.scroll-bar {
float: left;
width: 50%;
@@ -178,57 +181,71 @@
<!-- 涓笂 -->
<div class="crn-speed">
<div class="speed-content">
- <span>鍫嗗灈鏈洪�熷害锛�</span><span class="counter">5.00</span><span>绫�/绉�</span>
+ <div>
+ <span>鍫嗗灈鏈鸿蛋琛岄�熷害锛�</span><span class="counter">5.00</span><span>绫�/绉�</span>
+ </div>
+ <div>
+ <span>鍫嗗灈鏈哄崌闄嶉�熷害锛�</span><span class="counter">5.00</span><span>绫�/绉�</span>
+ </div>
</div>
</div>
<div class="scroll-pane">
-
- <!-- 涓乏 -->
- <div class="scroll-bar left-bar">
- <div class="scroll-header">
- <span>鍏ュ簱</span>
- <p class="english">Entering Warehouse</p>
- </div>
- <div class="scroll-content">
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
+ <div class="layui-carousel" id="test1">
+ <div carousel-item>
+ <div style="background-color: red">鏉＄洰1</div>
+ <div style="background-color: gold">鏉＄洰2</div>
+ <div style="background-color: #333333">鏉＄洰3</div>
+ <div style="background-color: #00FF00">鏉＄洰4</div>
+ <div style="background-color: #5FB878">鏉＄洰5</div>
</div>
</div>
- <!-- 涓彸 -->
- <div class="scroll-bar right-bar">
- <div class="scroll-header">
- <span>鍑哄簱</span>
- <p class="english">Delivery Of Cargo From Storage</p>
- </div>
- <div class="scroll-content">
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- <p>111111111111111111111</p>
- </div>
- </div>
- </div>
+<!-- <!– 涓乏 –>-->
+<!-- <div class="scroll-bar left-bar">-->
+<!-- <div class="scroll-header">-->
+<!-- <span>鍏ュ簱</span>-->
+<!-- <p class="english">Entering Warehouse</p>-->
+<!-- </div>-->
+<!-- <div class="scroll-content">-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- <!– 涓彸 –>-->
+<!-- <div class="scroll-bar right-bar">-->
+<!-- <div class="scroll-header">-->
+<!-- <span>鍑哄簱</span>-->
+<!-- <p class="english">Delivery Of Cargo From Storage</p>-->
+<!-- </div>-->
+<!-- <div class="scroll-content">-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- <p>111111111111111111111</p>-->
+<!-- </div>-->
+<!-- </div>-->
+<!-- </div>-->
+
+ </div>
</div>
-
</div>
<!--鍙�-->
@@ -329,6 +346,16 @@
</div>
</body>
<script>
+ layui.use('carousel', function(){
+ var carousel = layui.carousel;
+ //寤洪�犲疄渚�
+ carousel.render({
+ elem: '#test1'
+ ,width: '100%' //璁剧疆瀹瑰櫒瀹藉害
+ ,arrow: 'always' //濮嬬粓鏄剧ず绠ご
+ //,anim: 'updown' //鍒囨崲鍔ㄧ敾鏂瑰紡
+ });
+ });
$('.counter').countUp();
// 閬僵
let closeBtn = document.getElementById('closeBtn');
--
Gitblit v1.9.1