From ddd3d3214edd630c19c11b27d02e350dd3cc68ad Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 16:48:53 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 52 +++++++++++++++++++++++++++++-----------------------
1 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 2d519b2..d692433 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -124,40 +124,40 @@
<img src="img/a.png">
<div class="info-detail">
<div class="real-data">
- <i class="count" id="totalLoc">0</i>
- <span class="unit">涓�</span>
+ <i class="count" id="xDistance">0</i>
+ <span class="unit">km</span>
</div>
- <div class="content">搴撲綅鎬绘暟(涓�)</div>
+ <div class="content">绱璧拌璺濈(鍗冪背)</div>
</div>
</div>
<div class="charge-info-elem">
<img src="img/b.png">
<div class="info-detail">
<div class="real-data">
- <i class="count" id="totalWrk">0</i>
- <span class="unit">鎵�</span>
+ <i class="count" id="yDistance">0</i>
+ <span class="unit">km</span>
</div>
- <div class="content">鎬讳换鍔℃暟(鎵�)</div>
+ <div class="content">绱鍗囬檷璺濈(鍗冪背)</div>
</div>
</div>
<div class="charge-info-elem">
<img src="img/c.png">
<div class="info-detail">
<div class="real-data">
- <i class="count" id="">33</i>
- <span class="unit">鎵�</span>
+ <i class="count" id="xDuration">0</i>
+ <span class="unit">h</span>
</div>
- <div class="content">浠婃棩鍏ュ簱(鎵�)</div>
+ <div class="content">绱璧拌鏃堕暱(灏忔椂)</div>
</div>
</div>
<div class="charge-info-elem">
<img src="img/d.png">
<div class="info-detail">
<div class="real-data">
- <i class="count">14296</i>
- <span class="unit">鍗冪摝鏃�</span>
+ <i class="count" id="yDuration">0</i>
+ <span class="unit">h</span>
</div>
- <div class="content">浠婃棩鐢垫�婚噺(鍗冪摝鏃�)</div>
+ <div class="content">绱鍗囬檷鏃堕暱(灏忔椂)</div>
</div>
</div>
</div>
@@ -166,7 +166,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="img/wxCode.jpg">
</div>
</div>
@@ -196,11 +196,11 @@
<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 style="background-color: red"></div>
+ <div style="background-color: gold"></div>
+ <div style="background-color: #333333"></div>
+ <div style="background-color: #00FF00"></div>
+ <div style="background-color: #5FB878"></div>
</div>
</div>
@@ -313,10 +313,10 @@
<div class="elem-header" id="elem-header-third">
</div>
<div class="elem-main">
- 浣跨敤涓�
+ 绂佺敤
</div>
<div class="elem-footer">
- <span id="used-count">0</span>
+ <span id="none-count">0</span>
</div>
</div>
</div>
@@ -337,9 +337,12 @@
</div>
</div>
<div class="progress-bar-modal">
- <div class="bar-container">
- <div class="bar-proportion"><span>瀹為檯浣跨敤</span></div>
+ <div class="layui-progress layui-progress-big" lay-filter="used-progress" style="background-color: #233751;width: 80%;display: inline-block">
+ <div class="layui-progress-bar layui-bg-red" lay-percent="0%"></div>
</div>
+<!-- <div class="bar-container">-->
+<!-- <div class="bar-proportion"><span>瀹為檯浣跨敤</span></div>-->
+<!-- </div>-->
<i class="bar-container-count"><span id="used">0</span></i>
</div>
</div>
@@ -348,8 +351,9 @@
</div>
</body>
<script>
- layui.use('carousel', function(){
+ layui.use(['element', 'carousel'], function(){
var carousel = layui.carousel;
+ var element = layui.element;
//寤洪�犲疄渚�
carousel.render({
elem: '#test1'
@@ -540,6 +544,8 @@
$('#usedPr').text(res.data.usedPr);
$('#used').text(res.data.used);
+
+ layui.element.progress('used-progress', res.data.usedPr + '%');
} else if (res.code === 403){
top.location.href = "/";
} else {
--
Gitblit v1.9.1