Skip to content

D
data-collect
Commit 9f1562e5 by 汪伟伟
Options

222

parent 3718fa32
Showing with 774 additions and 53 deletions
app/Admin/Controllers/TaskController.php
...@@ -2,22 +2,106 @@ ...@@ -2,22 +2,106 @@
namespace App\Admin\Controllers; namespace App\Admin\Controllers;
use App\Admin\Extensions\Tools\BatchReceiveAction;
use App\Admin\Extensions\Tools\ReceiveAction; use App\Admin\Extensions\Tools\ReceiveAction;
use App\Admin\Extensions\Tools\ShowArtwork;
use App\Admin\Repositories\Task; use App\Admin\Repositories\Task;
use App\Models\TasksReceive;
use Dcat\Admin\Admin;
use Dcat\Admin\Form; use Dcat\Admin\Form;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Http\JsonResponse; use Dcat\Admin\Layout\Content;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Tab;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use SuperEggs\DcatDistpicker\DcatDistpickerHelper;
class TaskController extends AdminController class TaskController extends AdminController
{ {
/** /**
* 领取任务页
*
* @param Content $content
* @return Content
*/
public function receiveIndex(Content $content)
{
return $content
->translation($this->translation())
->title($this->title())
->description($this->description()['index'] ?? trans('admin.list'))
->body($this->getData());
}
protected function getData()
{
return Grid::make(new Task(), function (Grid $grid) {
$user = Admin::user();
// dd(Admin::user()->is_admin);
// dd(trans('admin.view'));//查看
$grid->column('id')->sortable();
$grid->column('name');
$grid->column('level');
$grid->column('city_id')->distpicker();
$grid->column('year');
$grid->column('refer');
// $grid->column('guide');
// $grid->column('status');
// $grid->column('created_at');
// $grid->column('updated_at')->sortable();
$grid->filter(function (Grid\Filter $filter) {
// $filter->equal('id');
$filter->like('name');
});
$grid->actions(function (Grid\Displayers\Actions $actions)use ($user){
if ($user->is_admin == 0){
if ($this->num > 0 && !TasksReceive::query()->where('task_id',$this->id)->where('user_id',$user->id)->exists()){
$actions->append( new ReceiveAction());//领取按钮
}
}
});
$grid->disableEditButton()->disableDeleteButton()->disableCreateButton();
$grid->tools(function (Grid\Tools $tools) use ($user){
if ($user->is_admin == 0) {
$tools->append(new BatchReceiveAction());//新增批量领取按钮
}
});
});
}
/**
* 查看领取任务的详情
* @param $id
* @return Show
*/
protected function receiveDetail($id)
{
return Show::make($id, new Task(), function (Show $show)use ($id) {
$show->field('id');
$show->field('name');
$show->field('level');
$show->city_id()->unserialize();
$show->field('year');
$show->field('refer');
$show->guide()->unescape();//不 转义html内容
// $show->field('status');
// $show->field('created_at');
// $show->field('updated_at');
$show->disableEditButton()->disableDeleteButton();
});
}
/**
* Make a grid builder. * Make a grid builder.
* *
* @return Grid * @return Grid
...@@ -81,6 +165,8 @@ class TaskController extends AdminController ...@@ -81,6 +165,8 @@ class TaskController extends AdminController
}); });
} }
/** /**
* Make a form builder. * Make a form builder.
* *
...@@ -114,7 +200,7 @@ class TaskController extends AdminController ...@@ -114,7 +200,7 @@ class TaskController extends AdminController
} }
return $years; return $years;
})->value(2024)->required(); })->value(2024)->required();
$form->text('refer', '参考信源')->required(); $form->url('refer', '参考信源')->required();
$form->editor('guide', '收集指南')->required(); $form->editor('guide', '收集指南')->required();
// $form->text('status'); // $form->text('status');
......
app/Admin/Controllers/TaskReceiveController.php
...@@ -2,14 +2,17 @@ ...@@ -2,14 +2,17 @@
namespace App\Admin\Controllers; namespace App\Admin\Controllers;
use App\Admin\Extensions\Tools\BatchReceiveAction; use App\Admin\Extensions\Tools\BackAction;
use App\Admin\Extensions\Tools\ReceiveAction; use App\Admin\Repositories\TasksReceive;
use App\Admin\Repositories\Task; use App\Models\TasksApprove;
use Dcat\Admin\Actions\Action;
use Dcat\Admin\Admin;
use Dcat\Admin\Form;
use Dcat\Admin\Grid; use Dcat\Admin\Grid;
use Dcat\Admin\Repositories\EloquentRepository;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController; use Dcat\Admin\Http\Controllers\AdminController;
use Dcat\Admin\Widgets\Tab; use Dcat\Admin\Widgets\Tab;
use Illuminate\Support\Facades\Auth;
class TaskReceiveController extends AdminController class TaskReceiveController extends AdminController
{ {
...@@ -21,49 +24,60 @@ class TaskReceiveController extends AdminController ...@@ -21,49 +24,60 @@ class TaskReceiveController extends AdminController
$tab = Tab::make(); $tab = Tab::make();
// $tab->add('选项卡1', view('...')); // $tab->add('选项卡1', view('...'));
$tab->add('全部任务', $this->getData1()); $tab->add('全部任务', $this->getData(-1));
$tab->add('已经领取任务', 'html2'); $tab->add('待完成任务', $this->getData(0));
$tab->add('已经完成任务', 'html3'); $tab->add('已完成任务', $this->getData(1));
return $tab; return $tab;
} }
protected function getData1() protected function getData($status)
{ {
return Grid::make(new Task(), function (Grid $grid) { return Grid::make(TasksReceive::with(['task','collects']), function (Grid $grid) use ($status) {
$isAdmin = Auth::guard('admin')->user()->is_admin; $user = Admin::user();
$user->is_admin == 0 && $grid->model()->where('user_id', $user->id);
// dd(Auth::guard('admin')->id()); $status != -1 && $grid->model()->where('status', $status);
// dd(trans('admin.view'));//查看 // dd(trans('admin.view'));//查看
$grid->column('id')->sortable(); $grid->column('id')->sortable();
$grid->column('name'); $grid->column('task.name', '指标名称');
$grid->column('level'); $grid->column('task.city_id', '地区')->distpicker();
$grid->column('city_id')->distpicker(); $grid->column('task.year', '时间');
$grid->column('year'); $grid->column('task.refer', '参考信源');
$grid->column('refer'); $grid->column('task.level', '等级');
// $grid->column('guide');
// $grid->column('status'); if ($status == 1) {
// $grid->column('created_at'); $grid->column('task.price', '单价');
// $grid->column('updated_at')->sortable();
$grid->column('collects.value', '指标值');
$grid->column('collects.reality_refer', '实际信源');
// $grid->column('collects.net_img', '网页截图');
}
if ($status == -1){
$grid->column('status', '状态');
}
$grid->actions(function (Grid\Displayers\Actions $actions) use ($user) {
if ($user->is_admin == 0) {
if ($this->status <= 1) {
$actions->append(new BackAction());//退回按钮
}
}
});
$grid->filter(function (Grid\Filter $filter) { $grid->filter(function (Grid\Filter $filter) {
// $filter->equal('id'); // $filter->equal('id');
$filter->like('name'); $filter->like('task.name', '指标名称');
}); });
$grid->actions(function (Grid\Displayers\Actions $actions)use ($isAdmin){ if ($user->is_admin == 1) {
if ($isAdmin == 0){ $grid->disableEditButton();
$actions->append( new ReceiveAction());//领取按钮
} }
}); $grid->disableDeleteButton()->disableCreateButton();
$grid->disableEditButton()->disableDeleteButton()->disableCreateButton();
$grid->tools(function (Grid\Tools $tools) {
$tools->append( new BatchReceiveAction());//新增批量领取按钮
});
}); });
} }
...@@ -77,17 +91,25 @@ class TaskReceiveController extends AdminController ...@@ -77,17 +91,25 @@ class TaskReceiveController extends AdminController
*/ */
protected function detail($id) protected function detail($id)
{ {
return Show::make($id, new Task(), function (Show $show)use ($id) { return Show::make($id, TasksReceive::with(['task', 'collects']), function (Show $show) use ($id) {
$show->field('id'); $show->field('id');
$show->field('name'); $show->field('task.name', '指标名称');
$show->field('level'); $show->field('task.city_id', '地区');
$show->city_id()->unserialize(); $show->field('task.year', '时间');
$show->field('task.refer', '参考信源');
$show->field('task.level', '等级');
// $show->field('task.guide','参考指南')->unescape();//不 转义html内容
$show->field('task.price', '单价');
if ($show->model()->status > 0) {
$show->field('collects.value', '指标值');
$show->field('collects.reality_refer', '实际信源');
$show->field('collects.refer_level', '信源等级');
$show->field('collects.net_img', '网页截图')->unescape();
$show->field('collects.remark', '备注信息');
}
$show->field('year');
$show->field('refer');
$show->guide()->unescape();//不 转义html内容
// $show->field('status');
// $show->field('created_at'); // $show->field('created_at');
// $show->field('updated_at'); // $show->field('updated_at');
...@@ -95,5 +117,58 @@ class TaskReceiveController extends AdminController ...@@ -95,5 +117,58 @@ class TaskReceiveController extends AdminController
}); });
} }
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
return Form::make(TasksReceive::with(['task', 'collects']), function (Form $form) {
$form->display('id');
$form->display('task.name');
$form->display('task.city_id');
$form->display('task.year');
$form->display('task.refer');
$form->text('collects.value', '指标值')->required();
$form->url('collects.reality_refer', '实际信源')->required();
$form->select('collects.refer_level', '信源等级')->options([1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5])->required();
$form->editor('collects.net_img', '网页截图')->required();
$form->text('collects.remark', '备注信息');
// $form->display('created_at');
// $form->display('updated_at');
// // 在表单提交前调用
// $form->submitted(function (Form $form) {
// //...
// });
// //保存前回调
// $form->saving(function (Form $form) {
// dump($form->year);
//
// });
//保存后回调
$form->saved(function (Form $form) {
if ($this->status == 0) {
\App\Models\TasksReceive::query()->where('id', $this->id)->update(['status' => 1]);//状态更新成已完成
TasksApprove::query()->updateOrCreate([//审核表里新增一条记录
'task_id'=>$this->task_id,
'user_id'=>$this->user_id,
'receive_id'=>$this->id,
],[
'task_id'=>$this->task_id,
'user_id'=>$this->user_id,
'receive_id'=>$this->id,
]);
}
});
$form->disableDeleteButton();
});
}
} }
app/Admin/Controllers/TasksApproveController.php 0 → 100644
<?php
namespace App\Admin\Controllers;
use App\Admin\Extensions\Tools\NotPassAction;
use App\Admin\Extensions\Tools\PassAction;
use App\Admin\Repositories\Task;
use App\Admin\Repositories\TasksApprove;
use App\Models\TasksReceive;
use Dcat\Admin\Actions\Action;
use Dcat\Admin\Form;
use Dcat\Admin\Grid;
use Dcat\Admin\Repositories\EloquentRepository;
use Dcat\Admin\Show;
use Dcat\Admin\Http\Controllers\AdminController;
use Illuminate\Support\Facades\DB;
class TasksApproveController extends AdminController
{
/**
* Make a grid builder.
*
* @return Grid
*/
protected function grid()
{
// $taskIds = TasksReceive::query()->where('status',1)->pluck('task_id');
// $model = \App\Models\Task::query()->with(['approves'])->whereIn('id',$taskIds);
// dd($taskIds);
return Grid::make(TasksApprove::with(['task', 'collects']), function (Grid $grid) {
$grid->model()->orderBy('task_id', 'desc');
// $grid->column('id')->sortable();
$grid->column('task.name', '指标名称');
$grid->column('task.city_id', '地区');
$grid->column('task.year', '时间');
$grid->column('task.refer', '参考信源');
$grid->column('task.price', '单价');
$grid->column('collects.value', '指标值');
$grid->column('collects.reality_refer', '实际信源');
$grid->column('collects.refer_level', '信源等级');
$grid->column('collects.net_img', '截图链接');
$grid->disableEditButton()->disableDeleteButton()->disableCreateButton()->disableFilterButton()->disableViewButton();
$grid->filter(function (Grid\Filter $filter) {
$filter->equal('id');
});
$grid->actions(function (Grid\Displayers\Actions $actions) {
$actions->append(new PassAction());//通过按钮
$actions->append(new NotPassAction());//不通过按钮
});
});
}
/**
* Make a show builder.
*
* @param mixed $id
*
* @return Show
*/
protected function detail($id)
{
return Show::make($id, new TasksApprove(), function (Show $show) {
$show->field('id');
$show->field('task_id');
$show->field('user_id');
$show->field('receive_id');
$show->field('status');
$show->field('msg');
$show->field('created_at');
$show->field('updated_at');
});
}
/**
* Make a form builder.
*
* @return Form
*/
protected function form()
{
return Form::make(new TasksApprove(), function (Form $form) {
$form->display('id');
$form->text('task_id');
$form->text('user_id');
$form->text('receive_id');
$form->text('status');
$form->text('msg');
$form->display('created_at');
$form->display('updated_at');
});
}
}
app/Admin/Extensions/Tools/BackAction.php 0 → 100644
<?php
namespace App\Admin\Extensions\Tools;
use App\Models\Task;
use App\Models\TasksReceive;
use Dcat\Admin\Admin;
use Dcat\Admin\Grid\RowAction;
use Illuminate\Http\Request;
class BackAction extends RowAction
{
/**
* 返回字段标题
*
*
* * @return string
*/
public function title()
{
return '退回';
}
/**
* 添加JS
*
*
* * @return string
*/
/**
* 处理请求，如果不需要接口处理，请直接删除这个方法
*
* @param Request $request
*
* @return \Dcat\Admin\Actions\Response
*/
public function handle(Request $request)
{
// 获取主键
$id = $this->getKey();
// $user = Admin::user();
$receive = TasksReceive::query()->find($id);
$task = Task::query()->find($receive->task_id);
$receive->collects()->delete();
$receive->approve()->delete();
$receive->delete();
$task->num += 1;
$task->save();
// dd($id,$user->id);
return $this->response()->success('退回成功')
->redirect('receives');
}
public function html()
{
// $this->setHtmlAttribute(['data-excel' => $this->row->excel_url, 'class' => 'download-btn fa fa-download']);
return parent::html();
}
}
app/Admin/Extensions/Tools/NotPassAction.php 0 → 100644
<?php
namespace App\Admin\Extensions\Tools;
use App\Models\Task;
use App\Models\TasksCollect;
use App\Models\TasksReceive;
use Dcat\Admin\Admin;
use Dcat\Admin\Grid\RowAction;
use Illuminate\Http\Request;
class NotPassAction extends RowAction
{
/**
* 返回字段标题
*
*
* * @return string
*/
public function title()
{
return '不通过';
}
/**
* 添加JS
*
*
* * @return string
*/
/**
* 处理请求，如果不需要接口处理，请直接删除这个方法
*
* @param Request $request
*
* @return \Dcat\Admin\Actions\Response
*/
public function handle(Request $request)
{
// 获取主键
$id = $this->getKey();
$user = Admin::user();
// dd($id,$user->id);
return $this->response()->success('领取成功')
->redirect('receive');
}
public function html()
{
// $this->setHtmlAttribute(['data-excel' => $this->row->excel_url, 'class' => 'download-btn fa fa-download']);
return parent::html();
}
}
app/Admin/Extensions/Tools/PassAction.php 0 → 100644
<?php
namespace App\Admin\Extensions\Tools;
use App\Models\Task;
use App\Models\TasksCollect;
use App\Models\TasksReceive;
use Dcat\Admin\Admin;
use Dcat\Admin\Grid\RowAction;
use Illuminate\Http\Request;
class PassAction extends RowAction
{
/**
* 返回字段标题
*
*
* * @return string
*/
public function title()
{
return "通过<br><br>";
}
/**
* 添加JS
*
*
* * @return string
*/
/**
* 处理请求，如果不需要接口处理，请直接删除这个方法
*
* @param Request $request
*
* @return \Dcat\Admin\Actions\Response
*/
public function handle(Request $request)
{
// 获取主键
$id = $this->getKey();
$user = Admin::user();
// dd($id,$user->id);
return $this->response()->success('领取成功')
->redirect('receive');
}
public function html()
{
// $this->setHtmlAttribute(['data-excel' => $this->row->excel_url, 'class' => 'download-btn fa fa-download']);
return parent::html();
}
}
app/Admin/Extensions/Tools/ReceiveAction.php
...@@ -3,6 +3,10 @@ ...@@ -3,6 +3,10 @@
namespace App\Admin\Extensions\Tools; namespace App\Admin\Extensions\Tools;
use App\Models\Task;
use App\Models\TasksCollect;
use App\Models\TasksReceive;
use Dcat\Admin\Admin;
use Dcat\Admin\Grid\RowAction; use Dcat\Admin\Grid\RowAction;
use Illuminate\Http\Request; use Illuminate\Http\Request;
...@@ -43,13 +47,34 @@ class ReceiveAction extends RowAction ...@@ -43,13 +47,34 @@ class ReceiveAction extends RowAction
public function handle(Request $request) public function handle(Request $request)
{ {
// 获取主键 // 获取主键
$key = $this->getKey(); $id = $this->getKey();
$user = Admin::user();
$exists= TasksReceive::query()->where('task_id',$id)->where('user_id',$user->id)->exists();
$task = Task::query()->find($id);
if (!$exists && $task->num > 0){
$receive = TasksReceive::query()->create([
'task_id'=>$id,
'user_id'=>$user->id,
]);
$task->num -= 1;
$task->save();
TasksCollect::query()->updateOrCreate([//默认新增一条收集数据的记录
'task_id'=>$id,
'user_id'=>$user->id,
'receive_id'=>$receive->id,
],[
'task_id'=>$id,
'user_id'=>$user->id,
'receive_id'=>$receive->id,
]);
}
dd($key); // dd($id,$user->id);
return $this->response() return $this->response()->success('领取成功')
->success('Processed successfully.') ->redirect('receive');
->redirect('/');
} }
public function html() public function html()
......
app/Admin/Repositories/Task.php
...@@ -13,4 +13,7 @@ class Task extends EloquentRepository ...@@ -13,4 +13,7 @@ class Task extends EloquentRepository
* @var string * @var string
*/ */
protected $eloquentClass = Model::class; protected $eloquentClass = Model::class;
} }
app/Admin/Repositories/TasksApprove.php 0 → 100644
<?php
namespace App\Admin\Repositories;
use App\Models\TasksApprove as Model;
use Dcat\Admin\Repositories\EloquentRepository;
class TasksApprove extends EloquentRepository
{
/**
* Model.
*
* @var string
*/
protected $eloquentClass = Model::class;
}
app/Admin/routes.php
...@@ -14,9 +14,10 @@ Route::group([ ...@@ -14,9 +14,10 @@ Route::group([
$router->get('/dashboard', 'HomeController@index'); $router->get('/dashboard', 'HomeController@index');
$router->resource('tasks', 'TaskController'); $router->resource('tasks', 'TaskController');
$router->get('receive', 'TaskController@receiveIndex');
$router->get('receive/{id}', 'TaskController@receiveDetail');
$router->resource('receives', 'TaskReceiveController'); $router->resource('receives', 'TaskReceiveController');
$router->get('receives/index', 'TaskReceiveController@index'); $router->resource('approves', 'TasksApproveController');
// $router->get('/api/city', 'TaskController@city');
}); });
app/Models/Task.php
...@@ -12,6 +12,7 @@ class Task extends Model ...@@ -12,6 +12,7 @@ class Task extends Model
{ {
use HasDateTimeFormatter, HasFactory, Notifiable; use HasDateTimeFormatter, HasFactory, Notifiable;
const CAN_RECEIVE_NUM = 2;//任务可以被领取的次数
protected $table = 'tasks'; protected $table = 'tasks';
...@@ -30,6 +31,7 @@ class Task extends Model ...@@ -30,6 +31,7 @@ class Task extends Model
'guide', 'guide',
'price', 'price',
'status', 'status',
'num',
'created_at', 'created_at',
'updated_at', 'updated_at',
]; ];
...@@ -53,4 +55,13 @@ class Task extends Model ...@@ -53,4 +55,13 @@ class Task extends Model
$this->attributes['year'] = implode(',', $value); $this->attributes['year'] = implode(',', $value);
} }
public function approves()
{
return $this->hasMany(TasksApprove::class,'task_id');
}
public function receives()
{
return $this->hasMany(TasksReceive::class,'task_id');
}
} }
app/Models/TasksApprove.php 0 → 100644
<?php
namespace App\Models;
use Dcat\Admin\Traits\HasDateTimeFormatter;
use Illuminate\Database\Eloquent\Model;
class TasksApprove extends Model
{
use HasDateTimeFormatter;
protected $table = 'tasks_approves';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'id',
'task_id',
'user_id',
'receive_id',
'status',
'msg',
'created_at',
'updated_at',
];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [];
public function task()
{
return $this->belongsTo(Task::class);
}
public function collects()
{
return $this->hasOne(TasksCollect::class,'receive_id','receive_id');
}
}
app/Models/TasksCollect.php 0 → 100644
<?php
namespace App\Models;
use Dcat\Admin\Traits\HasDateTimeFormatter;
use Illuminate\Database\Eloquent\Model;
class TasksCollect extends Model
{
use HasDateTimeFormatter;
protected $table = 'tasks_collects';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'task_id',
'user_id',
'receive_id',
'value',
'reality_refer',
'refer_level',
'net_img',
'remark',
'created_at',
'updated_at',
];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [];
}
app/Models/TasksReceive.php
...@@ -12,4 +12,40 @@ class TasksReceive extends Model ...@@ -12,4 +12,40 @@ class TasksReceive extends Model
protected $table = 'tasks_receives'; protected $table = 'tasks_receives';
/**
* The attributes that are mass assignable.
*
* @var array
*/
protected $fillable = [
'task_id',
'user_id',
'status',
'created_at',
'updated_at',
];
/**
* The attributes that should be cast to native types.
*
* @var array
*/
protected $casts = [];
public function task()
{
return $this->belongsTo(Task::class);
}
public function collects()
{
return $this->hasOne(TasksCollect::class,'receive_id','id');
}
public function approve()
{
return $this->hasOne(TasksApprove::class,'receive_id','id');
}
} }
config/admin.php
...@@ -22,7 +22,7 @@ return [ ...@@ -22,7 +22,7 @@ return [
| `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'. | `img` tag, eg '<img src="http://logo-url" alt="Admin logo">'.
| |
*/ */
'logo' => '<img src="/vendor/dcat-admin/images/logo.png" width="35"> &nbsp;Dcat Admin', 'logo' => '<img src="/vendor/dcat-admin/images/logo.png" width="35"> &nbsp;数据收集系统',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
......
database/migrations/2024_01_10_094542_create_tasks_table.php → database/migrations/2024_01_11_104249_create_tasks_table.php
...@@ -23,7 +23,8 @@ class CreateTasksTable extends Migration ...@@ -23,7 +23,8 @@ class CreateTasksTable extends Migration
$table->string('refer')->nullable()->comment('参考信源'); $table->string('refer')->nullable()->comment('参考信源');
$table->longText('guide')->nullable()->comment('收集指南'); $table->longText('guide')->nullable()->comment('收集指南');
$table->decimal('price')->default('0.00')->comment('单价'); $table->decimal('price')->default('0.00')->comment('单价');
$table->tinyInteger('status')->default('0')->nullable()->comment('任务状态'); $table->tinyInteger('status')->default('0')->comment('任务状态');
$table->unsignedInteger('num')->default('2')->comment('可以被领取次数');
$table->timestamps(); $table->timestamps();
}); });
} }
......
database/migrations/2024_01_11_165609_create_tasks_approves_table.php 0 → 100644
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class CreateTasksApprovesTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::create('tasks_approves', function (Blueprint $table) {
$table->bigIncrements('id');
$table->bigInteger('task_id')->comment('系统任务id');
$table->bigInteger('user_id')->default('1')->comment('用户id');
$table->bigInteger('receive_id')->comment('用户领取的任务id');
$table->tinyInteger('status')->default('0')->comment('审核通 0：未通过，1：通过');
$table->string('msg')->nullable()->comment('未通过原因');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::dropIfExists('tasks_approves');
}
}
dcat_admin_ide_helper.php
...@@ -35,6 +35,7 @@ namespace Dcat\Admin { ...@@ -35,6 +35,7 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection user_id * @property Grid\Column|Collection user_id
* @property Grid\Column|Collection value * @property Grid\Column|Collection value
* @property Grid\Column|Collection avatar * @property Grid\Column|Collection avatar
* @property Grid\Column|Collection is_admin
* @property Grid\Column|Collection password * @property Grid\Column|Collection password
* @property Grid\Column|Collection remember_token * @property Grid\Column|Collection remember_token
* @property Grid\Column|Collection username * @property Grid\Column|Collection username
...@@ -47,6 +48,7 @@ namespace Dcat\Admin { ...@@ -47,6 +48,7 @@ namespace Dcat\Admin {
* @property Grid\Column|Collection email * @property Grid\Column|Collection email
* @property Grid\Column|Collection token * @property Grid\Column|Collection token
* @property Grid\Column|Collection level * @property Grid\Column|Collection level
* @property Grid\Column|Collection num
* @property Grid\Column|Collection price * @property Grid\Column|Collection price
* @property Grid\Column|Collection province_id * @property Grid\Column|Collection province_id
* @property Grid\Column|Collection refer * @property Grid\Column|Collection refer
...@@ -89,6 +91,7 @@ namespace Dcat\Admin { ...@@ -89,6 +91,7 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection user_id(string $label = null) * @method Grid\Column|Collection user_id(string $label = null)
* @method Grid\Column|Collection value(string $label = null) * @method Grid\Column|Collection value(string $label = null)
* @method Grid\Column|Collection avatar(string $label = null) * @method Grid\Column|Collection avatar(string $label = null)
* @method Grid\Column|Collection is_admin(string $label = null)
* @method Grid\Column|Collection password(string $label = null) * @method Grid\Column|Collection password(string $label = null)
* @method Grid\Column|Collection remember_token(string $label = null) * @method Grid\Column|Collection remember_token(string $label = null)
* @method Grid\Column|Collection username(string $label = null) * @method Grid\Column|Collection username(string $label = null)
...@@ -101,6 +104,7 @@ namespace Dcat\Admin { ...@@ -101,6 +104,7 @@ namespace Dcat\Admin {
* @method Grid\Column|Collection email(string $label = null) * @method Grid\Column|Collection email(string $label = null)
* @method Grid\Column|Collection token(string $label = null) * @method Grid\Column|Collection token(string $label = null)
* @method Grid\Column|Collection level(string $label = null) * @method Grid\Column|Collection level(string $label = null)
* @method Grid\Column|Collection num(string $label = null)
* @method Grid\Column|Collection price(string $label = null) * @method Grid\Column|Collection price(string $label = null)
* @method Grid\Column|Collection province_id(string $label = null) * @method Grid\Column|Collection province_id(string $label = null)
* @method Grid\Column|Collection refer(string $label = null) * @method Grid\Column|Collection refer(string $label = null)
...@@ -148,6 +152,7 @@ namespace Dcat\Admin { ...@@ -148,6 +152,7 @@ namespace Dcat\Admin {
* @property Show\Field|Collection user_id * @property Show\Field|Collection user_id
* @property Show\Field|Collection value * @property Show\Field|Collection value
* @property Show\Field|Collection avatar * @property Show\Field|Collection avatar
* @property Show\Field|Collection is_admin
* @property Show\Field|Collection password * @property Show\Field|Collection password
* @property Show\Field|Collection remember_token * @property Show\Field|Collection remember_token
* @property Show\Field|Collection username * @property Show\Field|Collection username
...@@ -160,6 +165,7 @@ namespace Dcat\Admin { ...@@ -160,6 +165,7 @@ namespace Dcat\Admin {
* @property Show\Field|Collection email * @property Show\Field|Collection email
* @property Show\Field|Collection token * @property Show\Field|Collection token
* @property Show\Field|Collection level * @property Show\Field|Collection level
* @property Show\Field|Collection num
* @property Show\Field|Collection price * @property Show\Field|Collection price
* @property Show\Field|Collection province_id * @property Show\Field|Collection province_id
* @property Show\Field|Collection refer * @property Show\Field|Collection refer
...@@ -202,6 +208,7 @@ namespace Dcat\Admin { ...@@ -202,6 +208,7 @@ namespace Dcat\Admin {
* @method Show\Field|Collection user_id(string $label = null) * @method Show\Field|Collection user_id(string $label = null)
* @method Show\Field|Collection value(string $label = null) * @method Show\Field|Collection value(string $label = null)
* @method Show\Field|Collection avatar(string $label = null) * @method Show\Field|Collection avatar(string $label = null)
* @method Show\Field|Collection is_admin(string $label = null)
* @method Show\Field|Collection password(string $label = null) * @method Show\Field|Collection password(string $label = null)
* @method Show\Field|Collection remember_token(string $label = null) * @method Show\Field|Collection remember_token(string $label = null)
* @method Show\Field|Collection username(string $label = null) * @method Show\Field|Collection username(string $label = null)
...@@ -214,6 +221,7 @@ namespace Dcat\Admin { ...@@ -214,6 +221,7 @@ namespace Dcat\Admin {
* @method Show\Field|Collection email(string $label = null) * @method Show\Field|Collection email(string $label = null)
* @method Show\Field|Collection token(string $label = null) * @method Show\Field|Collection token(string $label = null)
* @method Show\Field|Collection level(string $label = null) * @method Show\Field|Collection level(string $label = null)
* @method Show\Field|Collection num(string $label = null)
* @method Show\Field|Collection price(string $label = null) * @method Show\Field|Collection price(string $label = null)
* @method Show\Field|Collection province_id(string $label = null) * @method Show\Field|Collection province_id(string $label = null)
* @method Show\Field|Collection refer(string $label = null) * @method Show\Field|Collection refer(string $label = null)
......
resources/lang/zh_CN/tasks-approve.php 0 → 100644
<?php
return [
'labels' => [
'TasksApprove' => 'TasksApprove',
'tasks-approve' => 'TasksApprove',
],
'fields' => [
'task_id' => '系统任务id',
'user_id' => '用户id',
'receive_id' => '用户领取的任务id',
'status' => '审核通 0：未通过，1：通过',
'msg' => '未通过原因',
],
'options' => [
],
];
resources/views/admin/login.blade.php
...@@ -140,7 +140,7 @@ ...@@ -140,7 +140,7 @@
<div class="login-box"> <div class="login-box">
<div class="login-logo mb-2"> <div class="login-logo mb-2">
<h4 class="mt-0">快速后台开发框架</h4> {{-- <h4 class="mt-0">快速后台开发框架</h4>--}}
<p class="login-box-msg mt-1 mb-1">欢迎回来，请登录您的域账号。</p> <p class="login-box-msg mt-1 mb-1">欢迎回来，请登录您的域账号。</p>
</div> </div>
<div class="card"> <div class="card">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment