From 8e13b1cf8fd11809837fa2c958d608a1c38732db Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 11:26:32 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 82 ++++++++++++++++++----------------------
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 20 +++++++++
2 files changed, 56 insertions(+), 46 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 84d2c52..ac158ae 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -95,11 +95,29 @@
pakoutList.get(i).put("wrkStsName", wrkSts.getStsName());
}
}
-
+ // 瀹夊叏搴撳瓨璀﹀憡
+ List<Map<String, Object>> safeQuaList = jdbcTemplate.queryForList("select \n" +
+ "top 10\n" +
+ "mp.node_id,\n" +
+ "mp.node_name,\n" +
+ "mp.matnr,\n" +
+ "mp.maktx,\n" +
+ "mp.safe_qua,\n" +
+ "mld.anfme,\n" +
+ "(mp.safe_qua - mld.anfme) as dValue\n" +
+ "from man_prior mp\n" +
+ "left join \n" +
+ "(select SUM(anfme) as anfme, node_id from man_loc_detl where 1=1 group by node_id) mld on mp.node_id = mld.node_id\n" +
+ "where 1=1 \n" +
+ "order by (mp.safe_qua - mld.anfme) desc");
+ for (int i=0;i<safeQuaList.size();i++) {
+ safeQuaList.get(i).put("no", i+1);
+ }
return R.ok().add(Cools
.add("combList", combList) // 缁勬墭鏈�鏂板姩鎬�
.add("pakoutList", pakoutList) // 鏈�鏂版嫞璐у崟
+ .add("safeQuaList", safeQuaList) // 瀹夊叏搴撳瓨璀﹀憡
);
}
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index f8b3c3e..6e8561e 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -40,7 +40,7 @@
/** 灏忕粍鎴愬憳 */
.console-user-group {
position: relative;
- padding: 10px 0 10px 60px;
+ padding: 10px 0 10px 40px;
}
.console-user-group .console-user-group-head {
@@ -49,8 +49,10 @@
position: absolute;
top: 50%;
left: 12px;
- margin-top: -16px;
+ margin-top: -10px;
border-radius: 50%;
+ font-size: 18px;
+ font-weight: bolder;
}
.console-user-group .layui-badge {
@@ -406,27 +408,26 @@
<col>
</colgroup>
<tbody>
- <script type="text/html" ew-tpl>
- <tr>
- <td>褰撳墠鐗堟湰</td>
- <td>v{{layui.admin.version}}   <a href="https://easyweb.vip/doc/" target="_blank">鏇存柊鏃ュ織</a>
- </td>
- </tr>
- <tr>
- <td>鍩轰簬妗嗘灦</td>
- <td>layui-v{{layui.v}}</td>
- </tr>
- </script>
+<!-- <script type="text/html" ew-tpl>-->
+<!-- <tr>-->
+<!-- <td>褰撳墠鐗堟湰</td>-->
+<!-- <td>v{{layui.admin.version}}   <a href="https://easyweb.vip/doc/" target="_blank">鏇存柊鏃ュ織</a>-->
+<!-- </td>-->
+<!-- </tr>-->
+<!-- <tr>-->
+<!-- <td>鍩轰簬妗嗘灦</td>-->
+<!-- <td>layui-v{{layui.v}}</td>-->
+<!-- </tr>-->
+<!-- </script>-->
<tr>
- <td>涓昏鐗硅壊</td>
- <td>鍗曢〉闈� / 鍝嶅簲寮� / 绠�绾� / 鏄撲笂鎵�</td>
+ <td>鐗堟湰鍙�</td>
+ <td>Version 1.0.0</td>
</tr>
<tr>
- <td>鑾峰彇娓犻亾</td>
+ <td>绔嬪簱鍏ュ彛</td>
<td>
- <a href="http://easyweb.vip" class="layui-btn layui-btn-sm layui-btn-danger"
- target="_blank">鑾峰彇鎺堟潈</a>
- <a href="http://easyweb.vip/user/order" target="_blank" class="layui-btn layui-btn-sm">绔嬪嵆涓嬭浇</a>
+ <a href="http://localhost:8080/wms" class="layui-btn layui-btn-sm layui-btn-danger" target="_blank">A-WMS</a>
+ <a href="http://localhost:8080/wcs" target="_blank" class="layui-btn layui-btn-sm">WCS</a>
</td>
</tr>
</tbody>
@@ -434,32 +435,8 @@
</div>
</div>
<div class="layui-card">
- <div class="layui-card-header">灏忕粍鎴愬憳</div>
- <div class="layui-card-body">
- <div class="console-user-group">
- <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
- <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
- <div class="console-user-group-desc">浜у搧璐熻矗浜�</div>
- <span class="layui-badge layui-badge-green">鍦ㄧ嚎</span>
- </div>
- <div class="console-user-group">
- <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
- <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
- <div class="console-user-group-desc">椤圭洰璐熻矗浜�</div>
- <span class="layui-badge layui-badge-green">鍦ㄧ嚎</span>
- </div>
- <div class="console-user-group">
- <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
- <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
- <div class="console-user-group-desc">浜у搧璐熻矗浜�</div>
- <span class="layui-badge layui-badge-red">绂荤嚎</span>
- </div>
- <div class="console-user-group">
- <img src="../../assets/images/head.jpg" class="console-user-group-head" alt=""/>
- <div class="console-user-group-name">鍛ㄦ槦鏄�</div>
- <div class="console-user-group-desc">娴嬭瘯璐熻矗浜�</div>
- <span class="layui-badge layui-badge-red">绂荤嚎</span>
- </div>
+ <div class="layui-card-header">瀹夊叏搴撳瓨璀﹀憡</div>
+ <div class="layui-card-body" id="safeQuaList">
</div>
</div>
<div class="layui-card">
@@ -568,6 +545,11 @@
var template2 = Handlebars.compile(tpl2);
var html2 = template2(res.data);
$('#pakoutList').append(html2);
+ // 瀹夊叏搴撳瓨
+ var tpl3 = $('#safeQuaTpl').html();
+ var template3 = Handlebars.compile(tpl3);
+ var html3 = template3(res.data);
+ $('#safeQuaList').append(html3);
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
@@ -605,5 +587,15 @@
</tr>
{{/each}}
</script>
+<script type="text/template" id="safeQuaTpl">
+ {{#each safeQuaList}}
+ <div class="console-user-group">
+ <div class="console-user-group-head">{{no}}</div>
+ <div class="console-user-group-name">{{node_name}}</div>
+ <div class="console-user-group-desc">{{maktx}}</div>
+ <span class="layui-badge layui-badge-red" style="letter-spacing: 1px">闇�鍏ュ簱锛歿{dValue}}</span>
+ </div>
+ {{/each}}
+</script>
</body>
</html>
--
Gitblit v1.9.1