From f215a22829d7301535af73e02f91a9ad718e1b22 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 14:28:03 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/monitor.html | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index e5807f2..987c282 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -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,9 @@
//,anim: 'updown' //鍒囨崲鍔ㄧ敾鏂瑰紡
});
});
- $('.counter').countUp();
- // 閬僵
- let closeBtn = document.getElementById('closeBtn');
- let detailModal = document.getElementById('detail-modal');
- closeBtn.onclick = function () {
- detailModal.style.display = 'none';
- };
- var data = [];
+ // 璁℃暟鍔ㄧ敾
+ $('.counter').countUp();
/***********************************************************************************/
/************************************* 鎶樼嚎鍥� ***************************************/
@@ -540,13 +534,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