From f4bd60b9acfe8a2b414e60ed6c23e82ffa429991 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 11:52:08 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 29 +++++++++++++++++++----------
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 9 ++++++---
2 files changed, 25 insertions(+), 13 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
index 563c07b..c0898c1 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -43,11 +43,14 @@
return R.ok().add(Cools
.add("combQtyDay", Optional.ofNullable(combQtyDay).orElse(0)) // 缁勬墭鏁伴噺(褰撳ぉ锛�
- .add("combQty銆�", Optional.ofNullable(combQty).orElse(0)) // 缁勬墭鏁伴噺
+ .add("combQty", Optional.ofNullable(combQty).orElse(0)) // 缁勬墭鏁伴噺
+
.add("matQty", Optional.ofNullable(matQty).orElse(0)) // 鐗╂枡鏁伴噺
- .add("nodeQty銆�", Optional.ofNullable(nodeQty).orElse(0)) // 璐т綅鏁伴噺
+ .add("nodeQty", Optional.ofNullable(nodeQty).orElse(0)) // 璐т綅鏁伴噺
+
.add("pakoutQty", Optional.ofNullable(pakoutQty).orElse(0)) // 鎬诲嚭搴撳崟鏁�
- .add("pakoutQtyMonth銆�", Optional.ofNullable(pakoutQtyMonth).orElse(0)) // 鎬诲嚭搴撳崟鏁帮紙褰撴湀)
+ .add("pakoutQtyMonth", Optional.ofNullable(pakoutQtyMonth).orElse(0)) // 鍑哄簱鍗曟暟锛堝綋鏈�)
+
.add("usersQty", Optional.ofNullable(usersQty).orElse(0)) // 鐢ㄦ埛鏁伴噺
.add("deptQty", Optional.ofNullable(deptQty).orElse(0)) // 閮ㄩ棬鏁伴噺
);
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index d2304b3..492ec9d 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -152,33 +152,33 @@
<div class="layui-col-xs12 layui-col-sm6 layui-col-md3">
<div class="layui-card">
<div class="layui-card-header">
- 璁块棶閲�<span class="layui-badge layui-badge-green pull-right">鏃�</span>
+ 缁勬墭閲�<span class="layui-badge layui-badge-green pull-right">鏃�</span>
</div>
<div class="layui-card-body">
- <p class="lay-big-font">25,848</p>
- <p>鎬昏闂噺<span class="pull-right">280 涓�</span></p>
+ <p class="lay-big-font" id="combQtyDay">0</p>
+ <p>鎬荤粍鎵橀噺<span class="pull-right"><span id="combQty">0</span></span></p>
</div>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-md3">
<div class="layui-card">
<div class="layui-card-header">
- 閿�鍞<span class="layui-badge layui-badge-blue pull-right">鏈�</span>
+ 鍟嗗搧鏁伴噺<span class="layui-badge layui-badge-blue pull-right">鎬�</span>
</div>
<div class="layui-card-body">
- <p class="lay-big-font"><span style="font-size: 26px;line-height: 1;">楼</span>12,000</p>
- <p>鎬婚攢鍞<span class="pull-right">68 涓�</span></p>
+ <p class="lay-big-font"><span style="line-height: 1;" id="matQty">0</span></p>
+ <p>璐т綅鏁伴噺<span class="pull-right"><span id="nodeQty"></span> </span></p>
</div>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-md3">
<div class="layui-card">
<div class="layui-card-header">
- 璁㈠崟閲�<span class="layui-badge layui-badge-red pull-right">鍛�</span>
+ 鎹¤揣鍗曢噺<span class="layui-badge layui-badge-red pull-right">鏈�</span>
</div>
<div class="layui-card-body">
- <p class="lay-big-font">1,680</p>
- <p>杞寲鐜�<span class="pull-right">60%</span></p>
+ <p class="lay-big-font"><span id="pakoutQtyMonth">0</span></p>
+ <p>鎬诲崟閲�<span class="pull-right"><span id="pakoutQty">0</span></span></p>
</div>
</div>
</div>
@@ -635,9 +635,18 @@
success: function (res) {
if (res.code === 200) {
var result = res.data;
- console.log(result)
+ $('#combQtyDay').text(result.combQtyDay);
+ $('#combQty').text(result.combQty);
+
+ $('#matQty').text(result.matQty);
+ $('#nodeQty').text(result.nodeQty);
+
+ $('#pakoutQty').text(result.pakoutQty);
+ $('#pakoutQtyMonth').text(result.pakoutQtyMonth);
+
$('#usersQty').text(result.usersQty);
$('#deptQty').text(result.deptQty);
+
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
--
Gitblit v1.9.1