From e008ce4622b40ce0917be13630c621327cb765f0 Mon Sep 17 00:00:00 2001
From: Anyon <Anyon@windows10.microdone.cn>
Date: Thu, 27 Apr 2017 11:27:13 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Log.php  |  2 +
 application/admin/view/log.index.html | 63 +++++++++++++++------------
 2 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/application/admin/controller/Log.php b/application/admin/controller/Log.php
index ee0fab644..0a01fd75b 100644
--- a/application/admin/controller/Log.php
+++ b/application/admin/controller/Log.php
@@ -38,6 +38,7 @@ class Log extends BasicAdmin {
      */
     public function index() {
         $this->title = '系统操作日志';
+        $this->assign('actions', Db::name($this->table)->group('action')->column('action'));
         $db = Db::name($this->table)->order('id desc');
         $get = $this->request->get();
         foreach (['action', 'content', 'username'] as $key) {
@@ -45,6 +46,7 @@ class Log extends BasicAdmin {
                 $db->where($key, 'like', "%{$get[$key]}%");
             }
         }
+
         parent::_list($db);
     }
 
diff --git a/application/admin/view/log.index.html b/application/admin/view/log.index.html
index 5bd138255..fd1780fd8 100644
--- a/application/admin/view/log.index.html
+++ b/application/admin/view/log.index.html
@@ -18,15 +18,22 @@
     <div class="row">
         <div class="col-xs-3">
             <div class="form-group">
-                <input type="text" name="username" value="{$Think.get.username|default=''}" placeholder="操作者"
-                       class="input-sm form-control">
+                <input type="text" name="username" value="{$Think.get.username|default=''}" placeholder="操作者" class="input-sm form-control">
             </div>
         </div>
 
         <div class="col-xs-3">
             <div class="form-group">
-                <input type="text" name="action" value="{$Think.get.action|default=''}" placeholder="行为"
-                       class="input-sm form-control">
+                <select name='action' class='input-sm form-control'>
+                    <option value=''> - 行为 - </option>
+                    <!--{foreach $actions as $action}-->
+                    <!--{if $action===$Think.get.action}-->
+                    <option selected="selected" value='{$action}'>{$action}</option>
+                    <!--{else}-->
+                    <option value='{$action}'>{$action}</option>
+                    <!--{/if}-->
+                    <!--{/foreach}-->
+                </select>
             </div>
         </div>
 
@@ -50,32 +57,32 @@
     <input type="hidden" value="resort" name="action"/>
     <table class="table table-hover">
         <thead>
-        <tr>
-            <th class='list-table-check-td'>
-                <input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
-            </th>
-            <th class='text-center'>操作者</th>
-            <th class='text-left'>节点</th>
-            <th class='text-left'>行为</th>
-            <th class='text-left'>操作内容</th>
-            <th class='text-left'>操作位置</th>
-            <th class='text-left'>操作时间</th>
-        </tr>
+            <tr>
+                <th class='list-table-check-td'>
+                    <input data-none-auto="" data-check-target='.list-check-box' type='checkbox'/>
+                </th>
+                <th class='text-center'>操作者</th>
+                <th class='text-left'>节点</th>
+                <th class='text-left'>行为</th>
+                <th class='text-left'>操作内容</th>
+                <th class='text-left'>操作位置</th>
+                <th class='text-left'>操作时间</th>
+            </tr>
         </thead>
         <tbody>
-        {foreach $list as $key=>$vo}
-        <tr>
-            <td class='list-table-check-td'>
-                <input class="list-check-box" value='{$vo.id}' type='checkbox'/>
-            </td>
-            <td class='text-center'>{$vo.username}</td>
-            <td class='text-left'>{$vo.node}</td>
-            <td class='text-left'>{$vo.action}</td>
-            <td class='text-left'>{$vo.content}</td>
-            <td class='text-left'>{$vo.isp|default=$vo.ip}</td>
-            <td class='text-left'>{$vo.create_at}</td>
-        </tr>
-        {/foreach}
+            {foreach $list as $key=>$vo}
+            <tr>
+                <td class='list-table-check-td'>
+                    <input class="list-check-box" value='{$vo.id}' type='checkbox'/>
+                </td>
+                <td class='text-center'>{$vo.username}</td>
+                <td class='text-left'>{$vo.node}</td>
+                <td class='text-left'>{$vo.action}</td>
+                <td class='text-left'>{$vo.content}</td>
+                <td class='text-left'>{$vo.isp|default=$vo.ip}</td>
+                <td class='text-left'>{$vo.create_at}</td>
+            </tr>
+            {/foreach}
         </tbody>
     </table>
     {if isset($page)}<p>{$page}</p>{/if}