From 7137fd8b37b0ba1248a6535ef05b7537965e7b50 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 17 十一月 2020 11:06:11 +0800
Subject: [PATCH] #
---
src/main/webapp/views/monitor/css/monitor.css | 4 ++++
src/main/webapp/views/monitor/monitor.html | 7 +++++--
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/webapp/views/monitor/css/monitor.css b/src/main/webapp/views/monitor/css/monitor.css
index f884db3..99a3da6 100644
--- a/src/main/webapp/views/monitor/css/monitor.css
+++ b/src/main/webapp/views/monitor/css/monitor.css
@@ -383,6 +383,10 @@
right: 0;
bottom: 0;
}
+.usage-rate .usage-rate-right span {
+ letter-spacing: 2px;
+ font-size: large;
+}
.usage-rate-english {
position: relative;
height: 50%;
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index c2199f8..a496341 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>
@@ -546,6 +546,9 @@
$('#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