From d44598d72c02bc05227b64749ea017c1eb69c6a5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 14:46:46 +0800
Subject: [PATCH] #
---
src/main/webapp/views/home/console.html | 21 +++++++++++++--------
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 1 +
src/main/webapp/views/prior/prior_detail.html | 8 --------
3 files changed, 14 insertions(+), 16 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 1fd5337..5ec2f03 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -109,6 +109,7 @@
"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" +
+ "and mp.safe_qua > mld.anfme\n" +
"order by (mp.safe_qua - mld.anfme) desc");
for (int i=0;i<safeQuaList.size();i++) {
safeQuaList.get(i).put("no", i+1);
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index c8cbda6..cabf101 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -391,6 +391,15 @@
var carousel = layui.carousel;
var device = layui.device();
+
+ getHeaderData();
+ getBodyData();
+
+ setInterval(function () {
+ getHeaderData();
+ getBodyData();
+ }, 3000)
+
// 娓叉煋杞挱
carousel.render({
elem: '#workplaceNewsCarousel',
@@ -401,8 +410,6 @@
trigger: device.ios || device.android ? 'click' : 'hover',
anim: 'fade'
});
-
- getHeaderData();
// 澶�
function getHeaderData() {
@@ -434,8 +441,6 @@
})
}
- getBodyData();
-
// 澶�
function getBodyData() {
$.ajax({
@@ -448,22 +453,22 @@
var tpl1 = $('#combTpl').html();
var template1 = Handlebars.compile(tpl1);
var html1 = template1(res.data);
- $('#combList').append(html1);
+ $('#combList').html(html1);
// 璁㈠崟
var tpl2 = $('#orderTpl').html();
var template2 = Handlebars.compile(tpl2);
var html2 = template2(res.data);
- $('#pakoutList').append(html2);
+ $('#pakoutList').html(html2);
// 瀹夊叏搴撳瓨
var tpl3 = $('#safeQuaTpl').html();
var template3 = Handlebars.compile(tpl3);
var html3 = template3(res.data);
- $('#safeQuaList').append(html3);
+ $('#safeQuaList').html(html3);
// 搴撳瓨婊炵暀
var tpl4 = $('#retentionTpl').html();
var template4 = Handlebars.compile(tpl4);
var html4 = template4(res.data);
- $('#retentionList').append(html4);
+ $('#retentionList').html(html4);
} else if (res.code === 403) {
top.location.href = baseUrl + "/";
} else {
diff --git a/src/main/webapp/views/prior/prior_detail.html b/src/main/webapp/views/prior/prior_detail.html
index dde9d73..1ef8650 100644
--- a/src/main/webapp/views/prior/prior_detail.html
+++ b/src/main/webapp/views/prior/prior_detail.html
@@ -15,14 +15,6 @@
<!-- 璇︽儏 -->
<div id="data-detail" class="layer_self_wrap">
<form id="detail" class="layui-form">
- <!--
- <div class="layui-inline" style="display: none">
- <label class="layui-form-label"><span class="not-null">*</span>缂栥��銆�鍙凤細</label>
- <div class="layui-input-inline">
- <input id="id" class="layui-input" type="text" placeholder="缂栧彿">
- </div>
- </div>
- -->
<div class="layui-inline" style="width:31%;display: none">
<label class="layui-form-label"><span class="not-null">*</span>I銆�銆�D锛�</label>
<div class="layui-input-inline">
--
Gitblit v1.9.1