From 0943735bf8b714b4168e0825393ce3fead3c4637 Mon Sep 17 00:00:00 2001 From: Jason Date: Sun, 8 May 2022 17:00:49 +0800 Subject: [PATCH] update2022 --- app/Admin/Actions/DestroyData.php | 11 ++++++----- app/Admin/Controllers/ItemController.php | 7 ++++++- app/Admin/Controllers/UserController.php | 14 ++++++++++---- app/Api/Controllers/IndexController.php | 4 ++-- app/Http/Kernel.php | 2 +- storage/.DS_Store | Bin 0 -> 6148 bytes 6 files changed, 25 insertions(+), 13 deletions(-) create mode 100644 storage/.DS_Store diff --git a/app/Admin/Actions/DestroyData.php b/app/Admin/Actions/DestroyData.php index 8c673ab..5996a98 100644 --- a/app/Admin/Actions/DestroyData.php +++ b/app/Admin/Actions/DestroyData.php @@ -9,6 +9,7 @@ use Illuminate\Database\Eloquent\Model; use PhpOffice\PhpWord\Exception\CopyFileException; use PhpOffice\PhpWord\Exception\CreateTemporaryFileException; use PhpOffice\PhpWord\TemplateProcessor; +use RuntimeException; class DestroyData extends RowAction { @@ -24,7 +25,7 @@ class DestroyData extends RowAction { try { if ($model->archives) { - // return $this->response()->error('数据销毁失败')->refresh(); +// return $this->response()->error('数据销毁失败')->refresh(); } // 先做存档 $archives = []; @@ -47,10 +48,10 @@ class DestroyData extends RowAction $download = $this->exportEqual($model); } - // $model->logs()->delete(); + $model->logs()->delete(); return $this->response()->success('数据销毁完成')->refresh()->download($download); - } catch (\RuntimeException $exception) { + } catch (RuntimeException $exception) { return $this->response()->error('数据销毁失败'.$exception->getMessage())->refresh(); } } @@ -69,8 +70,8 @@ class DestroyData extends RowAction { $templateProcessor = new TemplateProcessor(storage_path('app/public/DENG_FEN.docx')); - $templateProcessor->setValue('TOTAL1', $vote->logs()->distinct('user_id')->count()); - $templateProcessor->setValue('TITLE', $vote->title); + $templateProcessor->setValue('TOTAL', $vote->logs()->distinct('user_id')->count()); + $templateProcessor->setValue('TITLE', strip_tags($vote->title)); $i = 0; $tpl = ''; diff --git a/app/Admin/Controllers/ItemController.php b/app/Admin/Controllers/ItemController.php index 7d55bd4..1948d1d 100644 --- a/app/Admin/Controllers/ItemController.php +++ b/app/Admin/Controllers/ItemController.php @@ -23,7 +23,12 @@ class ItemController extends Controller protected function grid($vote) { $grid = new Grid(new Item); - $grid->model()->where('vote_id', $vote->id); + $grid->filter(function (Grid\Filter $v) { + $v->column(1 / 2, function (Grid\Filter $f) { + $f->like('name', '姓名'); + }); + }); + $grid->model()->where('vote_id', $vote->id)->orderBy('sort'); $grid->column('cover')->image('', 80); $grid->column('id', '#ID#'); $grid->column('name'); diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index 0dfbca3..fde7f5c 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -21,8 +21,14 @@ class UserController extends AdminController $tools->append(new UserImport); $tools->append(new CleanData); }); - // $grid->disableCreateButton(); -// $grid->disableActions(); + $grid->filter(function (Grid\Filter $v) { + $v->column(1 / 2, function (Grid\Filter $f) { + $f->like('name', '姓名'); + }); + $v->column(1 / 2, function (Grid\Filter $f) { + $f->equal('mobile', '手机号'); + }); + }); $grid->column('归属干事')->display(function () { return $this->parent->name ?? ''; }); @@ -45,8 +51,8 @@ class UserController extends AdminController $form->text('name', '姓名'); $form->text('mobile', '手机号'); - $form->select('parent_id','归属干事')->options( - User::where('type', 1)->pluck('name', 'id') + $form->select('parent_id', '归属干事')->options( + User::where('type', 1)->pluck('name', 'id') )->default(0); $form->select('type')->options([ 0 => '投票人', diff --git a/app/Api/Controllers/IndexController.php b/app/Api/Controllers/IndexController.php index 10974b1..7c4114c 100644 --- a/app/Api/Controllers/IndexController.php +++ b/app/Api/Controllers/IndexController.php @@ -53,9 +53,9 @@ class IndexController extends Controller function agent() { if (Api::user()->type == 1) { - $users = User::where('parent_id', Api::id())->select(['id', 'mobile', 'name', 'sign'])->get(); + $users = User::where('parent_id', Api::id())->select(['id', 'mobile', 'name', 'sign'])->orderBy('sign')->get(); } else { - $users = User::where('type', 0)->select(['id', 'mobile', 'name', 'sign'])->get(); + $users = User::where('type', 0)->select(['id', 'mobile', 'name', 'sign'])->orderBy('sign')->get(); } $vote = Vote::where('status', 1)->first(); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index c3640f3..7af3ffa 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -39,7 +39,7 @@ class Kernel extends HttpKernel ], 'api' => [ - 'throttle:60,1', + 'throttle:600,1', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], ]; diff --git a/storage/.DS_Store b/storage/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..c33c7ba96c5681c37c9a613ebbf3d32c193b60e4 GIT binary patch literal 6148 zcmeHK-AcnS6i&A3GKSC#gssFgL`QTcPH(w9Iy~vi&o`*Jq5k5K%zKw*;cJ=vpidLIi}HQb1G6?GuBW za_~!==UOZcnsUbV%rK6fxq7^CJv;cNPG{UTNIfw?46HNIG^T^+{{{RqwU7Mu60(Q^ zV&I=Kz*}Q~?7^b!+4^I7c-Bg2571CBuS5j|^tDR>7`Tu0bkM{l>X7GJEDho)=-1_d ObP>>mP)7{>0s~*JNJ(@6 literal 0 HcmV?d00001