From e7e4c9460a261931a33126a42a62bac75f7bc969 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 14:39:11 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetl/locDetl.html | 3 +++
src/main/webapp/views/index.html | 6 +++---
src/main/webapp/views/mat/mat.html | 5 ++++-
src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java | 2 +-
4 files changed, 11 insertions(+), 5 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 04d1e6e..1fd5337 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/ConsoleController.java
@@ -68,7 +68,7 @@
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("time", String.valueOf(create_time).substring(5, 16));
combList.get(i).put("active", i<3?"active":"");
}
// 鎷ｈ揣鍗�
diff --git a/src/main/webapp/views/index.html b/src/main/webapp/views/index.html
index e7abffd..f9fd70c 100644
--- a/src/main/webapp/views/index.html
+++ b/src/main/webapp/views/index.html
@@ -133,9 +133,9 @@
</div>
</div>
- <div class="layui-footer">
- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�
- </div>
+<!-- <div class="layui-footer">-->
+<!-- Copyright 漏 2015 All Rights Reserved. <a href="http://www.zoneyung.com" target="_blank">娴欐睙涓壃绔嬪簱鎶�鏈湁闄愬叕鍙�</a> 淇濈暀鎵�鏈夋潈鍒�-->
+<!-- </div>-->
<!-- 杈呭姪鍏冪礌锛屼竴鑸敤浜庣Щ鍔ㄨ澶囦笅閬僵 -->
<div class="layadmin-body-shade" layadmin-event="shade"></div>
</div>
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 3c9366f..9a77282 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -33,6 +33,9 @@
padding: 30px 30px 10px 0px;
margin-left: 0px;
}
+ .layui-form.layui-border-box.layui-table-view {
+ height: 100%;
+ }
</style>
</head>
<body>
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index ac87ff6..d16e8c5 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -33,11 +33,14 @@
padding: 30px 30px 10px 0px;
margin-left: 0px;
}
+ .layui-form.layui-border-box.layui-table-view {
+ height: 100%;
+ }
</style>
</head>
<body>
-<div class="layui-fluid" style="padding-bottom: 0;">
+<div class="layui-fluid" style="padding-bottom: 0;margin-bottom: 30px">
<!-- 宸� -->
<div class="layui-row layui-col-space15">
<div class="layui-col-md3">
--
Gitblit v1.9.1