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/monitor.html | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/main/webapp/views/monitor/monitor.html b/src/main/webapp/views/monitor/monitor.html
index 7bdb4b6..a496341 100644
--- a/src/main/webapp/views/monitor/monitor.html
+++ b/src/main/webapp/views/monitor/monitor.html
@@ -296,7 +296,7 @@
鍦ㄥ簱
</div>
<div class="elem-footer">
- 3,300
+ <span id="stock-count">0</span>
</div>
</div>
<div class="top-footer-elem">
@@ -306,7 +306,7 @@
绌哄簱
</div>
<div class="elem-footer">
- 161
+ <span id="empty-count">0</span>
</div>
</div>
<div class="top-footer-elem">
@@ -316,7 +316,7 @@
浣跨敤涓�
</div>
<div class="elem-footer">
- 666
+ <span id="used-count">0</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>
@@ -486,7 +486,7 @@
legend: {
orient: 'vertical',
left: 10,
- data: ['鍦ㄥ簱搴撲綅', '绌哄簱浣�', '浣跨敤搴撲綅', '绂佺敤搴撲綅']
+ data: ['鍦ㄥ簱', '绌�']
},
series: [
{
@@ -509,10 +509,10 @@
show: false
},
data: [
- {value: 1, name: '鍦ㄥ簱搴撲綅'},
- {value: 1, name: '绌哄簱浣�'},
- {value: 1, name: '浣跨敤搴撲綅'},
- {value: 1, name: '绂佺敤搴撲綅'},
+ {value: 1, name: '鍦ㄥ簱'},
+ {value: 1, name: '绌�'},
+ {value: 1, name: '浣跨敤'},
+ {value: 1, name: '绂佺敤'},
],
itemStyle: {
emphasis: {
@@ -533,7 +533,6 @@
}
]
};
- // pieCharts.setOption(pieChartOption)
// 楗煎浘鍔犺浇
function initPieChart() {
$.ajax({
@@ -541,8 +540,15 @@
method: 'GET',
success: function (res) {
if (res.code === 200){
- pieChartOption.series[0].data = res.data;
- pieCharts.setOption(pieChartOption)
+ 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