From 543a5f40939b79113e7df0d6172fcfa834282189 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Sat, 7 Nov 2020 23:15:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/controller/Oplog.php         | 10 +++++++---
 app/admin/view/oplog/index_search.html | 19 +++++++++++++++++--
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/app/admin/controller/Oplog.php b/app/admin/controller/Oplog.php
index fa45353d8..ddc68c5f2 100644
--- a/app/admin/controller/Oplog.php
+++ b/app/admin/controller/Oplog.php
@@ -44,9 +44,13 @@ class Oplog extends Controller
     {
         $this->title = '系统日志管理';
         $this->isSupper = AdminService::instance()->isSuper();
-        $query = $this->_query($this->table);
-        $query->like('action,node,content,username,geoip');
-        $query->dateBetween('create_at')->order('id desc')->page();
+        $query = $this->_query($this->table)->order('id desc');
+        $query->like('action,node,content,username,geoip')->dateBetween('create_at');
+        if (input('output') === 'json') {
+            $this->success('获取数据成功', $query->page(true, false));
+        } else {
+            $query->page();
+        }
     }
 
     /**
diff --git a/app/admin/view/oplog/index_search.html b/app/admin/view/oplog/index_search.html
index 7a05d7607..19ef0fbb1 100644
--- a/app/admin/view/oplog/index_search.html
+++ b/app/admin/view/oplog/index_search.html
@@ -47,10 +47,25 @@
         </div>
 
         <div class="layui-form-item layui-inline">
-            <button class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+            <button type="submit" class="layui-btn layui-btn-primary"><i class="layui-icon">&#xe615;</i> 搜 索</button>
+            <button type="button" data-form-export="{:url('index')}?type={$type|default=''}" class="layui-btn layui-btn-primary">
+                <i class="layui-icon layui-icon-export"></i> 导 出
+            </button>
         </div>
     </form>
 
 </fieldset>
 
-<script>form.render()</script>
\ No newline at end of file
+
+<script>
+    window.form.render();
+    require(['excel'], function (excel) {
+        excel.bind(function (data) {
+            data.forEach(function (item, index) {
+                data[index] = [item.username, item.node, item.geoip, item.action, item.create_at];
+            });
+            data.unshift(['操作账号', '访问节点', '访问IP地址', '访问操作', '访问时间']);
+            return data;
+        }, '访问日志');
+    });
+</script>
\ No newline at end of file