From 5aefe8c055c300e035bad35d7c65d25f1efd6794 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 10:39:57 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 177 +++++++++++++++----------------------------
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 47 +++++++++++
src/main/resources/application.yml | 2
3 files changed, 110 insertions(+), 116 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 c0898c1..84d2c52 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -7,7 +7,11 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
+import zy.cloud.wms.manager.entity.WrkSts;
+import zy.cloud.wms.manager.service.WrkStsService;
+import java.util.List;
+import java.util.Map;
import java.util.Optional;
/**
@@ -19,6 +23,8 @@
@Autowired
private JdbcTemplate jdbcTemplate;
+ @Autowired
+ private WrkStsService wrkStsService;
/**
* 褰撳ぉ鏁版嵁锛歴elect * from tableName where datediff(day, 瀛楁鍚�,getdate())=0
@@ -56,4 +62,45 @@
);
}
+ @RequestMapping(value = "/body/auth")
+ public R body() {
+ // 缁勬墭
+ List<Map<String, Object>> combList = jdbcTemplate.queryForList("select top 10 * from man_comb where 1=1 order by create_time desc");
+ for (int i=0;i<combList.size();i++) {
+ Object create_time = combList.get(i).get("create_time");
+ combList.get(i).put("time", String.valueOf(create_time).substring(11, 16));
+ combList.get(i).put("active", i<3?"active":"");
+ }
+ // 鎷ｈ揣鍗�
+ List<Map<String, Object>> pakoutList = jdbcTemplate.queryForList("select top 5 * from man_pakout where 1=1 order by create_time desc");
+ for (int i=0;i<pakoutList.size();i++) {
+ pakoutList.get(i).put("no", i+1);
+ String wrk_sts = String.valueOf(pakoutList.get(i).get("wrk_sts"));
+ switch (wrk_sts) {
+ case "1":
+ pakoutList.get(i).put("style", "text-warning");
+ break;
+ case "2":
+ pakoutList.get(i).put("style", "text-danger");
+ break;
+ case "3":
+ pakoutList.get(i).put("style", "text-success");
+ break;
+ default:
+ pakoutList.get(i).put("style", "text-info");
+ break;
+ }
+ WrkSts wrkSts = wrkStsService.selectById(Integer.parseInt(wrk_sts));
+ if (null != wrkSts) {
+ pakoutList.get(i).put("wrkStsName", wrkSts.getStsName());
+ }
+ }
+
+
+ return R.ok().add(Cools
+ .add("combList", combList) // 缁勬墭鏈�鏂板姩鎬�
+ .add("pakoutList", pakoutList) // 鏈�鏂版嫞璐у崟
+ );
+ }
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index d386bd5..536b142 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -14,7 +14,7 @@
# password: xltys1995
# sql-server
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
- url: jdbc:sqlserver://localhost:1433;databasename=htasrs
+ url: jdbc:sqlserver://192.168.2.250:1433;databasename=htasrs
username: sa
password: sa@123
mvc:
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index 892e560..0a33902 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -263,86 +263,16 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md6">
<div class="layui-card">
- <div class="layui-card-header">鏈�鏂板姩鎬�</div>
+ <div class="layui-card-header">缁勬墭鍔ㄦ��</div>
<div class="layui-card-body dynamic-card-body mini-bar" style="height: 265px;">
- <ul class="layui-timeline layui-timeline-dynamic">
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">鐮斿彂缁忕悊 鎸囨淳浜嗕换鍔� 闄鎴峰悆楗�
- <span class="pull-right">14:30 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis active"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">娴嬭瘯缁勯暱 鎻愪氦浜哹ug 浠ｇ爜閿欒
- <span class="pull-right">14:00 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">绠＄悊鍛� 鐧诲綍浜嗙郴缁�
- <span class="pull-right">13:30 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis active"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">寮�鍙戜竴 瑙ｅ喅浜哹ug 浠ｇ爜閿欒
- <span class="pull-right">11:30 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis active"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">娴嬭瘯涓� 鍒涘缓浜嗙敤渚� 鐢ㄦ埛鐧诲綍
- <span class="pull-right">11:00 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">寮�鍙戜簩 閫�鍑轰簡绯荤粺
- <span class="pull-right">10:30 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">鐮斿彂缁忕悊 鎸囨淳浜嗕换鍔� 淇敼澶ug
- <span class="pull-right">10:00 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">鐮斿彂缁忕悊 鎸囨淳浜嗕换鍔� 淇敼灏廱ug
- <span class="pull-right">09:30 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis active"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">鐮斿彂缁忕悊 鎸囨淳浜嗕换鍔� 淇敼灏廱ug
- <span class="pull-right">09:00 </span></div>
- </div>
- </li>
- <li class="layui-timeline-item">
- <i class="layui-icon layui-timeline-axis"></i>
- <div class="layui-timeline-content layui-text">
- <div class="layui-timeline-title">绠＄悊鍛� 鐧诲綍浜嗙郴缁�
- <span class="pull-right">08:30 </span></div>
- </div>
- </li>
+ <ul id="combList" class="layui-timeline layui-timeline-dynamic">
</ul>
</div>
</div>
</div>
<div class="layui-col-md6">
<div class="layui-card">
- <div class="layui-card-header">鎴戠殑浠诲姟</div>
+ <div class="layui-card-header">鏈�鏂版嫞璐�</div>
<div class="layui-card-body">
<table class="layui-table" lay-skin="line">
<colgroup>
@@ -352,51 +282,12 @@
</colgroup>
<thead>
<tr>
- <td align="center">浼樺厛绾�</td>
- <td>浠诲姟鍚嶇О</td>
+ <td align="center">鏁伴噺</td>
+ <td>鎷ｈ揣淇℃伅</td>
<td align="center">鐘舵��</td>
</tr>
</thead>
- <tbody>
- <tr>
- <td align="center">
- <span class="layui-badge layui-badge-red layui-badge-priority">1</span>
- </td>
- <td><span class="layui-text"><a>鍙傚姞鑲′笢澶т細</a></span></td>
- <td align="center"><span class="text-warning">鏈紑濮�</span></td>
- </tr>
- <tr>
- <td align="center">
- <span class="layui-badge layui-badge-yellow layui-badge-priority">2</span>
- </td>
- <td><span class="layui-text"><a>闄鎴峰悆楗�</a></span></td>
- <td align="center"><span class="text-warning">鏈紑濮�</span></td>
- </tr>
- <tr>
- <td align="center">
- <span class="layui-badge layui-badge-blue layui-badge-priority">3</span>
- </td>
- <td><span class="layui-text"><a>椤圭洰寮�鍙�</a></span></td>
- <td align="center"><span class="text-success">杩涜涓�</span></td>
- </tr>
- <tr>
- <td align="center">
- <span class="layui-badge layui-badge-blue layui-badge-priority">3</span>
- </td>
- <td><span class="layui-text"><a>淇敼澶ug</a></span></td>
- <td align="center">
- <del class="text-muted">宸插畬鎴�</del>
- </td>
- </tr>
- <tr>
- <td align="center">
- <span class="layui-badge layui-badge-blue layui-badge-priority">3</span>
- </td>
- <td><span class="layui-text"><a>淇敼灏廱ug</a></span></td>
- <td align="center">
- <del class="text-muted">宸插畬鎴�</del>
- </td>
- </tr>
+ <tbody id="pakoutList">
</tbody>
</table>
</div>
@@ -601,6 +492,7 @@
<!-- js閮ㄥ垎 -->
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
<script type="text/javascript" src="../../static/js/common.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
<script>
layui.config({
base: '../../static/layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
@@ -656,7 +548,62 @@
})
}
+ getBodyData();
+
+ // 澶�
+ function getBodyData() {
+ $.ajax({
+ url: baseUrl + "/console/body/auth",
+ headers: {'token': localStorage.getItem('token')},
+ method: 'GET',
+ success: function (res) {
+ if (res.code === 200) {
+ // 缁勬墭
+ var tpl1 = $('#combTpl').html();
+ var template1 = Handlebars.compile(tpl1);
+ var html1 = template1(res.data);
+ $('#combList').append(html1);
+ // 璁㈠崟
+ var tpl2 = $('#orderTpl').html();
+ var template2 = Handlebars.compile(tpl2);
+ var html2 = template2(res.data);
+ $('#pakoutList').append(html2);
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg, {icon: 2})
+ }
+ }
+ })
+ }
+
});
</script>
+<script type="text/template" id="combTpl">
+ {{#each combList}}
+ <li class="layui-timeline-item">
+ <i class="layui-icon layui-timeline-axis {{active}}"></i>
+ <div class="layui-timeline-content layui-text">
+ <div class="layui-timeline-title">{{matnr}} 骞舵澘 {{zpallet}} 鏁伴噺锛歿{anfme}}
+ <span class="pull-right">{{time}} </span></div>
+ </div>
+ </li>
+ {{/each}}
+</script>
+<script type="text/template" id="orderTpl">
+ {{#each pakoutList}}
+ <tr>
+ <td align="center">
+ <span class="layui-badge layui-badge-red layui-badge-priority">{{anfme}}</span>
+ </td>
+ <td><span class="layui-text"><a style="cursor: initial">{{loc_no}} <span style="color: #4c4c4c">鍑哄簱锛�</span> {{matnr}}</a></span></td>
+ <td align="center">
+ <span class="{{style}}">
+ {{wrkStsName}}
+ </span>
+ </td>
+ </tr>
+ {{/each}}
+</script>
</body>
</html>
--
Gitblit v1.9.1