diff --git a/Application/Admin/Controller/UserActionLogController.class.php b/Application/Admin/Controller/UserActionLogController.class.php index ac8608df8..38ba3c12c 100644 --- a/Application/Admin/Controller/UserActionLogController.class.php +++ b/Application/Admin/Controller/UserActionLogController.class.php @@ -171,6 +171,12 @@ class UserActionLogController extends AdminController flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 } fclose($fp); + + $getData = $_GET; + unset($getData['xlsname']); + + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出操作日志','url'=>U('UserActionLog/index',$getData),'menu'=>'站点-日志管理-操作日志-导出操作日志']); + exit(); } @@ -206,7 +212,7 @@ class UserActionLogController extends AdminController $map['admin_account'] = ['like',"%{$_REQUEST['adminname']}%"]; } - if ($_REQUEST['op_type']) { + if ($_REQUEST['op_type']||$_REQUEST['op_type']=='0') { $map['op_type'] = $_REQUEST['op_type']; } @@ -320,6 +326,12 @@ class UserActionLogController extends AdminController flush();//必须同时使用 ob_flush() 和flush() 函数来刷新输出缓冲。 } fclose($fp); + + $getData = $_GET; + unset($getData['xlsname']); + + addOperationLog(['op_type'=>3,'key'=>getNowDate(),'op_name'=>'导出行为日志','url'=>U('UserActionLog/index',$getData),'menu'=>'站点-日志管理-操作日志-导出行为日志']); + exit(); } diff --git a/Application/Admin/View/UserActionLog/operateLog.html b/Application/Admin/View/UserActionLog/operateLog.html index cee7e0839..93395c4e1 100644 --- a/Application/Admin/View/UserActionLog/operateLog.html +++ b/Application/Admin/View/UserActionLog/operateLog.html @@ -52,14 +52,24 @@