From 58ef3b74f315d7f38ed017971e9da720a7ac6489 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 28 六月 2022 10:05:55 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/ApiLogController.java |    2 ++
 src/main/webapp/views/apiLog/apiLog.html                   |   13 +++++++++++--
 src/main/webapp/static/js/apiLog/apiLog.js                 |    6 +++++-
 src/main/webapp/static/css/cool.css                        |    6 +++---
 4 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/ApiLogController.java b/src/main/java/com/zy/asrs/controller/ApiLogController.java
index 1e450a3..36ed259 100644
--- a/src/main/java/com/zy/asrs/controller/ApiLogController.java
+++ b/src/main/java/com/zy/asrs/controller/ApiLogController.java
@@ -38,10 +38,12 @@
                   @RequestParam(defaultValue = "10")Integer limit,
                   @RequestParam(required = false)String orderByField,
                   @RequestParam(required = false)String orderByType,
+                  @RequestParam(required = false)String condition,
                   @RequestParam Map<String, Object> param){
         EntityWrapper<ApiLog> wrapper = new EntityWrapper<>();
         excludeTrash(param);
         convert(param, wrapper);
+        allLike(ApiLog.class, param.keySet(), wrapper, condition);
         if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} else {
             wrapper.orderBy("create_time", false);
         }
diff --git a/src/main/webapp/static/css/cool.css b/src/main/webapp/static/css/cool.css
index 51782aa..b592730 100644
--- a/src/main/webapp/static/css/cool.css
+++ b/src/main/webapp/static/css/cool.css
@@ -43,6 +43,6 @@
     color:#aaaaaa;
 }
 
-.layui-table-grid-down {
-    display: none;
-}
+/*.layui-table-grid-down {*/
+/*    display: none;*/
+/*}*/
diff --git a/src/main/webapp/static/js/apiLog/apiLog.js b/src/main/webapp/static/js/apiLog/apiLog.js
index 9e7dd31..4067be8 100644
--- a/src/main/webapp/static/js/apiLog/apiLog.js
+++ b/src/main/webapp/static/js/apiLog/apiLog.js
@@ -240,7 +240,11 @@
                 type: 'datetime',
                 value: data!==undefined?data['updateTime\\$']:null
             });
-
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
         }, 300);
     }
     layDateRender();
diff --git a/src/main/webapp/views/apiLog/apiLog.html b/src/main/webapp/views/apiLog/apiLog.html
index 9efb25c..800a016 100644
--- a/src/main/webapp/views/apiLog/apiLog.html
+++ b/src/main/webapp/views/apiLog/apiLog.html
@@ -18,9 +18,18 @@
             <div class="layui-form toolbar" id="search-box">
                 <div class="layui-form-item">
                     <div class="layui-inline">
-                        <label class="layui-form-label">鍚嶇О绌洪棿:</label>
                         <div class="layui-input-inline">
-                            <input class="layui-input" type="text" name="namespace" placeholder="璇疯緭鍏�..." autocomplete="off">
+                            <input class="layui-input" type="text" name="namespace" placeholder="鍚嶇О绌洪棿" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline" style="width: 300px">
+                        <div class="layui-input-inline">
+                            <input class="layui-input layui-laydate-range" name="create_time" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                        </div>
+                    </div>
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
                         </div>
                     </div>
                     <div class="layui-inline">&emsp;

--
Gitblit v1.9.1