From 871867d77bf116d9450f2c63c33d3f6e97c8a1e9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 08 九月 2023 13:17:31 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/report/stayTime.js | 4 +-
src/main/webapp/views/home/console.html | 6 +-
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 16 ++++----
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 10 +++++
src/main/resources/mapper/ViewStayTimeMapper.xml | 56 ++++++++++++++--------------
src/main/webapp/views/login.html | 3 -
src/main/webapp/static/image/logo.png | 0
7 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 0a172e0..5cc6aab 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -141,6 +141,9 @@
@ApiModelProperty(value= "娣诲姞鏃堕棿")
private Date appe_time;
+ @ApiModelProperty(value= "娣诲姞鏃堕棿")
+ private Date create_time;
+
@ApiModelProperty(value= "澶囨敞")
private String memo;
@@ -160,6 +163,13 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modi_time);
}
+ public String getCreateTime$(){
+ if (Cools.isEmpty(this.create_time)){
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.create_time);
+ }
+
public String getAppeUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.appe_user);
diff --git a/src/main/resources/mapper/ViewStayTimeMapper.xml b/src/main/resources/mapper/ViewStayTimeMapper.xml
index 2b01a4f..f345519 100644
--- a/src/main/resources/mapper/ViewStayTimeMapper.xml
+++ b/src/main/resources/mapper/ViewStayTimeMapper.xml
@@ -44,20 +44,20 @@
select
*
from (
- select
- ROW_NUMBER() over (order by stay_time desc) as row
- , *
- from
- (
- SELECT
- GETDATE() AS today
- , CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
- , asr_loc_detl.*
- FROM asr_loc_detl
- INNER JOIN asr_loc_mast ON asr_loc_detl.loc_no = asr_loc_mast.loc_no
- where 1=1
- <include refid="viewStayTimeConditionSql"></include>
- ) t
+ select
+ ROW_NUMBER() over (order by stay_time desc) as row
+ , *
+ from
+ (
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,man_loc_detl.create_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , man_loc_detl.*
+ FROM man_loc_detl
+ INNER JOIN man_node ON man_loc_detl.loc_no = man_node.name
+ where 1=1
+ <include refid="viewStayTimeConditionSql"></include>
+ ) ts
) a where a.row between ((#{pageNumber}-1)*#{pageSize}+1) and (#{pageNumber}*#{pageSize})
</select>
@@ -65,20 +65,20 @@
select
count(1)
from (
- select
- ROW_NUMBER() over (order by stay_time desc) as row
- , *
- from
- (
- SELECT
- GETDATE() AS today
- , CONVERT(decimal, DATEDIFF(second,asr_loc_detl.appe_time, GETDATE()) / 86400.0, 9) AS stay_time
- , dbo.asr_loc_detl.*
- FROM asr_loc_detl
- INNER JOIN asr_loc_mast ON asr_loc_detl.loc_no = asr_loc_mast.loc_no
- where 1=1
- <include refid="viewStayTimeConditionSql"></include>
- ) t
+ select
+ ROW_NUMBER() over (order by stay_time desc) as row
+ , *
+ from
+ (
+ SELECT
+ GETDATE() AS today
+ , CONVERT(decimal, DATEDIFF(second,man_loc_detl.create_time, GETDATE()) / 86400.0, 9) AS stay_time
+ , man_loc_detl.*
+ FROM man_loc_detl
+ INNER JOIN man_node ON man_loc_detl.loc_no = man_node.name
+ where 1=1
+ <include refid="viewStayTimeConditionSql"></include>
+ ) t
) a
</select>
diff --git a/src/main/webapp/static/image/logo.png b/src/main/webapp/static/image/logo.png
index 094646e..e2fc662 100644
--- a/src/main/webapp/static/image/logo.png
+++ b/src/main/webapp/static/image/logo.png
Binary files differ
diff --git a/src/main/webapp/static/js/report/stayTime.js b/src/main/webapp/static/js/report/stayTime.js
index 7fa12ef..5b5ff13 100644
--- a/src/main/webapp/static/js/report/stayTime.js
+++ b/src/main/webapp/static/js/report/stayTime.js
@@ -1,8 +1,8 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
- ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
+ {field: 'createTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
+ ,{field: 'stay_time', align: 'center',title: '搴撻緞(澶�)'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/views/home/console.html b/src/main/webapp/views/home/console.html
index ce1ed60..75516c4 100644
--- a/src/main/webapp/views/home/console.html
+++ b/src/main/webapp/views/home/console.html
@@ -102,7 +102,7 @@
<!--琛ㄦ牸鏁版嵁-->
<div class="home-elem loc-retention">
<div class="layui-form">
- <div id="form-header">搴撳瓨婊炵暀鏃堕棿缁熻琛�</div>
+ <div id="form-header">搴撻緞缁熻琛�</div>
<table class="layui-hide" id="stayTime" lay-filter="stayTime"></table>
</div>
</div>
@@ -235,8 +235,8 @@
var pageCurr;
function getCol() {
var cols = [
- {field: 'appeTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
- ,{field: 'stay_time', align: 'center',title: '婊炵暀澶╂暟'}
+ {field: 'createTime$', title: '鍏ュ簱鏃堕棿', align: 'center', width: 200}
+ ,{field: 'stay_time', align: 'center',title: '搴撻緞(澶�)'}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�'}
];
cols.push.apply(cols, detlCols);
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index a312e9c..22786eb 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -26,14 +26,14 @@
<button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">閲嶇疆
</button>
</div>
- <div class="layui-inline">
- <fieldset class="layui-elem-field">
- <legend>鎬昏鏁伴噺</legend>
- <div class="layui-field-box" id="countNum">
- 璇风◢绛�
- </div>
- </fieldset>
- </div>
+<!-- <div class="layui-inline">-->
+<!-- <fieldset class="layui-elem-field">-->
+<!-- <legend>鎬昏鏁伴噺</legend>-->
+<!-- <div class="layui-field-box" id="countNum">-->
+<!-- 璇风◢绛�-->
+<!-- </div>-->
+<!-- </fieldset>-->
+<!-- </div>-->
</div>
<!-- 琛ㄦ牸 -->
diff --git a/src/main/webapp/views/login.html b/src/main/webapp/views/login.html
index 75221ca..a29820e 100644
--- a/src/main/webapp/views/login.html
+++ b/src/main/webapp/views/login.html
@@ -53,7 +53,7 @@
z-index: 100;
top: 22px;
left: 20px;">
- <img src="../static/image/logo.png" alt="" style="width: 20%">
+ <img src="../static/image/logo.png" alt="" style="width: 10%">
</div>
<div class="p-sketch-outline">
<h2 class="p-sketch-outline__title">Automatic Storage and Retrieval System</h2>
@@ -68,7 +68,6 @@
<div class="login-contain">
<div class="login-box">
<img src="../static/image/logo.png" alt="" style="width: 80%">
- <span class="login100-form-title p-t-20 p-b-45">娴欐睙涓壃</span>
<span class="login100-form-title p-t-20 p-b-45" style="margin: 15px 0;color: #868686;font-size: 24px">WMS</span>
<div class="wrap-input100 validate-input m-b-10" data-validate="璇疯緭鍏ョ敤鎴峰悕">
<input id="username" class="input100" type="text" name="username" placeholder="username" autocomplete="off">
--
Gitblit v1.9.1