学生排课

app/common/model/StudentSchedule.php

@@ -23,5 +23,19 @@ use support\Model;
 class StudentSchedule extends BaseModel
 {
     
+    public function teacher()
+    {
+        return $this->hasOne(Teacher::class, 'id', 'teacher_id')->bind(['teacher_account'=>'account', 'teacher_name']);
+    }
+
+    public function subject()
+    {
+        return $this->hasOne(Subject::class, 'id', 'subject_id')->bind(['subject_name', 'english_name']);
+    }
+
+    public function student()
+    {
+        return $this->hasOne(Student::class, 'id', 'student_id')->bind(['student_name', 'student_account'=>'account']);
+    }
 
 }

plugin/admin/app/controller/StudentScheduleController.php

@@ -2,6 +2,9 @@
 
 namespace plugin\admin\app\controller;
 
+use app\common\model\Student;
+use app\common\model\Subject;
+use app\common\model\Teacher;
 use app\common\model\TeacherScheduleTime;
 use app\constant\ResponseCode;
 use support\Request;
@@ -37,7 +40,92 @@ class StudentScheduleController extends Crud
      */
     public function index(): Response
     {
-        return view('student-schedule/index');
+        //获取所有老师
+        $teacher = Teacher::order('id asc')->field('id,teacher_name,account')->select()->toArray();
+        //所有课程
+        $subject = Subject::order('sort desc,id asc')->field('id,subject_name,english_name')->select()->toArray();
+        $student = Student::order('id asc')->field('id,student_name,account')->select()->toArray();
+
+        return view('student-schedule/index', ['teacher' => $teacher, 'subject' => $subject, 'student' => $student]);
+    }
+
+
+    public function select(Request $request): Response
+    {
+        try {
+            $data = $request->get();
+            $student_schedule = \app\common\model\StudentSchedule::order('id desc');
+
+            if (isset($data['student_id']) && $data['student_id']) {
+                $student_schedule->where(['student_id' => $data['student_id']]);
+            }
+            if (isset($data['teacher_id']) && $data['teacher_id']) {
+                $student_schedule->where(['teacher_id' => $data['teacher_id']]);
+            }
+            if (isset($data['subject_id']) && $data['subject_id']) {
+                $student_schedule->where(['subject_id' => $data['subject_id']]);
+            }
+            if (isset($data['date']) && $data['date']) {
+                if ($data['date'][0] && $data['date'][1]) {
+                    $student_schedule->whereBetweenTime('date', $data['date'][0], $data['date'][1]);
+                }
+            }
+            if (isset($data['month']) && $data['month']) {
+                $student_schedule->where(['month' => $data['month']]);
+            }
+            if (isset($data['is_publish']) && $data['is_publish'] !== '') {
+                $student_schedule->where(['is_publish' => $data['is_publish']]);
+            }
+
+
+            $limit = (int)$request->get('limit', 10);
+            $limit = $limit <= 0 ? 10 : $limit;
+            $page = (int)$request->get('page');
+            $page = $page > 0 ? $page : 1;
+
+            $total = $student_schedule->count();
+            $list = $student_schedule->with(['teacher', 'student', 'subject'])->page($page, $limit)->select();
+
+            return json([
+                'code' => ResponseCode::WEB_API_SUCCESS,
+                'data' => $list,
+                'count' => $total,
+                'msg' => 'success'
+            ]);
+        } catch (Exception $e) {
+            return json([
+                'code' => ResponseCode::WEB_API_FAIL,
+                'msg' => $e->getMessage()
+            ]);
+        }
+    }
+
+
+    /**
+     * @desc 更改学生课表状态
+     * @param Request $request
+     * @return Response
+     */
+    public function changePublishStatus(Request $request)
+    {
+        try {
+            $data = $request->post();
+            $res = \app\common\model\StudentSchedule::where(['id' => $data['ids']])->save([
+                'is_publish' => $data['status']
+            ]);
+            if (!$res) {
+                throw new Exception('操作失败');
+            }
+            return json([
+                'code' => ResponseCode::WEB_API_SUCCESS,
+                'msg' => 'success'
+            ]);
+        } catch (Exception $e) {
+            return json([
+                'code' => ResponseCode::WEB_API_FAIL,
+                'msg' => $e->getMessage()
+            ]);
+        }
     }
 
     /**
@@ -96,10 +184,10 @@ class StudentScheduleController extends Crud
             ", [$teacher_schedule_time->start_time, $teacher_schedule_time->start_time,
                     $teacher_schedule_time->end_time, $teacher_schedule_time->end_time,
                     $teacher_schedule_time->start_time, $teacher_schedule_time->end_time,
-                ])->findOrEmpty();
+                ])->with(['teacher', 'subject'])->findOrEmpty();
 
                 if (!$conflict->isEmpty()) {
-                    throw new Exception('该学生课程和其他课程有冲突');
+                    throw new Exception("该学生课程和【{$conflict->teacher_name}】的【{$conflict->subject_name} {$conflict->date} {$conflict->time} 】有冲突");
                 }
 
                 $res = \app\common\model\StudentSchedule::create([

plugin/admin/app/controller/TeacherController.php

@@ -2,6 +2,9 @@
 
 namespace plugin\admin\app\controller;
 
+use app\common\model\Student;
+use app\common\model\StudentSchedule;
+use app\common\model\Subject;
 use app\common\model\TeacherScheduleTime;
 use app\constant\ResponseCode;
 use support\Request;
@@ -162,23 +165,6 @@ class TeacherController extends Crud
     }
 
 
-    /**
-     * @desc 教师月份课程安排
-     * @param Request $request
-     * @return Response
-     */
-    public function teacherScheduleTime(Request $request)
-    {
-
-        $data = $request->get();
-        $teacher_id = $data['teacher_id'];
-        $month = $data['month'];
-        $teacher = \app\common\model\Teacher::where(['id'=>$teacher_id])->findOrEmpty();
-
-        return view('teacher/teacher_schedule_time', ['teacher' => $teacher, 'month' => $month]);
-    }
-
-
     /**
      * @desc 获取教师课程安排统计
      * @param Request $request
@@ -229,6 +215,63 @@ class TeacherController extends Crud
         }
     }
 
+
+    /**
+     * @desc 教师月份课程安排日历
+     * @param Request $request
+     * @return Response
+     */
+    public function teacherScheduleTime(Request $request)
+    {
+
+        $data = $request->get();
+        $teacher_id = $data['teacher_id'];
+        $month = $data['month'];
+        $teacher = \app\common\model\Teacher::where(['id'=>$teacher_id])->findOrEmpty();
+        //获取该老师当前分配学生
+//        $student_schedule = StudentSchedule::where([''])
+
+        return view('teacher/teacher_schedule_time', ['teacher' => $teacher, 'month' => $month]);
+    }
+
+
+    /**
+     * 更新
+     * @param Request $request
+     * @return Response
+     * @throws BusinessException
+     */
+    public function scheduleTimeSet(Request $request): Response
+    {
+        if ($request->method() === 'POST') {
+
+            if ($request->post('is_publish')) {
+                $request->post('is_publish', 0);
+            }
+//            parent::update($request);
+
+            return parent::update($request);
+        }
+        $free_time_id = $request->get('free_time_id');
+        $schedule_time = \app\common\model\TeacherScheduleTime::where(['id' => $free_time_id])->with(['teacher'])->findOrEmpty()->toArray();
+        //课程
+        $project = Subject::order('sort desc, id asc')->select()->toArray();
+        //所有学生
+        $student = Student::order('id asc')->field('id,account,student_name')->select()->toArray();
+        $student_schedule = StudentSchedule::where(['teacher_schedule_time_id' => $free_time_id])->select()->toArray();
+        $student_schedule_id = [];
+        if ($student_schedule) {
+            $student_schedule_id = array_column($student_schedule, 'student_id');
+        }
+
+
+        return view('teacher/schedule_time_setting', [
+            'schedule_time' => $schedule_time,
+            'project' => $project,
+            'student' => $student,
+            'student_schedule_id' => $student_schedule_id]);
+    }
+
     /**
      * @desc 重置密码
      * @param Request $request

plugin/admin/app/controller/TeacherScheduleTimeController.php

@@ -3,6 +3,7 @@
 namespace plugin\admin\app\controller;
 
 use app\common\model\Student;
+use app\common\model\StudentSchedule;
 use app\common\model\Subject;
 use app\common\model\Teacher;
 use app\constant\ResponseCode;
@@ -123,32 +124,6 @@ class TeacherScheduleTimeController extends Crud
         return view('teacher-schedule-time/update', ['teacher' => $teacher]);
     }
 
-    /**
-     * 更新
-     * @param Request $request
-     * @return Response
-     * @throws BusinessException
-     */
-    public function scheduleTimeSet(Request $request): Response
-    {
-        if ($request->method() === 'POST') {
-
-            if ($request->post('is_publish')) {
-                $request->post('is_publish', 0);
-            }
-//            parent::update($request);
-
-            return parent::update($request);
-        }
-        $free_time_id = $request->get('free_time_id');
-        $schedule_time = \app\common\model\TeacherScheduleTime::where(['id' => $free_time_id])->with(['teacher'])->findOrEmpty()->toArray();
-        //课程
-        $project = Subject::order('sort desc, id asc')->select()->toArray();
-        //学生
-        $student = Student::order('id asc')->field('id,account,student_name')->select()->toArray();
-
-        return view('teacher-schedule-time/schedule_time_setting', ['schedule_time' => $schedule_time, 'project' => $project, 'student' => $student]);
-    }
 
     /**
      * @desc 时间列表

plugin/admin/app/model/StudentSchedule.php

@@ -11,9 +11,13 @@ use plugin\admin\app\model\Base;
  * @property mixed $teacher_schedule_time_detail 排课详情
  * @property integer $teacher_id 教师
  * @property integer $subject_id 学科
- * @property string $date_time 课程时间
+ * @property string $date 日期
- * @property string $date_start_time 课程开始时间
+ * @property string $time 时间段
- * @property string $date_end_time 课程结束时间
+ * @property mixed $hour 课时
+ * @property string $start_time 课程开始时间
+ * @property string $end_time 课程结束时间
+ * @property string $month 月份
+ * @property integer $is_public 是否发布0:未发布 1:已发布
  * @property mixed $created_at 创建时间
  * @property string $updated_at 更新时间
  * @property string $deleted_at

plugin/admin/app/view/student-schedule/index.html

@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html lang="zh-cn">
 <head>
@@ -18,8 +17,12 @@
                 <label class="layui-form-label">学生</label>
                 <div class="layui-input-block">
                     <div class="layui-input-block">
-                                <input type="hidden" autocomplete="off" name="student_id[]" value="like" class="layui-input inline-block">
+                        <select lay-search="" name="student_id">
-                                <input type="text" autocomplete="off" name="student_id[]" class="layui-input">
+                            <option value="">请选择或搜索学生</option>
+                            {foreach $student as $item}
+                            <option value="{$item['id']}">{$item['student_name']}</option>
+                            {/foreach}
+                        </select>
                     </div>
                 </div>
             </div>
@@ -27,24 +30,56 @@
             <div class="layui-form-item">
                 <label class="layui-form-label">教师</label>
                 <div class="layui-input-block">
+                    <select lay-search="" name="teacher_id">
+                        <option value="">请选择或搜索学生</option>
+                        {foreach $teacher as $item}
+                        <option value="{$item['id']}">{$item['teacher_name']}</option>
+                        {/foreach}
+                    </select>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">课程</label>
                 <div class="layui-input-block">
-                                <input type="hidden" autocomplete="off" name="teacher_id[]" value="like" class="layui-input inline-block">
+                    <select lay-search="" name="subject_id">
-                                <input type="text" autocomplete="off" name="teacher_id[]" class="layui-input">
+                        <option value="">请选择或搜索课程</option>
+                        {foreach $subject as $item}
+                        <option value="{$item['id']}">{$item['english_name']} - {$item['subject_name']}</option>
+                        {/foreach}
+                    </select>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">日期</label>
+                <div class="layui-input-block">
+                    <div class="layui-input-block" id="date">
+                        <input type="text" autocomplete="off" name="date[]" id="date-date-start"
+                               class="layui-input inline-block" placeholder="开始时间">
+                        -
+                        <input type="text" autocomplete="off" name="date[]" id="date-date-end"
+                               class="layui-input inline-block" placeholder="结束时间">
                     </div>
                 </div>
             </div>
 
             <div class="layui-form-item">
-                        <label class="layui-form-label">学科</label>
+                <label class="layui-form-label">月份</label>
                 <div class="layui-input-block">
-                            <input type="text" name="subject_id" value="" class="layui-input">
+                    <input type="text" autocomplete="off" name="month" id="date-month" value="" class="layui-input">
                 </div>
             </div>
 
             <div class="layui-form-item">
-                        <label class="layui-form-label">课程时间</label>
+                <label class="layui-form-label">是否发布</label>
                 <div class="layui-input-block">
-                            <input type="text" name="date_time" id="date_time" autocomplete="off" class="layui-input">
+                    <!--                            <div name="is_publish" id="is_publish" value="" ></div>-->
+                    <select lay-search="" name="is_publish">
+                        <option value="">请选择发布状态</option>
+                        <option value="1">已发布</option>
+                        <option value="0">未发布</option>
+                    </select>
                 </div>
             </div>
 
@@ -74,18 +109,26 @@
 
 <!-- 表格顶部工具栏 -->
 <script type="text/html" id="table-toolbar">
-            <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="app.admin.studentschedule.insert">
+    <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="publish"
-                <i class="layui-icon layui-icon-add-1"></i>新增
+            permission="app.admin.studentschedule.insert">
+        <i class="layui-icon layui-icon-up"></i>发布
     </button>
-            <button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove" permission="app.admin.studentschedule.delete">
+    <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="unpublished"
+            permission="app.admin.studentschedule.insert">
+        <i class="layui-icon layui-icon-down"></i>取消发布
+    </button>
+    <button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove"
+            permission="app.admin.studentschedule.delete">
         <i class="layui-icon layui-icon-delete"></i>删除
     </button>
 </script>
 
 <!-- 表格行工具栏 -->
 <script type="text/html" id="table-bar">
-            <button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.studentschedule.update">编辑</button>
+    <!--            <button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.studentschedule.update">编辑</button>-->
-            <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.studentschedule.delete">删除</button>
+    <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.studentschedule.delete">
+        删除
+    </button>
 </script>
 
 <script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
@@ -103,13 +146,37 @@
     const INSERT_URL = "/app/admin/student-schedule/insert";
     const UPDATE_URL = "/app/admin/student-schedule/update";
 
-            // 字段 课程时间 date_time
+    // 字段 日期 date
     layui.use(["laydate"], function () {
         layui.laydate.render({
-                    elem: "#date_time",
+            elem: "#date",
-            
+            range: ["#date-date-start", "#date-date-end"],
+            type: "date",
         });
     })
+    // 字段 日期 date
+    layui.use(["laydate"], function () {
+        layui.laydate.render({
+            elem: "#date-month",
+            type: "month",
+        });
+    })
+
+    // 字段 是否发布0:未发布 1:已发布 is_public
+    layui.use(["jquery", "xmSelect"], function () {
+        let value = layui.$("#is_publish").attr("value");
+        let initValue = value ? value.split(",") : [];
+        layui.xmSelect.render({
+            el: "#is_publish",
+            name: "is_publish",
+            filterable: true,
+            initValue: initValue,
+            data: [{"value": "1", "name": "是"}, {"value": "0", "name": "否"}],
+            model: {"icon": "hidden", "label": {"type": "text"}},
+            clickClose: true,
+            radio: true,
+        })
+    });
 
     // 表格渲染
     layui.use(["table", "form", "common", "popup", "util"], function () {
@@ -129,28 +196,65 @@
                 field: "id",
             }, {
                 title: "学生", align: "center",
-						field: "student_id",
+                field: "student_name",
             }, {
                 title: "教师排课id", align: "center",
                 field: "teacher_schedule_time_id",
+                hide: true
             }, {
                 title: "排课详情", align: "center",
                 field: "teacher_schedule_time_detail",
+                hide: true
             }, {
                 title: "教师", align: "center",
-						field: "teacher_id",
+                field: "teacher_name",
             }, {
                 title: "学科", align: "center",
-						field: "subject_id",
+                field: "subject_name",
             }, {
-						title: "课程时间",align: "center",
+                title: "日期", align: "center",
-						field: "date_time",
+                field: "date",
+            }, {
+                title: "时间段", align: "center",
+                field: "time",
+            }, {
+                title: "课时", align: "center",
+                field: "hour",
             }, {
                 title: "课程开始时间", align: "center",
-						field: "date_start_time",
+                field: "start_time",
+                hide: true
             }, {
                 title: "课程结束时间", align: "center",
-						field: "date_end_time",
+                field: "end_time",
+                hide: true
+            }, {
+                title: "月份", align: "center",
+                field: "month",
+            }, {
+                title: "是否发布", align: "center",
+                field: "is_publish",
+                templet: function (d) {
+                    let field = "is_publish";
+                    form.on("switch(" + field + ")", function (data) {
+                        let load = layer.load();
+                        let postData = {};
+                        postData[field] = data.elem.checked ? 1 : 0;
+                        postData[PRIMARY_KEY] = this.value;
+                        $.post(UPDATE_API, postData, function (res) {
+                            layer.close(load);
+                            if (res.code) {
+                                return layui.popup.failure(res.msg, function () {
+                                    data.elem.checked = !data.elem.checked;
+                                    form.render();
+                                });
+                            }
+                            return layui.popup.success("操作成功");
+                        })
+                    });
+                    let checked = d[field] === 1 ? "checked" : "";
+                    return '<input type="checkbox" value="' + util.escape(d[PRIMARY_KEY]) + '" lay-filter="' + util.escape(field) + '" lay-skin="switch" lay-text="' + util.escape('') + '" ' + checked + '/>';
+                }
             }, {
                 title: "创建时间", align: "center",
                 field: "created_at",
@@ -205,6 +309,10 @@
         table.on("toolbar(data-table)", function (obj) {
             if (obj.event === "add") {
                 add();
+            } else if (obj.event === "publish") {
+                publish(obj, 1);
+            } else if (obj.event === "unpublished") {
+                publish(obj, 0);
             } else if (obj.event === "refresh") {
                 refreshTable();
             } else if (obj.event === "batchRemove") {
@@ -277,6 +385,44 @@
             });
         }
 
+        // 删除多行
+        let publish = function (obj, status) {
+            let checkIds = common.checkField(obj, PRIMARY_KEY);
+            if (checkIds === "") {
+                layui.popup.warning("未选中数据");
+                return false;
+            }
+            let ids = checkIds;
+            // doRemove(checkIds.split(","));
+            let data = {ids: checkIds.split(","), status: status};
+            let msg = '';
+            if (status) {
+                msg = '确定批量【发布】学生课表?';
+            } else {
+                msg = '确定批量【取消发布】学生课表?';
+            }
+            layer.confirm(msg, {
+                icon: 3,
+                title: "提示"
+            }, function (index) {
+                layer.close(index);
+                let loading = layer.load();
+                $.ajax({
+                    url: '/app/admin/studentSchedule/changePublishStatus',
+                    data: data,
+                    dataType: "json",
+                    type: "post",
+                    success: function (res) {
+                        layer.close(loading);
+                        if (res.code) {
+                            return layui.popup.failure(res.msg);
+                        }
+                        return layui.popup.success("操作成功", refreshTable);
+                    }
+                })
+            });
+        }
+
         // 删除一行
         let remove = function (obj) {
             return doRemove(obj.data[PRIMARY_KEY]);

plugin/admin/app/view/student-schedule/insert.html

@@ -50,23 +50,52 @@
                     </div>
                     
                     <div class="layui-form-item">
-                        <label class="layui-form-label">课程时间</label>
+                        <label class="layui-form-label">日期</label>
                         <div class="layui-input-block">
-                            <input type="text" name="date_time" id="date_time" autocomplete="off" class="layui-input">
+                            <input type="text" name="date" id="date" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">时间段</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="time" value="" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">课时</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="hour" value="0.00" class="layui-input">
                         </div>
                     </div>
                     
                     <div class="layui-form-item">
                         <label class="layui-form-label">课程开始时间</label>
                         <div class="layui-input-block">
-                            <input type="text" name="date_start_time" id="date_start_time" autocomplete="off" class="layui-input">
+                            <input type="text" name="start_time" id="start_time" autocomplete="off" class="layui-input">
                         </div>
                     </div>
                     
                     <div class="layui-form-item">
                         <label class="layui-form-label">课程结束时间</label>
                         <div class="layui-input-block">
-                            <input type="text" name="date_end_time" id="date_end_time" autocomplete="off" class="layui-input">
+                            <input type="text" name="end_time" id="end_time" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">月份</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="month" value="" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">是否发布0:未发布 1:已发布</label>
+                        <div class="layui-input-block">
+                            <input type="checkbox" id="is_public" lay-filter="is_public" lay-skin="switch" />
+                            <input type="text" style="display:none" name="is_public" value="0" />
                         </div>
                     </div>
                     
@@ -97,30 +126,39 @@
             // 相关接口
             const INSERT_API = "/app/admin/student-schedule/insert";
             
-            // 字段 课程时间 date_time
+            // 字段 日期 date
             layui.use(["laydate"], function() {
                 layui.laydate.render({
-                    elem: "#date_time",
+                    elem: "#date",
-            
-                });
-            })
-            
-            // 字段 课程开始时间 date_start_time
-            layui.use(["laydate"], function() {
-                layui.laydate.render({
-                    elem: "#date_start_time",
                     type: "datetime",
                 });
             })
             
-            // 字段 课程结束时间 date_end_time
+            // 字段 课程开始时间 start_time
             layui.use(["laydate"], function() {
                 layui.laydate.render({
-                    elem: "#date_end_time",
+                    elem: "#start_time",
                     type: "datetime",
                 });
             })
             
+            // 字段 课程结束时间 end_time
+            layui.use(["laydate"], function() {
+                layui.laydate.render({
+                    elem: "#end_time",
+                    type: "datetime",
+                });
+            })
+            
+            // 字段 是否发布0:未发布 1:已发布 is_public
+            layui.use(["form"], function() {
+                layui.$("#is_public").attr("checked", layui.$('input[name="is_public"]').val() != 0);
+                layui.form.render();
+                layui.form.on("switch(is_public)", function(data) {
+                    layui.$('input[name="is_public"]').val(this.checked ? 1 : 0);
+                });
+            })
+            
             //提交事件
             layui.use(["form", "popup"], function () {
                 // 字段验证允许为空

plugin/admin/app/view/student-schedule/update.html

@@ -51,23 +51,52 @@
                     </div>
                     
                     <div class="layui-form-item">
-                        <label class="layui-form-label">课程时间</label>
+                        <label class="layui-form-label">日期</label>
                         <div class="layui-input-block">
-                            <input type="text" name="date_time" id="date_time" autocomplete="off" class="layui-input">
+                            <input type="text" name="date" id="date" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">时间段</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="time" value="" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">课时</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="hour" value="" class="layui-input">
                         </div>
                     </div>
                     
                     <div class="layui-form-item">
                         <label class="layui-form-label">课程开始时间</label>
                         <div class="layui-input-block">
-                            <input type="text" name="date_start_time" id="date_start_time" autocomplete="off" class="layui-input">
+                            <input type="text" name="start_time" id="start_time" autocomplete="off" class="layui-input">
                         </div>
                     </div>
                     
                     <div class="layui-form-item">
                         <label class="layui-form-label">课程结束时间</label>
                         <div class="layui-input-block">
-                            <input type="text" name="date_end_time" id="date_end_time" autocomplete="off" class="layui-input">
+                            <input type="text" name="end_time" id="end_time" autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">月份</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="month" value="" class="layui-input">
+                        </div>
+                    </div>
+                    
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">是否发布0:未发布 1:已发布</label>
+                        <div class="layui-input-block">
+                            <input type="checkbox" id="is_public" lay-filter="is_public" lay-skin="switch" />
+                            <input type="text" style="display:none" name="is_public" value="0" />
                         </div>
                     </div>
                     
@@ -123,30 +152,39 @@
                             }
                         });
                         
-                        // 字段 课程时间 date_time
+                        // 字段 日期 date
                         layui.use(["laydate"], function() {
                             layui.laydate.render({
-                                elem: "#date_time",
+                                elem: "#date",
-                        
-                            });
-                        })
-                        
-                        // 字段 课程开始时间 date_start_time
-                        layui.use(["laydate"], function() {
-                            layui.laydate.render({
-                                elem: "#date_start_time",
                                 type: "datetime",
                             });
                         })
                         
-                        // 字段 课程结束时间 date_end_time
+                        // 字段 课程开始时间 start_time
                         layui.use(["laydate"], function() {
                             layui.laydate.render({
-                                elem: "#date_end_time",
+                                elem: "#start_time",
                                 type: "datetime",
                             });
                         })
                         
+                        // 字段 课程结束时间 end_time
+                        layui.use(["laydate"], function() {
+                            layui.laydate.render({
+                                elem: "#end_time",
+                                type: "datetime",
+                            });
+                        })
+                        
+                        // 字段 是否发布0:未发布 1:已发布 is_public
+                        layui.use(["form"], function() {
+                            layui.$("#is_public").attr("checked", layui.$('input[name="is_public"]').val() != 0);
+                            layui.form.render();
+                            layui.form.on("switch(is_public)", function(data) {
+                                layui.$('input[name="is_public"]').val(this.checked ? 1 : 0);
+                            });
+                        })
+                        
                         
                         // ajax返回失败
                         if (res.code) {

plugin/admin/app/view/student/index.html

@@ -1,4 +1,3 @@
-
 <!DOCTYPE html>
 <html lang="zh-cn">
 <head>
@@ -32,7 +31,9 @@
 <!-- 表格行工具栏 -->
 <script type="text/html" id="table-bar">
     <button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.student.update">编辑</button>
-            <button class="pear-btn pear-btn-xs tool-btn" lay-event="rest_password" permission="app.admin.teacher.update">重置密码</button>
+    <button class="pear-btn pear-btn-xs tool-btn" lay-event="rest_password" permission="app.admin.teacher.update">
+        重置密码
+    </button>
     <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.student.delete">删除</button>
 </script>
 

plugin/admin/app/view/teacher-schedule-time/schedule_time_setting.html

@@ -14,7 +14,6 @@
 
     <div class="mainBox">
         <div class="main-container mr-5">
-
             <div class="layui-form-item">
                 <label class="layui-form-label">教师</label>
                 <div class="layui-input-block">
@@ -76,12 +75,10 @@
                 <label class="layui-form-label">学生</label>
                 <div class="layui-input-block">
                     {foreach $student as $item}
-                    <input type="checkbox" name="student_id[]" value="{$item['id']}" title="{$item['student_name']}" lay-skin="tag" lay-filter="check_student">
+                    <input type="checkbox" name="student_id[]"  title="{$item['student_name']}" lay-skin="tag" lay-filter="check_student" {if in_array($item['id'], $student_schedule_id)} checked {/if} value="{$item['id']}">
                     {/foreach}
                 </div>
             </div>
-
-
         </div>
     </div>
 
@@ -114,14 +111,15 @@
     layui.use(["form", "util", "popup"], function () {
         let $ = layui.$;
         let form = layui.form;
-
+        form.render()
 
         form.on('checkbox(check_student)', function(data){
-
             var elem = data.elem; // 获得 checkbox 原始 DOM 对象
+            var othis = data.othis;
             var type = elem.checked ? 'add' : 'remove'; // 获得 checkbox 选中状态
             var student_id = elem.value; // 获得 checkbox 值
             let teacher_schedule_time_id = "{$schedule_time['id']}";
+            var that = this;
 
             layui.$.ajax({
                 url: '/app/admin/studentSchedule/addStudentSchedule',
@@ -129,8 +127,13 @@
                 dateType: "json",
                 data: {student_id: student_id, type: type, teacher_schedule_time_id: teacher_schedule_time_id},
                 success: function (res) {
+
+                    console.log(111,othis.prop('checked'))
                     if (res.code) {
-                        return layui.popup.failure(res.msg);
+                        $(that).prop("checked", false)
+                        form.render()
+                        return layui.popup.failure(res.msg, function () {
+                        });
                     }
                     return layui.popup.success("操作成功", function () {
                         // parent.refreshTable();

plugin/admin/app/view/teacher/schedule_time_setting.html

@@ -0,0 +1,188 @@
+<!DOCTYPE html>
+<html lang="zh-cn">
+<head>
+    <meta charset="UTF-8">
+    <title>更新页面</title>
+    <link rel="stylesheet" href="/app/admin/component/pear/css/pear.css"/>
+    <link rel="stylesheet" href="/app/admin/component/jsoneditor/css/jsoneditor.css"/>
+    <link rel="stylesheet" href="/app/admin/admin/css/reset.css"/>
+
+</head>
+<body>
+
+<form class="layui-form">
+
+    <div class="mainBox">
+        <div class="main-container mr-5">
+            <div class="layui-form-item">
+                <label class="layui-form-label">教师</label>
+                <div class="layui-input-block">
+                    <input type="text" name="teacher_name" value="{$schedule_time['teacher_name']}" disabled class="layui-input">
+                    <input type="hidden" name="teacher_id" value="{$schedule_time['teacher_id']}" class="layui-input">
+                    <input type="hidden" name="id" value="{$schedule_time['id']}" class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">月份</label>
+                <div class="layui-input-block">
+                    <input type="text" name="month" value="{$schedule_time['month']}" disabled class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">日期</label>
+                <div class="layui-input-block">
+                    <input type="text" name="date" value="{$schedule_time['date']}" disabled class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">时间</label>
+                <div class="layui-input-block">
+                    <input type="text" name="time" value="{$schedule_time['time']}" disabled class="layui-input">
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">课时/小时</label>
+                <div class="layui-input-block">
+                    <input type="text" name="hour" value="{$schedule_time['hour']}" disabled class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">是否发布</label>
+                <div class="layui-input-block">
+                    <input type="radio" disabled name="is_publish" value="0" title="未发布" {if($schedule_time['is_publish'] == 0)}  checked {/if}>
+                    <input type="radio" disabled name="is_publish" value="1" title="发布" {if($schedule_time['is_publish'] == 1)}  checked {/if}>
+<!--                    <input type="checkbox" name="is_publish" title="发布|未发布" lay-skin="switch" value="1"  { if($schedule_time['is_publish'] == 1)}  checked {/if} >-->
+<!--                    <input type="text" name="hour" value="{$schedule_time['hour']}" disabled class="layui-input">-->
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">课程</label>
+                <div class="layui-input-block">
+                    <select lay-search name="subject_id" lay-verify="require" disabled>
+                        <option value="0">请选择</option>
+                        {foreach $project as $item}
+                        <option value="{$item['id']}" {if $schedule_time['subject_id'] == $item['id'] } selected {/if}>{$item['subject_name']}</option>
+                        {/foreach}
+                    </select>
+                </div>
+            </div>
+
+            <div class="layui-form-item">
+                <label class="layui-form-label">学生</label>
+                <div class="layui-input-block">
+                    {foreach $student as $item}
+                    <input type="checkbox" name="student_id[]"  title="{$item['student_name']}" lay-skin="tag" lay-filter="check_student" {if in_array($item['id'], $student_schedule_id)} checked {/if} value="{$item['id']}">
+                    {/foreach}
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="bottom">
+        <div class="button-container">
+            <button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="save">
+                提交
+            </button>
+            <button type="reset" class="pear-btn pear-btn-md">
+                重置
+            </button>
+        </div>
+    </div>
+
+</form>
+
+<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
+<script src="/app/admin/component/pear/pear.js"></script>
+<script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
+<script src="/app/admin/admin/js/permission.js"></script>
+
+<script>
+
+    // 相关接口
+    const PRIMARY_KEY = "id";
+    const SELECT_API = "/app/admin/teacher-schedule-time/scheduleTime" + location.search;
+    const UPDATE_API = "/app/admin/teacher-schedule-time/update";
+
+    // 获取数据库记录
+    layui.use(["form", "util", "popup"], function () {
+        let $ = layui.$;
+        let form = layui.form;
+        form.render()
+
+        form.on('checkbox(check_student)', function(data){
+            var elem = data.elem; // 获得 checkbox 原始 DOM 对象
+            var othis = data.othis;
+            var type = elem.checked ? 'add' : 'remove'; // 获得 checkbox 选中状态
+            var student_id = elem.value; // 获得 checkbox 值
+            let teacher_schedule_time_id = "{$schedule_time['id']}";
+            var that = this;
+
+            layui.$.ajax({
+                url: '/app/admin/studentSchedule/addStudentSchedule',
+                type: "POST",
+                dateType: "json",
+                data: {student_id: student_id, type: type, teacher_schedule_time_id: teacher_schedule_time_id},
+                success: function (res) {
+
+                    console.log(111,othis.prop('checked'))
+                    if (res.code) {
+                        $(that).prop("checked", false)
+                        form.render()
+                        return layui.popup.failure(res.msg, function () {
+                        });
+                    }
+                    return layui.popup.success("操作成功", function () {
+                        // parent.refreshTable();
+                        // parent.refreshTable();
+                        // parent.location.reload();
+                        // parent.layer.close(parent.layer.getFrameIndex(window.name));
+                    });
+                }
+            });
+        });
+    });
+
+
+    //提交事件
+    layui.use(["form", "popup"], function () {
+        // 字段验证允许为空
+        layui.form.verify({
+            phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"],
+            email: [/(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/, "邮箱格式不正确"],
+            url: [/(^$)|(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/, "链接格式不正确"],
+            number: [/(^$)|^\d+$/, '只能填写数字'],
+            date: [/(^$)|^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/, "日期格式不正确"],
+            identity: [/(^$)|(^\d{15}$)|(^\d{17}(x|X|\d)$)/, "请输入正确的身份证号"]
+        });
+        layui.form.on("submit(save)", function (data) {
+            // data.field[PRIMARY_KEY] = layui.url().search[PRIMARY_KEY];
+            layui.$.ajax({
+                url: '/app/admin/teacherScheduleTime/scheduleTimeSet',
+                type: "POST",
+                dateType: "json",
+                data: data.field,
+                success: function (res) {
+                    if (res.code) {
+                        return layui.popup.failure(res.msg);
+                    }
+                    return layui.popup.success("操作成功", function () {
+                        // parent.refreshTable();
+                        parent.refreshTable();
+                        parent.location.reload();
+                        parent.layer.close(parent.layer.getFrameIndex(window.name));
+                    });
+                }
+            });
+            return false;
+        });
+    });
+
+</script>
+
+</body>
+
+</html>

plugin/admin/app/view/teacher/teacher_schedule_time.html

@@ -90,30 +90,8 @@
                     </div>
                     <div id='external-events-list'>
 
-                        <!--                        <div class='fc-event fc-h-event fc-daygrid-event fc-daygrid-block-event'>-->
-
-                        <!--                            <span class="layui-badge-dot layui-bg-danger">未排课</span>-->
-                        <!--                            <span class="layui-badge-dot layui-bg-orange">已排课，未发布</span>-->
-                        <!--                            <span class="layui-badge-dot layui-bg-green">已发布</span>-->
-                        <!--                        </div>-->
-                        <!--                        <div class='fc-event fc-h-event fc-daygrid-event fc-daygrid-block-event'>-->
-                        <!--                            <div class='fc-event-main'>事件 2</div>-->
-                        <!--                        </div>-->
-                        <!--                        <div class='fc-event fc-h-event fc-daygrid-event fc-daygrid-block-event'>-->
-                        <!--                            <div class='fc-event-main'>事件 3</div>-->
-                        <!--                        </div>-->
-                        <!--                        <div class='fc-event fc-h-event fc-daygrid-event fc-daygrid-block-event'>-->
-                        <!--                            <div class='fc-event-main'>事件 4</div>-->
-                        <!--                        </div>-->
-                        <!--                        <div class='fc-event fc-h-event fc-daygrid-event fc-daygrid-block-event'>-->
-                        <!--                            <div class='fc-event-main'>事件 5</div>-->
-                        <!--                        </div>-->
                     </div>
 
-                    <!--                    <p>-->
-                    <!--                        <input type='checkbox' id='drop-remove'/>-->
-                    <!--                        <label for='drop-remove'>移动后清除</label>-->
-                    <!--                    </p>-->
                 </div>
 
                 <div id='calendar' style="height: 650px;width: 750px;"></div>
@@ -205,11 +183,11 @@
                 layer.open({
                     type: 2,
                     fix: false,
-                    title: "排课",
+                    title: "学生排课",
                     shade: 0.1,
                     maxmin: true,
                     area: ["750px", "700px"],
-                    content: "/app/admin/teacherScheduleTime/scheduleTimeSet?free_time_id=" + free_time_id
+                    content: "/app/admin/teacher/scheduleTimeSet?free_time_id=" + free_time_id
                 });
                 // if (confirm('您确定要删除此事件吗?')) {
                 //     arg.event.remove()