michealwoo 2 tahun lalu
induk
melakukan
379025166e

+ 69 - 0
app/Admin/Controllers/AccidentController.php

@@ -0,0 +1,69 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\Accident;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class AccidentController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new Accident(), function (Grid $grid) {
+
+            $grid->column('student_id')->using(config('map.students'));
+            $grid->column('happen_time');
+            $grid->column('situation_detail');
+            $grid->column('creator_user_id')->using(config('map.teachers'));
+           
+        
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+        
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new Accident(), function (Show $show) {
+            $show->field('id');
+            $show->field('student_id');
+            $show->field('happen_time');
+            $show->field('situation_detail');
+            $show->field('creator_user_id');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new Accident(), function (Form $form) {
+            $form->text('student_id');
+            $form->text('happen_time');
+            $form->text('situation_detail');
+            $form->text('creator_user_id');
+        });
+    }
+}

+ 68 - 0
app/Admin/Controllers/NoticeController.php

@@ -0,0 +1,68 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\Notice;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class NoticeController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new Notice(), function (Grid $grid) {
+            $grid->column('teacher_id')->using(config('map.teachers'));
+            $grid->column('content');
+            $grid->column('created_at');
+            $grid->column('status')->using(config('map.notice_status'));
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->equal('id');
+        
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new Notice(), function (Show $show) {
+            $show->field('id');
+            $show->field('teacher_id');
+            $show->field('content');
+            $show->field('created_at');
+            $show->field('status');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new Notice(), function (Form $form) {
+            $form->text('teacher_id');
+            $form->text('content');
+            $form->text('status');
+            $form->text('title');
+            $form->text('desc');
+            $form->text('photos');
+            $form->text('pdf_file');
+        });
+    }
+}

+ 3 - 0
app/Admin/routes.php

@@ -19,5 +19,8 @@ Route::group([
     $router->resource('/assessment_report', 'AssessmentReportController');//评估报告
     $router->resource('/assessment_report', 'AssessmentReportController');//评估报告
     $router->resource('/teach_plan', 'TeachPlanController');//教学计划
     $router->resource('/teach_plan', 'TeachPlanController');//教学计划
     $router->resource('/teach_activity', 'TeachActivityController');//教学活动
     $router->resource('/teach_activity', 'TeachActivityController');//教学活动
+    $router->resource('/notice', 'NoticeController');//通知管理
+
+    $router->resource('/accidents', 'AccidentController');//意外情况通知
     
     
 });
 });

+ 13 - 0
app/Models/Accident.php

@@ -0,0 +1,13 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class Accident extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+    }

+ 16 - 0
app/Models/Notice.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class Notice extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'notice';
+    
+}

+ 10 - 0
config/map.php

@@ -71,6 +71,16 @@ return [
     0=>'阶段性报告',
     0=>'阶段性报告',
     1=>'阶段性报告',
     1=>'阶段性报告',
     2=>'阶段性报告'
     2=>'阶段性报告'
+  ],
+  'notice_status'=>[
+    0=>'未发送',
+    1=>'已发送'
+  ],
+  'parent_ids'=>[
+    1=>'方方家长',
+    2=>'李留家长',
+    3=>'江西家长',
+    4=>'苏二家长',
   ]
   ]
 
 
 ];
 ];

+ 88 - 28
dcat_admin_ide_helper.php

@@ -12,12 +12,17 @@ namespace Dcat\Admin {
 
 
     /**
     /**
      * @property Grid\Column|Collection id
      * @property Grid\Column|Collection id
+     * @property Grid\Column|Collection student_id
+     * @property Grid\Column|Collection happen_time
+     * @property Grid\Column|Collection situation_detail
+     * @property Grid\Column|Collection creator_user_id
+     * @property Grid\Column|Collection created_at
+     * @property Grid\Column|Collection updated_at
+     * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection name
      * @property Grid\Column|Collection name
      * @property Grid\Column|Collection type
      * @property Grid\Column|Collection type
      * @property Grid\Column|Collection version
      * @property Grid\Column|Collection version
      * @property Grid\Column|Collection detail
      * @property Grid\Column|Collection detail
-     * @property Grid\Column|Collection created_at
-     * @property Grid\Column|Collection updated_at
      * @property Grid\Column|Collection is_enabled
      * @property Grid\Column|Collection is_enabled
      * @property Grid\Column|Collection parent_id
      * @property Grid\Column|Collection parent_id
      * @property Grid\Column|Collection order
      * @property Grid\Column|Collection order
@@ -36,14 +41,14 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection password
      * @property Grid\Column|Collection password
      * @property Grid\Column|Collection avatar
      * @property Grid\Column|Collection avatar
      * @property Grid\Column|Collection remember_token
      * @property Grid\Column|Collection remember_token
-     * @property Grid\Column|Collection student_id
+     * @property Grid\Column|Collection garden_name
+     * @property Grid\Column|Collection content
      * @property Grid\Column|Collection school_year
      * @property Grid\Column|Collection school_year
      * @property Grid\Column|Collection semester
      * @property Grid\Column|Collection semester
      * @property Grid\Column|Collection report_type
      * @property Grid\Column|Collection report_type
      * @property Grid\Column|Collection add_user_id
      * @property Grid\Column|Collection add_user_id
      * @property Grid\Column|Collection is_pdf
      * @property Grid\Column|Collection is_pdf
      * @property Grid\Column|Collection is_publish
      * @property Grid\Column|Collection is_publish
-     * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection look_time
      * @property Grid\Column|Collection look_time
      * @property Grid\Column|Collection is_share_to_parents
      * @property Grid\Column|Collection is_share_to_parents
      * @property Grid\Column|Collection looker
      * @property Grid\Column|Collection looker
@@ -100,14 +105,22 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection medication_json
      * @property Grid\Column|Collection medication_json
      * @property Grid\Column|Collection temperature_json
      * @property Grid\Column|Collection temperature_json
      * @property Grid\Column|Collection en_title
      * @property Grid\Column|Collection en_title
-     * @property Grid\Column|Collection content
      * @property Grid\Column|Collection en_content
      * @property Grid\Column|Collection en_content
      * @property Grid\Column|Collection email
      * @property Grid\Column|Collection email
      * @property Grid\Column|Collection answer
      * @property Grid\Column|Collection answer
      * @property Grid\Column|Collection look_num
      * @property Grid\Column|Collection look_num
+     * @property Grid\Column|Collection reason
+     * @property Grid\Column|Collection start_time
+     * @property Grid\Column|Collection end_time
+     * @property Grid\Column|Collection deal_status
      * @property Grid\Column|Collection account
      * @property Grid\Column|Collection account
      * @property Grid\Column|Collection code
      * @property Grid\Column|Collection code
      * @property Grid\Column|Collection state
      * @property Grid\Column|Collection state
+     * @property Grid\Column|Collection use_time
+     * @property Grid\Column|Collection sign
+     * @property Grid\Column|Collection teacher_id
+     * @property Grid\Column|Collection status
+     * @property Grid\Column|Collection pdf_file
      * @property Grid\Column|Collection parent_code
      * @property Grid\Column|Collection parent_code
      * @property Grid\Column|Collection full_name
      * @property Grid\Column|Collection full_name
      * @property Grid\Column|Collection is_delete
      * @property Grid\Column|Collection is_delete
@@ -137,10 +150,13 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection on
      * @property Grid\Column|Collection on
      * @property Grid\Column|Collection chinese
      * @property Grid\Column|Collection chinese
      * @property Grid\Column|Collection fieldType
      * @property Grid\Column|Collection fieldType
+     * @property Grid\Column|Collection entrust_time
+     * @property Grid\Column|Collection take_back_person
+     * @property Grid\Column|Collection take_back_desc
+     * @property Grid\Column|Collection take_back_photos
      * @property Grid\Column|Collection age
      * @property Grid\Column|Collection age
      * @property Grid\Column|Collection activity_type
      * @property Grid\Column|Collection activity_type
      * @property Grid\Column|Collection activity_time
      * @property Grid\Column|Collection activity_time
-     * @property Grid\Column|Collection creator_user_id
      * @property Grid\Column|Collection audit_status
      * @property Grid\Column|Collection audit_status
      * @property Grid\Column|Collection time
      * @property Grid\Column|Collection time
      * @property Grid\Column|Collection plan_type
      * @property Grid\Column|Collection plan_type
@@ -153,7 +169,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection checkin_count
      * @property Grid\Column|Collection checkin_count
      * @property Grid\Column|Collection friends_count
      * @property Grid\Column|Collection friends_count
      * @property Grid\Column|Collection file
      * @property Grid\Column|Collection file
-     * @property Grid\Column|Collection status
      * @property Grid\Column|Collection wx_openid
      * @property Grid\Column|Collection wx_openid
      * @property Grid\Column|Collection fb_openid
      * @property Grid\Column|Collection fb_openid
      * @property Grid\Column|Collection bg
      * @property Grid\Column|Collection bg
@@ -165,12 +180,17 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection jpush_reg_id
      * @property Grid\Column|Collection jpush_reg_id
      *
      *
      * @method Grid\Column|Collection id(string $label = null)
      * @method Grid\Column|Collection id(string $label = null)
+     * @method Grid\Column|Collection student_id(string $label = null)
+     * @method Grid\Column|Collection happen_time(string $label = null)
+     * @method Grid\Column|Collection situation_detail(string $label = null)
+     * @method Grid\Column|Collection creator_user_id(string $label = null)
+     * @method Grid\Column|Collection created_at(string $label = null)
+     * @method Grid\Column|Collection updated_at(string $label = null)
+     * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection name(string $label = null)
      * @method Grid\Column|Collection name(string $label = null)
      * @method Grid\Column|Collection type(string $label = null)
      * @method Grid\Column|Collection type(string $label = null)
      * @method Grid\Column|Collection version(string $label = null)
      * @method Grid\Column|Collection version(string $label = null)
      * @method Grid\Column|Collection detail(string $label = null)
      * @method Grid\Column|Collection detail(string $label = null)
-     * @method Grid\Column|Collection created_at(string $label = null)
-     * @method Grid\Column|Collection updated_at(string $label = null)
      * @method Grid\Column|Collection is_enabled(string $label = null)
      * @method Grid\Column|Collection is_enabled(string $label = null)
      * @method Grid\Column|Collection parent_id(string $label = null)
      * @method Grid\Column|Collection parent_id(string $label = null)
      * @method Grid\Column|Collection order(string $label = null)
      * @method Grid\Column|Collection order(string $label = null)
@@ -189,14 +209,14 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection password(string $label = null)
      * @method Grid\Column|Collection password(string $label = null)
      * @method Grid\Column|Collection avatar(string $label = null)
      * @method Grid\Column|Collection avatar(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 student_id(string $label = null)
+     * @method Grid\Column|Collection garden_name(string $label = null)
+     * @method Grid\Column|Collection content(string $label = null)
      * @method Grid\Column|Collection school_year(string $label = null)
      * @method Grid\Column|Collection school_year(string $label = null)
      * @method Grid\Column|Collection semester(string $label = null)
      * @method Grid\Column|Collection semester(string $label = null)
      * @method Grid\Column|Collection report_type(string $label = null)
      * @method Grid\Column|Collection report_type(string $label = null)
      * @method Grid\Column|Collection add_user_id(string $label = null)
      * @method Grid\Column|Collection add_user_id(string $label = null)
      * @method Grid\Column|Collection is_pdf(string $label = null)
      * @method Grid\Column|Collection is_pdf(string $label = null)
      * @method Grid\Column|Collection is_publish(string $label = null)
      * @method Grid\Column|Collection is_publish(string $label = null)
-     * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection look_time(string $label = null)
      * @method Grid\Column|Collection look_time(string $label = null)
      * @method Grid\Column|Collection is_share_to_parents(string $label = null)
      * @method Grid\Column|Collection is_share_to_parents(string $label = null)
      * @method Grid\Column|Collection looker(string $label = null)
      * @method Grid\Column|Collection looker(string $label = null)
@@ -253,14 +273,22 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection medication_json(string $label = null)
      * @method Grid\Column|Collection medication_json(string $label = null)
      * @method Grid\Column|Collection temperature_json(string $label = null)
      * @method Grid\Column|Collection temperature_json(string $label = null)
      * @method Grid\Column|Collection en_title(string $label = null)
      * @method Grid\Column|Collection en_title(string $label = null)
-     * @method Grid\Column|Collection content(string $label = null)
      * @method Grid\Column|Collection en_content(string $label = null)
      * @method Grid\Column|Collection en_content(string $label = null)
      * @method Grid\Column|Collection email(string $label = null)
      * @method Grid\Column|Collection email(string $label = null)
      * @method Grid\Column|Collection answer(string $label = null)
      * @method Grid\Column|Collection answer(string $label = null)
      * @method Grid\Column|Collection look_num(string $label = null)
      * @method Grid\Column|Collection look_num(string $label = null)
+     * @method Grid\Column|Collection reason(string $label = null)
+     * @method Grid\Column|Collection start_time(string $label = null)
+     * @method Grid\Column|Collection end_time(string $label = null)
+     * @method Grid\Column|Collection deal_status(string $label = null)
      * @method Grid\Column|Collection account(string $label = null)
      * @method Grid\Column|Collection account(string $label = null)
      * @method Grid\Column|Collection code(string $label = null)
      * @method Grid\Column|Collection code(string $label = null)
      * @method Grid\Column|Collection state(string $label = null)
      * @method Grid\Column|Collection state(string $label = null)
+     * @method Grid\Column|Collection use_time(string $label = null)
+     * @method Grid\Column|Collection sign(string $label = null)
+     * @method Grid\Column|Collection teacher_id(string $label = null)
+     * @method Grid\Column|Collection status(string $label = null)
+     * @method Grid\Column|Collection pdf_file(string $label = null)
      * @method Grid\Column|Collection parent_code(string $label = null)
      * @method Grid\Column|Collection parent_code(string $label = null)
      * @method Grid\Column|Collection full_name(string $label = null)
      * @method Grid\Column|Collection full_name(string $label = null)
      * @method Grid\Column|Collection is_delete(string $label = null)
      * @method Grid\Column|Collection is_delete(string $label = null)
@@ -290,10 +318,13 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection on(string $label = null)
      * @method Grid\Column|Collection on(string $label = null)
      * @method Grid\Column|Collection chinese(string $label = null)
      * @method Grid\Column|Collection chinese(string $label = null)
      * @method Grid\Column|Collection fieldType(string $label = null)
      * @method Grid\Column|Collection fieldType(string $label = null)
+     * @method Grid\Column|Collection entrust_time(string $label = null)
+     * @method Grid\Column|Collection take_back_person(string $label = null)
+     * @method Grid\Column|Collection take_back_desc(string $label = null)
+     * @method Grid\Column|Collection take_back_photos(string $label = null)
      * @method Grid\Column|Collection age(string $label = null)
      * @method Grid\Column|Collection age(string $label = null)
      * @method Grid\Column|Collection activity_type(string $label = null)
      * @method Grid\Column|Collection activity_type(string $label = null)
      * @method Grid\Column|Collection activity_time(string $label = null)
      * @method Grid\Column|Collection activity_time(string $label = null)
-     * @method Grid\Column|Collection creator_user_id(string $label = null)
      * @method Grid\Column|Collection audit_status(string $label = null)
      * @method Grid\Column|Collection audit_status(string $label = null)
      * @method Grid\Column|Collection time(string $label = null)
      * @method Grid\Column|Collection time(string $label = null)
      * @method Grid\Column|Collection plan_type(string $label = null)
      * @method Grid\Column|Collection plan_type(string $label = null)
@@ -306,7 +337,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection checkin_count(string $label = null)
      * @method Grid\Column|Collection checkin_count(string $label = null)
      * @method Grid\Column|Collection friends_count(string $label = null)
      * @method Grid\Column|Collection friends_count(string $label = null)
      * @method Grid\Column|Collection file(string $label = null)
      * @method Grid\Column|Collection file(string $label = null)
-     * @method Grid\Column|Collection status(string $label = null)
      * @method Grid\Column|Collection wx_openid(string $label = null)
      * @method Grid\Column|Collection wx_openid(string $label = null)
      * @method Grid\Column|Collection fb_openid(string $label = null)
      * @method Grid\Column|Collection fb_openid(string $label = null)
      * @method Grid\Column|Collection bg(string $label = null)
      * @method Grid\Column|Collection bg(string $label = null)
@@ -323,12 +353,17 @@ namespace Dcat\Admin {
 
 
     /**
     /**
      * @property Show\Field|Collection id
      * @property Show\Field|Collection id
+     * @property Show\Field|Collection student_id
+     * @property Show\Field|Collection happen_time
+     * @property Show\Field|Collection situation_detail
+     * @property Show\Field|Collection creator_user_id
+     * @property Show\Field|Collection created_at
+     * @property Show\Field|Collection updated_at
+     * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection name
      * @property Show\Field|Collection name
      * @property Show\Field|Collection type
      * @property Show\Field|Collection type
      * @property Show\Field|Collection version
      * @property Show\Field|Collection version
      * @property Show\Field|Collection detail
      * @property Show\Field|Collection detail
-     * @property Show\Field|Collection created_at
-     * @property Show\Field|Collection updated_at
      * @property Show\Field|Collection is_enabled
      * @property Show\Field|Collection is_enabled
      * @property Show\Field|Collection parent_id
      * @property Show\Field|Collection parent_id
      * @property Show\Field|Collection order
      * @property Show\Field|Collection order
@@ -347,14 +382,14 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection password
      * @property Show\Field|Collection password
      * @property Show\Field|Collection avatar
      * @property Show\Field|Collection avatar
      * @property Show\Field|Collection remember_token
      * @property Show\Field|Collection remember_token
-     * @property Show\Field|Collection student_id
+     * @property Show\Field|Collection garden_name
+     * @property Show\Field|Collection content
      * @property Show\Field|Collection school_year
      * @property Show\Field|Collection school_year
      * @property Show\Field|Collection semester
      * @property Show\Field|Collection semester
      * @property Show\Field|Collection report_type
      * @property Show\Field|Collection report_type
      * @property Show\Field|Collection add_user_id
      * @property Show\Field|Collection add_user_id
      * @property Show\Field|Collection is_pdf
      * @property Show\Field|Collection is_pdf
      * @property Show\Field|Collection is_publish
      * @property Show\Field|Collection is_publish
-     * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection look_time
      * @property Show\Field|Collection look_time
      * @property Show\Field|Collection is_share_to_parents
      * @property Show\Field|Collection is_share_to_parents
      * @property Show\Field|Collection looker
      * @property Show\Field|Collection looker
@@ -411,14 +446,22 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection medication_json
      * @property Show\Field|Collection medication_json
      * @property Show\Field|Collection temperature_json
      * @property Show\Field|Collection temperature_json
      * @property Show\Field|Collection en_title
      * @property Show\Field|Collection en_title
-     * @property Show\Field|Collection content
      * @property Show\Field|Collection en_content
      * @property Show\Field|Collection en_content
      * @property Show\Field|Collection email
      * @property Show\Field|Collection email
      * @property Show\Field|Collection answer
      * @property Show\Field|Collection answer
      * @property Show\Field|Collection look_num
      * @property Show\Field|Collection look_num
+     * @property Show\Field|Collection reason
+     * @property Show\Field|Collection start_time
+     * @property Show\Field|Collection end_time
+     * @property Show\Field|Collection deal_status
      * @property Show\Field|Collection account
      * @property Show\Field|Collection account
      * @property Show\Field|Collection code
      * @property Show\Field|Collection code
      * @property Show\Field|Collection state
      * @property Show\Field|Collection state
+     * @property Show\Field|Collection use_time
+     * @property Show\Field|Collection sign
+     * @property Show\Field|Collection teacher_id
+     * @property Show\Field|Collection status
+     * @property Show\Field|Collection pdf_file
      * @property Show\Field|Collection parent_code
      * @property Show\Field|Collection parent_code
      * @property Show\Field|Collection full_name
      * @property Show\Field|Collection full_name
      * @property Show\Field|Collection is_delete
      * @property Show\Field|Collection is_delete
@@ -448,10 +491,13 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection on
      * @property Show\Field|Collection on
      * @property Show\Field|Collection chinese
      * @property Show\Field|Collection chinese
      * @property Show\Field|Collection fieldType
      * @property Show\Field|Collection fieldType
+     * @property Show\Field|Collection entrust_time
+     * @property Show\Field|Collection take_back_person
+     * @property Show\Field|Collection take_back_desc
+     * @property Show\Field|Collection take_back_photos
      * @property Show\Field|Collection age
      * @property Show\Field|Collection age
      * @property Show\Field|Collection activity_type
      * @property Show\Field|Collection activity_type
      * @property Show\Field|Collection activity_time
      * @property Show\Field|Collection activity_time
-     * @property Show\Field|Collection creator_user_id
      * @property Show\Field|Collection audit_status
      * @property Show\Field|Collection audit_status
      * @property Show\Field|Collection time
      * @property Show\Field|Collection time
      * @property Show\Field|Collection plan_type
      * @property Show\Field|Collection plan_type
@@ -464,7 +510,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection checkin_count
      * @property Show\Field|Collection checkin_count
      * @property Show\Field|Collection friends_count
      * @property Show\Field|Collection friends_count
      * @property Show\Field|Collection file
      * @property Show\Field|Collection file
-     * @property Show\Field|Collection status
      * @property Show\Field|Collection wx_openid
      * @property Show\Field|Collection wx_openid
      * @property Show\Field|Collection fb_openid
      * @property Show\Field|Collection fb_openid
      * @property Show\Field|Collection bg
      * @property Show\Field|Collection bg
@@ -476,12 +521,17 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection jpush_reg_id
      * @property Show\Field|Collection jpush_reg_id
      *
      *
      * @method Show\Field|Collection id(string $label = null)
      * @method Show\Field|Collection id(string $label = null)
+     * @method Show\Field|Collection student_id(string $label = null)
+     * @method Show\Field|Collection happen_time(string $label = null)
+     * @method Show\Field|Collection situation_detail(string $label = null)
+     * @method Show\Field|Collection creator_user_id(string $label = null)
+     * @method Show\Field|Collection created_at(string $label = null)
+     * @method Show\Field|Collection updated_at(string $label = null)
+     * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection name(string $label = null)
      * @method Show\Field|Collection name(string $label = null)
      * @method Show\Field|Collection type(string $label = null)
      * @method Show\Field|Collection type(string $label = null)
      * @method Show\Field|Collection version(string $label = null)
      * @method Show\Field|Collection version(string $label = null)
      * @method Show\Field|Collection detail(string $label = null)
      * @method Show\Field|Collection detail(string $label = null)
-     * @method Show\Field|Collection created_at(string $label = null)
-     * @method Show\Field|Collection updated_at(string $label = null)
      * @method Show\Field|Collection is_enabled(string $label = null)
      * @method Show\Field|Collection is_enabled(string $label = null)
      * @method Show\Field|Collection parent_id(string $label = null)
      * @method Show\Field|Collection parent_id(string $label = null)
      * @method Show\Field|Collection order(string $label = null)
      * @method Show\Field|Collection order(string $label = null)
@@ -500,14 +550,14 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection password(string $label = null)
      * @method Show\Field|Collection password(string $label = null)
      * @method Show\Field|Collection avatar(string $label = null)
      * @method Show\Field|Collection avatar(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 student_id(string $label = null)
+     * @method Show\Field|Collection garden_name(string $label = null)
+     * @method Show\Field|Collection content(string $label = null)
      * @method Show\Field|Collection school_year(string $label = null)
      * @method Show\Field|Collection school_year(string $label = null)
      * @method Show\Field|Collection semester(string $label = null)
      * @method Show\Field|Collection semester(string $label = null)
      * @method Show\Field|Collection report_type(string $label = null)
      * @method Show\Field|Collection report_type(string $label = null)
      * @method Show\Field|Collection add_user_id(string $label = null)
      * @method Show\Field|Collection add_user_id(string $label = null)
      * @method Show\Field|Collection is_pdf(string $label = null)
      * @method Show\Field|Collection is_pdf(string $label = null)
      * @method Show\Field|Collection is_publish(string $label = null)
      * @method Show\Field|Collection is_publish(string $label = null)
-     * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection look_time(string $label = null)
      * @method Show\Field|Collection look_time(string $label = null)
      * @method Show\Field|Collection is_share_to_parents(string $label = null)
      * @method Show\Field|Collection is_share_to_parents(string $label = null)
      * @method Show\Field|Collection looker(string $label = null)
      * @method Show\Field|Collection looker(string $label = null)
@@ -564,14 +614,22 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection medication_json(string $label = null)
      * @method Show\Field|Collection medication_json(string $label = null)
      * @method Show\Field|Collection temperature_json(string $label = null)
      * @method Show\Field|Collection temperature_json(string $label = null)
      * @method Show\Field|Collection en_title(string $label = null)
      * @method Show\Field|Collection en_title(string $label = null)
-     * @method Show\Field|Collection content(string $label = null)
      * @method Show\Field|Collection en_content(string $label = null)
      * @method Show\Field|Collection en_content(string $label = null)
      * @method Show\Field|Collection email(string $label = null)
      * @method Show\Field|Collection email(string $label = null)
      * @method Show\Field|Collection answer(string $label = null)
      * @method Show\Field|Collection answer(string $label = null)
      * @method Show\Field|Collection look_num(string $label = null)
      * @method Show\Field|Collection look_num(string $label = null)
+     * @method Show\Field|Collection reason(string $label = null)
+     * @method Show\Field|Collection start_time(string $label = null)
+     * @method Show\Field|Collection end_time(string $label = null)
+     * @method Show\Field|Collection deal_status(string $label = null)
      * @method Show\Field|Collection account(string $label = null)
      * @method Show\Field|Collection account(string $label = null)
      * @method Show\Field|Collection code(string $label = null)
      * @method Show\Field|Collection code(string $label = null)
      * @method Show\Field|Collection state(string $label = null)
      * @method Show\Field|Collection state(string $label = null)
+     * @method Show\Field|Collection use_time(string $label = null)
+     * @method Show\Field|Collection sign(string $label = null)
+     * @method Show\Field|Collection teacher_id(string $label = null)
+     * @method Show\Field|Collection status(string $label = null)
+     * @method Show\Field|Collection pdf_file(string $label = null)
      * @method Show\Field|Collection parent_code(string $label = null)
      * @method Show\Field|Collection parent_code(string $label = null)
      * @method Show\Field|Collection full_name(string $label = null)
      * @method Show\Field|Collection full_name(string $label = null)
      * @method Show\Field|Collection is_delete(string $label = null)
      * @method Show\Field|Collection is_delete(string $label = null)
@@ -601,10 +659,13 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection on(string $label = null)
      * @method Show\Field|Collection on(string $label = null)
      * @method Show\Field|Collection chinese(string $label = null)
      * @method Show\Field|Collection chinese(string $label = null)
      * @method Show\Field|Collection fieldType(string $label = null)
      * @method Show\Field|Collection fieldType(string $label = null)
+     * @method Show\Field|Collection entrust_time(string $label = null)
+     * @method Show\Field|Collection take_back_person(string $label = null)
+     * @method Show\Field|Collection take_back_desc(string $label = null)
+     * @method Show\Field|Collection take_back_photos(string $label = null)
      * @method Show\Field|Collection age(string $label = null)
      * @method Show\Field|Collection age(string $label = null)
      * @method Show\Field|Collection activity_type(string $label = null)
      * @method Show\Field|Collection activity_type(string $label = null)
      * @method Show\Field|Collection activity_time(string $label = null)
      * @method Show\Field|Collection activity_time(string $label = null)
-     * @method Show\Field|Collection creator_user_id(string $label = null)
      * @method Show\Field|Collection audit_status(string $label = null)
      * @method Show\Field|Collection audit_status(string $label = null)
      * @method Show\Field|Collection time(string $label = null)
      * @method Show\Field|Collection time(string $label = null)
      * @method Show\Field|Collection plan_type(string $label = null)
      * @method Show\Field|Collection plan_type(string $label = null)
@@ -617,7 +678,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection checkin_count(string $label = null)
      * @method Show\Field|Collection checkin_count(string $label = null)
      * @method Show\Field|Collection friends_count(string $label = null)
      * @method Show\Field|Collection friends_count(string $label = null)
      * @method Show\Field|Collection file(string $label = null)
      * @method Show\Field|Collection file(string $label = null)
-     * @method Show\Field|Collection status(string $label = null)
      * @method Show\Field|Collection wx_openid(string $label = null)
      * @method Show\Field|Collection wx_openid(string $label = null)
      * @method Show\Field|Collection fb_openid(string $label = null)
      * @method Show\Field|Collection fb_openid(string $label = null)
      * @method Show\Field|Collection bg(string $label = null)
      * @method Show\Field|Collection bg(string $label = null)

+ 15 - 0
resources/lang/zh-CN/accident.php

@@ -0,0 +1,15 @@
+<?php 
+return [
+    'labels' => [
+        'Accident' => 'Accident',
+        'accident' => 'Accident',
+    ],
+    'fields' => [
+        'student_id' => '学生名称',
+        'happen_time' => '发生时间',
+        'situation_detail' => '情况详细',
+        'creator_user_id' => '记录人',
+    ],
+    'options' => [
+    ],
+];

+ 19 - 0
resources/lang/zh-CN/notice.php

@@ -0,0 +1,19 @@
+<?php 
+return [
+    'labels' => [
+        'Notice' => '通知',
+        'notice' => '通知',
+    ],
+    'fields' => [
+        'teacher_id' => '老师名称',
+        'content' => '通知内容',
+        'status' => '发送状态',
+        'title' => '标题',
+        'desc' => '描述',
+        'photos' => '照片',
+        'pdf_file' => 'pdf',
+        'created_at' => '添加时间'
+    ],
+    'options' => [
+    ],
+];