.

app/Admin/Controllers/BabysittingController.php

@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\Babysitting;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Http\Controllers\AdminController;
+
+class BabysittingController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new Babysitting(), function (Grid $grid) {
+            $grid->column('student_id')->using(config('map.students'));
+            $grid->column('look_time');
+            $grid->column('looker')->using(config('map.teachers'));
+            $grid->column('is_publish')->using([0=>'否',1=>'是']);
+            $grid->disableViewButton();
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->panel();
+                $filter->equal('student_id')->select(config('map.students'))->width(4);
+            });
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new Babysitting(), function (Show $show) {
+            $show->field('id');
+            $show->field('look_time');
+            $show->field('is_share_to_parents');
+            $show->field('looker');
+            $show->field('title');
+            $show->field('student_id');
+            $show->field('desc');
+            $show->field('photos');
+            $show->field('videos');
+            $show->field('choose_ability');
+            $show->column('is_publish');
+            $show->field('effective_learn_characteristics');
+            $show->field('next_teach_activity_plan');
+            $show->field('look_bg');
+            $show->field('created_at');
+            $show->field('updated_at');
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new Babysitting(), function (Form $form) {
+            $form->row(function (Form\Row $row) {
+                $row->width(2)->datetime('look_time')->required();
+                $row->width(1)->switch('is_share_to_parents');
+                $row->width(1)->select('looker')->options(config('map.teachers'))->disable();
+            });
+            $form->row(function (Form\Row $row) {
+                $row->text('title')->placeholder('请输入标题')->required();
+            });
+
+            $form->row(function (Form\Row $row) {
+                $row->select('student_id')->options(config('map.students'))->placeholder('请选择学生')->required();
+            });
+
+            $form->row(function (Form\Row $row) {
+                $row->textarea('desc')->placeholder('请输入描述')->required();
+            });
+
+            $form->row(function (Form\Row $row) use($form) {
+                $row->width(3)->multipleImage('photos');
+                $row->width(3)->file('videos');
+                // $row->radio('type')
+                // ->when(1,function(Form $form){
+                  
+                // })
+                // ->when(2,function(Form $form){
+                 
+                // })
+                // ->options([1=>'上传图片',2=>'上传视频'])
+                // ->default(1);
+            });
+
+            $form->row(function (Form\Row $row) {
+                $row->select('choose_ability')->options(config('map.students'))->placeholder('请选择能力')->required();
+            });
+
+            $form->row(function (Form\Row $row) {
+                $row->select('effective_learn_characteristics')->options(config('map.students'))->placeholder('请选有效学习特征')->required();
+            });
+
+            $form->text('is_publish');
+       
+            $form->row(function (Form\Row $row) {
+                $row->textarea('next_teach_activity_plan')->placeholder('请输入下一步教学活动安排')->required();
+            });
+
+            $form->row(function (Form\Row $row) {
+                $row->textarea('look_bg')->placeholder('请输入观察背景')->required();
+            });
+            $form->disableViewButton();
+
+        });
+    }
+}

app/Admin/Controllers/StudentController.php

@@ -76,28 +76,21 @@ class StudentController extends AdminController
     protected function form()
     {
         return Form::make(new Student(), function (Form $form) {
-            $form->display('id');
-            // $form->column(6, function (Form $form) {
-            //   $form->text('name');
-            //     $form->text('sex');
-             
-            // });
+            //$form->display('id');
             $form->row(function (Form\Row $row) {
                 $row->width(6)->text('name')->required()->placeholder('请输入中文名');
                 $row->width(6)->text('name_en')->placeholder('请输入英文名');
             });
             $form->row(function (Form\Row $row) {
-              $row->width(6)->select('sex')->options(config('map.sex'));
-              $row->width(6)->select('blood_type')->options(config('map.blood_type'));
+               $row->width(6)->select('sex')->options(config('map.sex'));
+               $row->width(6)->select('blood_type')->options(config('map.blood_type'));
             });
             $form->row(function (Form\Row $row) {
-              $row->width(12)->text('hypersensitive_source');
+               $row->width(12)->text('hypersensitive_source');
             });
             $form->row(function (Form\Row $row) {
-              $row->textarea('past_medical_history')->required();
+               $row->textarea('past_medical_history')->required();
             });
-           
-
             $form->row(function (Form\Row $row) {
                $row->width(6)->text('birthday')->required();
                $row->width(6)->text('join_garden_time');
@@ -106,23 +99,21 @@ class StudentController extends AdminController
                $row->width(6)->text('exclusive_consultant_name')->placeholder('请输入专属顾问名');
                $row->width(6)->text('exclusive_consultant_phone')->placeholder('请输入专属顾问联系方式');
             });
-
             $form->row(function (Form\Row $row) {
-              $row->width(6)->text('parent_name')->placeholder('请输入家长名');
+               $row->width(6)->text('parent_name')->placeholder('请输入家长名');
            });
             $form->row(function (Form\Row $row) {
-              $row->text('home_address');
+               $row->text('home_address');
             });
             $form->row(function (Form\Row $row) {
-              $row->width(6)->text('hobby')->placeholder('请输入喜好');
-              $row->width(6)->text('family_lang')->placeholder('请输入家庭语言');
+               $row->width(6)->text('hobby')->placeholder('请输入喜好');
+               $row->width(6)->text('family_lang')->placeholder('请输入家庭语言');
            });
             $form->row(function (Form\Row $row) {
-              $row->text('sleep_habits_and_others');
+               $row->text('sleep_habits_and_others');
             });
-
             $form->row(function (Form\Row $row) {
-              $row->textarea('first_communication_of_parents');
+               $row->textarea('first_communication_of_parents');
             });
             // $form->text('month_old');
             // $form->text('class_id');

app/Admin/routes.php

@@ -14,5 +14,6 @@ Route::group([
 
     $router->get('/', 'HomeController@index');
     $router->resource('/student', 'StudentController');//学生管理
+    $router->resource('/babysitting', 'BabysittingController');//观察日志
     
 });

app/Models/Babysitting.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 Babysitting extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'babysitting';
+    
+}

config/map.php

@@ -8,6 +8,7 @@ return [
   ],
   'class' => [
     1 => '黄桃班',
+    2 => '苹果班',
   ],
   'blood_type' => [
     1=>'A型血',
@@ -16,5 +17,16 @@ return [
     4=>'AB型血',
     5=>'RH型血'
   ],
+  'students'=>[
+    1=>'方方',
+    2=>'李留',
+    3=>'江西',
+    4=>'苏二',
+  ],
+  'teachers'=>[
+    1=>'芳芳',
+    2=>'小爱',
+    3=>'小李'
+  ]
 
 ];

dcat_admin_ide_helper.php

@@ -36,6 +36,18 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection password
      * @property Grid\Column|Collection avatar
      * @property Grid\Column|Collection remember_token
+     * @property Grid\Column|Collection look_time
+     * @property Grid\Column|Collection is_share_to_parents
+     * @property Grid\Column|Collection looker
+     * @property Grid\Column|Collection student_ids
+     * @property Grid\Column|Collection desc
+     * @property Grid\Column|Collection photos
+     * @property Grid\Column|Collection videos
+     * @property Grid\Column|Collection choose_ability
+     * @property Grid\Column|Collection effective_learn_characteristics
+     * @property Grid\Column|Collection next_teach_activity_plan
+     * @property Grid\Column|Collection look_bg
+     * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection md5
      * @property Grid\Column|Collection path
      * @property Grid\Column|Collection url
@@ -45,7 +57,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection download
      * @property Grid\Column|Collection klass
      * @property Grid\Column|Collection objid
-     * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection key
      * @property Grid\Column|Collection expiration
      * @property Grid\Column|Collection group
@@ -79,7 +90,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection state
      * @property Grid\Column|Collection parent_code
      * @property Grid\Column|Collection full_name
-     * @property Grid\Column|Collection desc
      * @property Grid\Column|Collection is_delete
      * @property Grid\Column|Collection event
      * @property Grid\Column|Collection prefix
@@ -151,6 +161,18 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection password(string $label = null)
      * @method Grid\Column|Collection avatar(string $label = null)
      * @method Grid\Column|Collection remember_token(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 looker(string $label = null)
+     * @method Grid\Column|Collection student_ids(string $label = null)
+     * @method Grid\Column|Collection desc(string $label = null)
+     * @method Grid\Column|Collection photos(string $label = null)
+     * @method Grid\Column|Collection videos(string $label = null)
+     * @method Grid\Column|Collection choose_ability(string $label = null)
+     * @method Grid\Column|Collection effective_learn_characteristics(string $label = null)
+     * @method Grid\Column|Collection next_teach_activity_plan(string $label = null)
+     * @method Grid\Column|Collection look_bg(string $label = null)
+     * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection md5(string $label = null)
      * @method Grid\Column|Collection path(string $label = null)
      * @method Grid\Column|Collection url(string $label = null)
@@ -160,7 +182,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection download(string $label = null)
      * @method Grid\Column|Collection klass(string $label = null)
      * @method Grid\Column|Collection objid(string $label = null)
-     * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection key(string $label = null)
      * @method Grid\Column|Collection expiration(string $label = null)
      * @method Grid\Column|Collection group(string $label = null)
@@ -194,7 +215,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection state(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 desc(string $label = null)
      * @method Grid\Column|Collection is_delete(string $label = null)
      * @method Grid\Column|Collection event(string $label = null)
      * @method Grid\Column|Collection prefix(string $label = null)
@@ -271,6 +291,18 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection password
      * @property Show\Field|Collection avatar
      * @property Show\Field|Collection remember_token
+     * @property Show\Field|Collection look_time
+     * @property Show\Field|Collection is_share_to_parents
+     * @property Show\Field|Collection looker
+     * @property Show\Field|Collection student_ids
+     * @property Show\Field|Collection desc
+     * @property Show\Field|Collection photos
+     * @property Show\Field|Collection videos
+     * @property Show\Field|Collection choose_ability
+     * @property Show\Field|Collection effective_learn_characteristics
+     * @property Show\Field|Collection next_teach_activity_plan
+     * @property Show\Field|Collection look_bg
+     * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection md5
      * @property Show\Field|Collection path
      * @property Show\Field|Collection url
@@ -280,7 +312,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection download
      * @property Show\Field|Collection klass
      * @property Show\Field|Collection objid
-     * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection key
      * @property Show\Field|Collection expiration
      * @property Show\Field|Collection group
@@ -314,7 +345,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection state
      * @property Show\Field|Collection parent_code
      * @property Show\Field|Collection full_name
-     * @property Show\Field|Collection desc
      * @property Show\Field|Collection is_delete
      * @property Show\Field|Collection event
      * @property Show\Field|Collection prefix
@@ -386,6 +416,18 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection password(string $label = null)
      * @method Show\Field|Collection avatar(string $label = null)
      * @method Show\Field|Collection remember_token(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 looker(string $label = null)
+     * @method Show\Field|Collection student_ids(string $label = null)
+     * @method Show\Field|Collection desc(string $label = null)
+     * @method Show\Field|Collection photos(string $label = null)
+     * @method Show\Field|Collection videos(string $label = null)
+     * @method Show\Field|Collection choose_ability(string $label = null)
+     * @method Show\Field|Collection effective_learn_characteristics(string $label = null)
+     * @method Show\Field|Collection next_teach_activity_plan(string $label = null)
+     * @method Show\Field|Collection look_bg(string $label = null)
+     * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection md5(string $label = null)
      * @method Show\Field|Collection path(string $label = null)
      * @method Show\Field|Collection url(string $label = null)
@@ -395,7 +437,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection download(string $label = null)
      * @method Show\Field|Collection klass(string $label = null)
      * @method Show\Field|Collection objid(string $label = null)
-     * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection key(string $label = null)
      * @method Show\Field|Collection expiration(string $label = null)
      * @method Show\Field|Collection group(string $label = null)
@@ -429,7 +470,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection state(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 desc(string $label = null)
      * @method Show\Field|Collection is_delete(string $label = null)
      * @method Show\Field|Collection event(string $label = null)
      * @method Show\Field|Collection prefix(string $label = null)

resources/lang/zh-CN/babysitting.php

@@ -0,0 +1,24 @@
+<?php 
+return [
+    'labels' => [
+        'Babysitting' => '观察日志',
+        'babysitting' => '观察日志',
+    ],
+    'fields' => [
+        'look_time' => '观察时间',
+        'is_share_to_parents' => '分享给家长',
+        'looker' => '观察者',
+        'title' => '标题',
+        'student_id' => '学生姓名',
+        'desc' => '描述',
+        'photos' => '照片',
+        'videos' => '视频',
+        'is_publish' => '发布状态',
+        'choose_ability' => '选择能力及下一步计划',
+        'effective_learn_characteristics' => '有效学习特征',
+        'next_teach_activity_plan' => '下一步教学活动安排',
+        'look_bg' => '观察背景',
+    ],
+    'options' => [
+    ],
+];