From dd478e264f673604dd352dc961a597dd2f15a8d0 Mon Sep 17 00:00:00 2001
From: zhengyongxing <as123498@qq.com>
Date: Tue, 25 Feb 2020 18:30:11 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E6=97=A5=E5=BF=97=E6=8C=89?=
 =?UTF-8?q?=E7=85=A7=E5=8E=9F=E5=9E=8B=E4=BF=AE=E6=94=B9=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../UserActionLogController.class.php         | 32 ++++++++++++++-----
 .../Admin/View/UserActionLog/index.html       | 14 ++++++--
 .../Admin/View/UserActionLog/operateLog.html  | 13 ++++++--
 3 files changed, 46 insertions(+), 13 deletions(-)

diff --git a/Application/Admin/Controller/UserActionLogController.class.php b/Application/Admin/Controller/UserActionLogController.class.php
index 44af5127a..f13a1cb1b 100644
--- a/Application/Admin/Controller/UserActionLogController.class.php
+++ b/Application/Admin/Controller/UserActionLogController.class.php
@@ -47,8 +47,12 @@ class UserActionLogController extends AdminController
            $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])];
        }
 
-       if ($_REQUEST['action']) {
-           $map['action'] = ['like',"%{$_REQUEST['action']}%"];
+       if ($_REQUEST['username']) {
+           $map['account'] = ['like',"%{$_REQUEST['username']}%"];
+       }
+
+       if ($_REQUEST['game_name']) {
+           $map['game_name'] = ['like',"%{$_REQUEST['game_name']}%"];
        }
 
        $data = M('user_action_log','tab_')->where($map)->page($page,$row)->order('create_time DESC')->select();
@@ -107,8 +111,12 @@ class UserActionLogController extends AdminController
             $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])];
         }
 
-        if ($_REQUEST['action']) {
-            $map['action'] = ['like',"%{$_REQUEST['action']}%"];
+        if ($_REQUEST['username']) {
+            $map['account'] = ['like',"%{$_REQUEST['username']}%"];
+        }
+
+        if ($_REQUEST['game_name']) {
+            $map['game_name'] = ['like',"%{$_REQUEST['game_name']}%"];
         }
 
         $csvFileName = $xlsName.'.csv';
@@ -182,8 +190,12 @@ class UserActionLogController extends AdminController
             $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])];
         }
 
-        if ($_REQUEST['action']) {
-            $map['op_name'] = ['like',"%{$_REQUEST['action']}%"];
+        if ($_REQUEST['adminname']) {
+            $map['admin_account'] = ['like',"%{$_REQUEST['adminname']}%"];
+        }
+
+        if ($_REQUEST['op_type']) {
+            $map['op_type'] = $_REQUEST['op_type'];
         }
 
         $data = M('operation_log','tab_')
@@ -246,8 +258,12 @@ class UserActionLogController extends AdminController
             $map['create_time'] = ['elt',strtotime($_REQUEST['time_end'])];
         }
 
-        if ($_REQUEST['action']) {
-            $map['op_name'] = ['like',"%{$_REQUEST['action']}%"];
+        if ($_REQUEST['adminname']) {
+            $map['admin_account'] = ['like',"%{$_REQUEST['adminname']}%"];
+        }
+
+        if ($_REQUEST['op_type']) {
+            $map['op_type'] = $_REQUEST['op_type'];
         }
 
         $csvFileName = $xlsName.'.csv';
diff --git a/Application/Admin/View/UserActionLog/index.html b/Application/Admin/View/UserActionLog/index.html
index 0e10071ed..e7470e045 100644
--- a/Application/Admin/View/UserActionLog/index.html
+++ b/Application/Admin/View/UserActionLog/index.html
@@ -38,7 +38,7 @@
   <div class="cf top_nav_list">
 
     <!-- 高级搜索 -->
-    <div class="jssearch fl cf search_list" style="margin: 0 30%">
+    <div class="jssearch fl cf search_list" >
       <!--游戏类型搜索END-->
       <div class="input-list">
         <input type="text" id="time-start" name="time_start" class="" value="{:I('time_end')}" placeholder="操作开始时间" autocomplete="off"/>
@@ -49,10 +49,18 @@
         </div>
       </div>
 
-      <div class="input-list">
-        <input type="text"  name="action" placeholder="关键字" class="" value="{:I('action')}" style="width: 180px"/>&nbsp;
+      <div class="input-list input-list-game search_label_rehab">
+        <select id="game_name" name="game_name" class="select_gallery" >
+          <option value="">游戏名称</option>
+          <volist name=":getAllGame()" id="vo">
+            <option value="{$vo.game_name}" <if condition="$vo.game_name eq I('game_name')">selected</if> >{$vo.game_name}</option>
+          </volist>
+        </select>
       </div>
 
+      <div class="input-list">
+        <input type="text"  name="username" placeholder="玩家" class="" value="{:I('username')}" style="width: 180px"/>&nbsp;
+      </div>
 
       <div class="input-list">
         <a class="sch-btn" href="javascript:;" id="search" url="{:U('UserActionLog/index','model='.$model['name'].'&row='.I('row'),false)}" style="">搜索</a>
diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html
index e3b192799..3cf5cd8ba 100644
--- a/Application/Admin/View/UserActionLog/operateLog.html
+++ b/Application/Admin/View/UserActionLog/operateLog.html
@@ -38,7 +38,7 @@
   <div class="cf top_nav_list">
 
     <!-- 高级搜索 -->
-    <div class="jssearch fl cf search_list" style="margin: 0 30%">
+    <div class="jssearch fl cf search_list">
       <!--游戏类型搜索END-->
       <div class="input-list">
         <input type="text" id="time-start" name="time_start" class="" value="{:I('time_end')}" placeholder="操作开始时间" autocomplete="off"/>
@@ -49,8 +49,17 @@
         </div>
       </div>
 
+      <div class="input-list input-list-game search_label_rehab">
+        <select id="op_type" name="op_type" class="select_gallery" >
+          <option value="">请选择类型</option>
+            <option value="1" <if condition="$vo.op_type eq 1">selected</if> >编辑</option>
+          <option value="2" <if condition="$vo.op_type eq 2">selected</if> >删除</option>
+          <option value="3" <if condition="$vo.op_type eq 3">selected</if> >下载</option>
+        </select>
+      </div>
+
       <div class="input-list">
-        <input type="text"  name="action" placeholder="关键字" class="" value="{:I('action')}" style="width: 180px"/>&nbsp;
+        <input type="text"  name="adminname" placeholder="操作人" class="" value="{:I('adminname')}" style="width: 180px"/>&nbsp;
       </div>