From 90ffa7515c367e9be9a2c41e954757898ad2df94 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 15:27:07 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 31 ++++++++++++-------------------
1 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index e5807f2..2d519b2 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -124,7 +124,7 @@
<img src="img/a.png">
<div class="info-detail">
<div class="real-data">
- <i class="count">7777</i>
+ <i class="count" id="totalLoc">0</i>
<span class="unit">涓�</span>
</div>
<div class="content">搴撲綅鎬绘暟(涓�)</div>
@@ -134,17 +134,17 @@
<img src="img/b.png">
<div class="info-detail">
<div class="real-data">
- <i class="count">777</i>
- <span class="unit">涓�</span>
+ <i class="count" id="totalWrk">0</i>
+ <span class="unit">鎵�</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">33</i>
+ <i class="count" id="">33</i>
<span class="unit">鎵�</span>
</div>
<div class="content">浠婃棩鍏ュ簱(鎵�)</div>
@@ -184,10 +184,10 @@
<div class="crn-speed">
<div class="speed-content">
<div>
- <span>鍫嗗灈鏈鸿蛋琛岄�熷害锛�</span><span class="counter">5.00</span><span>绫�/绉�</span>
+ <span>鍫嗗灈鏈鸿蛋琛岄�熷害锛�</span><span id="xSpeed" class="counter">5.00</span><span>绫�/绉�</span>
</div>
<div>
- <span>鍫嗗灈鏈哄崌闄嶉�熷害锛�</span><span class="counter">5.00</span><span>绫�/绉�</span>
+ <span>鍫嗗灈鏈哄崌闄嶉�熷害锛�</span><span id="ySpeed" class="counter">5.00</span><span>绫�/绉�</span>
</div>
</div>
</div>
@@ -329,7 +329,7 @@
<div class="progress-bar">
<div class="usage-rate">
<span class="usage-rate-left" >搴撲綅浣跨敤鐜�</span>
- <span class="usage-rate-right">60%</span>
+ <span class="usage-rate-right"><span id="usedPr">0</span>%</span>
</div>
<div class="usage-rate-english english">
<span class="usage-rate-left">EQUIPMENT USAGE THIS MONTH</span>
@@ -340,7 +340,7 @@
<div class="bar-container">
<div class="bar-proportion"><span>瀹為檯浣跨敤</span></div>
</div>
- <i class="bar-container-count">7777<span>涓�</span></i>
+ <i class="bar-container-count"><span id="used">0</span></i>
</div>
</div>
</div>
@@ -358,15 +358,6 @@
//,anim: 'updown' //鍒囨崲鍔ㄧ敾鏂瑰紡
});
});
- $('.counter').countUp();
- // 閬僵
- let closeBtn = document.getElementById('closeBtn');
- let detailModal = document.getElementById('detail-modal');
- closeBtn.onclick = function () {
- detailModal.style.display = 'none';
- };
- var data = [];
-
/***********************************************************************************/
/************************************* 鎶樼嚎鍥� ***************************************/
@@ -540,13 +531,15 @@
method: 'GET',
success: function (res) {
if (res.code === 200){
- console.log(res.data);
pieChartOption.series[0].data = res.data.pie;
pieCharts.setOption(pieChartOption);
$('#stock-count').text(res.data.stockCunt);
$('#empty-count').text(res.data.emptyCount);
$('#none-count').text(res.data.noneCount);
+
+ $('#usedPr').text(res.data.usedPr);
+ $('#used').text(res.data.used);
} else if (res.code === 403){
top.location.href = "/";
} else {
--
Gitblit v1.9.1