diff --git a/plugin/admin/app/controller/TeacherController.php b/plugin/admin/app/controller/TeacherController.php
index 26498b1..a24105d 100644
--- a/plugin/admin/app/controller/TeacherController.php
+++ b/plugin/admin/app/controller/TeacherController.php
@@ -168,6 +168,25 @@ class TeacherController extends Crud
     }
 
 
+    public function getTeacherTimeZone(Request $request)
+    {
+        try {
+            $teacher = \app\common\model\Teacher::where(['id' => $request->post('id')])->findOrEmpty();
+
+            return json([
+                'code' => ResponseCode::WEB_API_SUCCESS,
+                'data' => $teacher,
+                'msg' => 'success',
+            ]);
+        } catch (Exception $e) {
+            return json([
+                'code' => ResponseCode::WEB_API_FAIL,
+                'msg' => $e->getMessage()
+            ]);
+        }
+    }
+
+
     /**
      * @desc 查看教师日程安排
      * @param Request $request
@@ -399,7 +418,7 @@ class TeacherController extends Crud
                     $account = trim($currSheet->getCell('A' . $row)->getValue() ?: '');
                     $teacher_name = trim($currSheet->getCell('B' . $row)->getValue() ?: '');
 
-                    if($account && $teacher_name){
+                    if ($account && $teacher_name) {
 
                         $password = trim($currSheet->getCell('C' . $row)->getValue() ?: '');
                         $salt = random_str(16);
diff --git a/plugin/admin/app/controller/TeacherFreeTimeController.php b/plugin/admin/app/controller/TeacherFreeTimeController.php
index 5c25e44..5548852 100644
--- a/plugin/admin/app/controller/TeacherFreeTimeController.php
+++ b/plugin/admin/app/controller/TeacherFreeTimeController.php
@@ -14,6 +14,7 @@ use plugin\admin\app\model\TeacherFreeTime;
 use plugin\admin\app\controller\Crud;
 use support\exception\BusinessException;
 use think\Exception;
+use DateTime;
 
 /**
  * 空闲时间
@@ -44,10 +45,10 @@ class TeacherFreeTimeController extends Crud
             if (isset($data['teacher_id']) && !empty($data['teacher_id'])) {
                 $free_time->where('teacher_id', $data['teacher_id']);
             }
-            if(isset($data['month']) && !empty($data['month'])){
+            if (isset($data['month']) && !empty($data['month'])) {
                 $free_time->where('month', $data['month']);
             }
-            if(isset($data['date']) && !empty($data['date'])){
+            if (isset($data['date']) && !empty($data['date'])) {
                 $free_time->where('date', $data['date']);
             }
 
@@ -92,9 +93,59 @@ class TeacherFreeTimeController extends Crud
     public function insert(Request $request): Response
     {
         if ($request->method() === 'POST') {
+
+            $postData = $request->post();
+            try {
+                $teacher_free_time = \app\common\model\TeacherFreeTime::where([
+                    'teacher_id' => $postData['teacher_id'],
+                    'date' => $postData['date'],
+                    'month' => $postData['month'],
+                    'time' => $postData['time'],
+                    'en_time' => $postData['en_time'],
+                ])
+                    ->findOrEmpty();
+                if (!$teacher_free_time->isEmpty()) {
+                    throw new Exception('该空闲时间段存在');
+                }
+
+                $time_period = explode('-', $postData['time']);
+                $en_time_period = explode('-', $postData['en_time']);
+                $firstDate = new DateTime($postData['date'] . ' ' . trim($time_period[0]));
+                $secondDate = new DateTime($postData['date'] . ' ' . trim($time_period[1]));
+                $enFirstDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[0]));
+                $enSecondDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[1]));
+
+                \app\common\model\TeacherFreeTime::create([
+                    'teacher_id' => $request->post('teacher_id'),
+                    'date' => $request->post('date'),
+                    'month' => $request->post('month'),
+                    'time' => $request->post('time'),
+                    'en_time' => $request->post('en_time'),
+                    'hour' => $request->post('hour'),
+                    'start_time' => date('Y-m-d H:i:s', $firstDate->getTimestamp()),
+                    'end_time' => date('Y-m-d H:i:s', $secondDate->getTimestamp()),
+                    'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->getTimestamp()),
+                    'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
+                ]);
+
+                return json([
+                    'code' => ResponseCode::WEB_API_SUCCESS,
+                    'msg' => 'success',
+                ]);
+            } catch (Exception $e) {
+                return json([
+                    'code' => ResponseCode::WEB_API_FAIL,
+                    'msg' => $e->getMessage()
+                ]);
+            }
+
             return parent::insert($request);
         }
-        return view('teacher-free-time/insert');
+
+        //所有教师
+        $teacher = \app\common\model\Teacher::order('id desc')->select()->toArray();
+
+        return view('teacher-free-time/insert', ['teacher' => $teacher]);
     }
 
     /**
@@ -106,11 +157,57 @@ class TeacherFreeTimeController extends Crud
     public function update(Request $request): Response
     {
         if ($request->method() === 'POST') {
+
+            try {
+                $postData = $request->post();
+                $teacher_free_time = \app\common\model\TeacherFreeTime::where(['id' => $postData['id']])->findOrEmpty();
+
+                if ($teacher_free_time->isEmpty()) {
+                    throw new Exception('未找到空闲时间');
+                }
+
+                $time_period = explode('-', $postData['time']);
+                $en_time_period = explode('-', $postData['en_time']);
+                $firstDate = new DateTime($postData['date'] . ' ' . trim($time_period[0]));
+                $secondDate = new DateTime($postData['date'] . ' ' . trim($time_period[1]));
+                $enFirstDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[0]));
+                $enSecondDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[1]));
+
+                $teacher_free_time->save([
+                    'teacher_id' => $postData['teacher_id'],
+                    'date' => $postData['date'],
+                    'month' => $postData['month'],
+                    'time' => $postData['time'],
+                    'en_time' => $postData['en_time'],
+                    'hour' => $postData['hour'],
+                    'start_time' => date('Y-m-d H:i:s', $firstDate->getTimestamp()),
+                    'end_time' => date('Y-m-d H:i:s', $secondDate->getTimestamp()),
+                    'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->getTimestamp()),
+                    'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
+                ]);
+
+                return json([
+                    'code' => ResponseCode::WEB_API_SUCCESS,
+                    'msg' => 'success',
+                ]);
+            } catch (Exception $e) {
+                return json([
+                    'code' => ResponseCode::WEB_API_FAIL,
+                    'msg' => $e->getMessage()
+                ]);
+            }
+
+
             return parent::update($request);
         }
-        return view('teacher-free-time/update');
-    }
 
+        $teacher_free_time = \app\common\model\TeacherFreeTime::where(['id' => $request->get('id')])
+            ->with(['teacher'])
+            ->findOrEmpty()->toArray();
+        //获取所有老师
+        $teacher = Teacher::order('id asc')->field('id,teacher_name,account')->select()->toArray();
+        return view('teacher-free-time/update', ['teacher_free_time' => $teacher_free_time, 'teacher' => $teacher]);
+    }
 
 
     /**
@@ -168,7 +265,7 @@ class TeacherFreeTimeController extends Crud
         $data = $request->get();
         $teacher_id = $data['teacher_id'];
         $month = $data['month'];
-        $teacher = \app\common\model\Teacher::where(['id'=>$teacher_id])->findOrEmpty()->toArray();
+        $teacher = \app\common\model\Teacher::where(['id' => $teacher_id])->findOrEmpty()->toArray();
         //获取该老师当前分配学生
 
         return view('teacher/free_time_schedule', ['teacher' => $teacher, 'month' => $month]);
@@ -197,7 +294,7 @@ class TeacherFreeTimeController extends Crud
             foreach ($list as $item) {
                 $title = $item['time'] . '-' . $item['hour'] . '/h';
                 $color = 'red';
-                if(isset($item['teacherScheduleTime']) && !empty($item['teacherScheduleTime'])){
+                if (isset($item['teacherScheduleTime']) && !empty($item['teacherScheduleTime'])) {
                     $color = 'green';
                 }
                 $free_time[] = [
diff --git a/plugin/admin/app/view/teacher-free-time/index.html b/plugin/admin/app/view/teacher-free-time/index.html
index b3506b9..18fced0 100644
--- a/plugin/admin/app/view/teacher-free-time/index.html
+++ b/plugin/admin/app/view/teacher-free-time/index.html
@@ -74,9 +74,9 @@
 
         <!-- 表格顶部工具栏 -->
         <script type="text/html" id="table-toolbar">
-<!--            <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="app.admin.teacherfreetime.insert">-->
-<!--                <i class="layui-icon layui-icon-add-1"></i>新增-->
-<!--            </button>-->
+            <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="app.admin.teacherfreetime.insert">
+                <i class="layui-icon layui-icon-add-1"></i>新增
+            </button>
             <button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove" permission="app.admin.teacherfreetime.delete">
                 <i class="layui-icon layui-icon-delete"></i>删除
             </button>
@@ -285,7 +285,7 @@
                         title: "新增",
                         shade: 0.1,
                         maxmin: true,
-                        area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
+                        area: [common.isModile()?"100%":"750px", common.isModile()?"100%":"650px"],
                         content: INSERT_URL
                     });
                 }
@@ -298,7 +298,7 @@
                         title: "修改",
                         shade: 0.1,
                         maxmin: true,
-                        area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
+                        area: [common.isModile()?"100%":"750px", common.isModile()?"100%":"650px"],
                         content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
                     });
                 }
diff --git a/plugin/admin/app/view/teacher-free-time/insert.html b/plugin/admin/app/view/teacher-free-time/insert.html
index 1813485..f3ba9cb 100644
--- a/plugin/admin/app/view/teacher-free-time/insert.html
+++ b/plugin/admin/app/view/teacher-free-time/insert.html
@@ -13,42 +13,66 @@
 
             <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_id" value="0" class="layui-input">
+<!--                            <input type="text" name="teacher_id" value="0" class="layui-input">-->
+                            <select lay-search="" name="teacher_id" lay-filter="selectTeacher">
+                                <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="text" name="time_zone_name" id="time_zone_name" readonly autocomplete="off" class="layui-input">
+                        </div>
+                    </div>
+                    <div class="layui-form-item">
+                        <label class="layui-form-label">时差/h</label>
+                        <div class="layui-input-block">
+                            <input type="text" name="time_zone_offset" id="time_zone_offset" readonly 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" 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" id="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="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="month" id="month" autocomplete="off" class="layui-input">
+                            <input type="text" name="month" id="month" autocomplete="off" readonly 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="en_time" id="en_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="time" id="time" autocomplete="off" readonly 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" id="hour" value="0.00" class="layui-input">
                         </div>
                     </div>
-                    
                 </div>
             </div>
 
@@ -63,43 +87,125 @@
                     </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 INSERT_API = "/app/admin/teacher-free-time/insert";
-            
+
             // 字段 日期 date
             layui.use(["laydate"], function() {
                 layui.laydate.render({
                     elem: "#date",
-            
+                    done: function (value, date) {
+                        let start_date_time = new Date(date.year, date.month, date.date, date.hours, date.minutes, date.seconds)
+                        let month = date.year + '-' + ((date.month).toString().padStart(2, '0'))
+                        console.log(month)
+                        layui.$('#month').val(month)
+                    }
                 });
             })
-            
+
+
+
             // 字段 时间 time
-            layui.use(["laydate"], function() {
+            layui.use(["laydate", "form"], function() {
+
+                layui.form.on('select(selectTeacher)', function(data){
+                    var elem = data.elem; // 获得 select 原始 DOM 对象
+                    var value = data.value; // 获得被选中的值
+                    var othis = data.othis; // 获得 select 元素被替换后的 jQuery 对象
+
+                    layui.$.ajax({
+                        url: '/app/admin/teacher/getTeacherTimeZone',
+                        type: "POST",
+                        dateType: "json",
+                        data: {id: value},
+                        success: function (res) {
+                            if (!res.code) {
+                                if(!res.data.time_zone_name){
+                                    return layui.popup.failure('为查询到该教师时区信息，请先添加时区信息');
+                                }else{
+                                    layui.$('#time_zone_name').val(res.data.time_zone_name);
+                                    layui.$('#time_zone_offset').val(res.data.time_zone_offset);
+                                }
+                            }
+                        }
+                    });
+
+
+                });
+
                 layui.laydate.render({
-                    elem: "#time",
-                    type: "datetime",
+                    elem: "#en_time",
+                    type: "time",
+                    format: 'HH:mm',
+                    range: '-',
+                    ready: function (date) {
+                        if(layui.$('#time_zone_name').val()){
+                            var layKey = layui.$(this.elem).attr('lay-key');
+                            layui.$('#layui-laydate' + layKey).children().eq(0).find('.layui-laydate-list>li').width('50%').last('li').hide();
+                            layui.$('#layui-laydate' + layKey).children().eq(1).find('.layui-laydate-list>li').width('50%').last('li').hide();
+                        }else{
+                            layui.popup.failure('未查询到该教师时区信息，请先添加时区信息');
+                        }
+
+                    },
+                    done: function (value, date, endDate) {
+
+                        Number.prototype.toFixed = function(d) {
+                            var s = this + "";
+                            if(!d) d = 0;
+                            if(s.indexOf(".") == -1) s += ".";
+                            s += new Array(d + 1).join("0");
+                            if(new RegExp("^(-|\\+)?(\\d+(\\.\\d{0," + (d + 1) + "})?)\\d*$").test(s)) {
+                                var s = "0" + RegExp.$2,
+                                    pm = RegExp.$1,
+                                    a = RegExp.$3.length,
+                                    b = true;
+                                if(a == d + 2) {
+                                    a = s.match(/\d/g);
+                                    if(parseInt(a[a.length - 1]) > 4) {
+                                        for(var i = a.length - 2; i >= 0; i--) {
+                                            a[i] = parseInt(a[i]) + 1;
+                                            if(a[i] == 10) {
+                                                a[i] = 0;
+                                                b = i != 1;
+                                            } else break;
+                                        }
+                                    }
+                                    s = a.join("").replace(new RegExp("(\\d+)(\\d{" + d + "})\\d$"), "$1.$2");
+
+                                }
+                                if(b) s = s.substr(1);
+                                return(pm + s).replace(/\.$/, "");
+                            }
+                            return this + "";
+
+                        };
+
+                        if(layui.$('#time_zone_name').val()){
+                            let time_zone_offset = layui.$('#time_zone_offset').val()
+                            let start_date_time = new Date(date.year, date.month, date.date, parseInt(date.hours + parseInt(time_zone_offset)), date.minutes, date.seconds)
+                            let start_time = start_date_time.toLocaleTimeString([], {hour: "2-digit", minute: "2-digit"})
+                            let end_date_time = new Date(endDate.year, endDate.month, endDate.date, parseInt(endDate.hours + parseInt(time_zone_offset)), endDate.minutes, endDate.seconds)
+                            let end_time = end_date_time.toLocaleTimeString([], {hour: "2-digit", minute: "2-digit"})
+                            layui.$('#time').val(start_time + ' - ' + end_time)
+                            //课时
+                            let hour = (Math.round((end_date_time.valueOf() - start_date_time.valueOf()) / 1000 / 60 / 60)).toFixed(2);  //小时
+                            layui.$('#hour').val(hour)
+                        }
+                    }
                 });
             })
-            
-            // 字段 月份 month
-            layui.use(["laydate"], function() {
-                layui.laydate.render({
-                    elem: "#month",
-            
-                });
-            })
-            
+
+
             //提交事件
             layui.use(["form", "popup"], function () {
                 // 字段验证允许为空
@@ -131,6 +237,7 @@
                 });
             });
 
+
         </script>
 
     </body>
diff --git a/plugin/admin/app/view/teacher-free-time/update.html b/plugin/admin/app/view/teacher-free-time/update.html
index 44f4ea2..ab00ed5 100644
--- a/plugin/admin/app/view/teacher-free-time/update.html
+++ b/plugin/admin/app/view/teacher-free-time/update.html
@@ -1,175 +1,246 @@
 <!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>
+<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"/>
 
-        <form class="layui-form">
+</head>
+<body>
 
-            <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_id" 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" 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" id="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="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="month" id="month" autocomplete="off" class="layui-input">
-                        </div>
-                    </div>
-                    
+<form class="layui-form" action="">
+
+    <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="hidden" name="id" value="{$teacher_free_time['id']}" class="layui-input">
+                    <select lay-search="" name="teacher_id" lay-filter="selectTeacher">
+                        <option value="">请选择或搜索</option>
+                        {foreach $teacher as $item}
+                        <option value="{$item['id']}" {if $teacher_free_time['teacher_id'] == $item['id']} selected {/if}>{$item['teacher_name']}</option>
+                        {/foreach}
+                    </select>
                 </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 class="layui-form-item">
+                <label class="layui-form-label">时区</label>
+                <div class="layui-input-block">
+                    <input type="text" name="time_zone_name" id="time_zone_name" value="{$teacher_free_time['time_zone_name']}" readonly autocomplete="off"
+                           class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item">
+                <label class="layui-form-label">时差/h</label>
+                <div class="layui-input-block">
+                    <input type="text" name="time_zone_offset" id="time_zone_offset" value="{$teacher_free_time['time_zone_offset']}" readonly 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" id="date" value="{$teacher_free_time['date']}" autocomplete="off" class="layui-input">
                 </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>
+            <div class="layui-form-item">
+                <label class="layui-form-label">月份</label>
+                <div class="layui-input-block">
+                    <input type="text" name="month" id="month" value="{$teacher_free_time['month']}" autocomplete="off" readonly class="layui-input">
+                </div>
+            </div>
 
-            // 相关接口
-            const PRIMARY_KEY = "id";
-            const SELECT_API = "/app/admin/teacher-free-time/select" + location.search;
-            const UPDATE_API = "/app/admin/teacher-free-time/update";
+            <div class="layui-form-item">
+                <label class="layui-form-label">本地时间</label>
+                <div class="layui-input-block">
+                    <input type="text" name="en_time" id="en_time" value="{$teacher_free_time['en_time']}" autocomplete="off" class="layui-input">
+                </div>
+            </div>
 
-            // 获取数据库记录
-            layui.use(["form", "util", "popup"], function () {
-                let $ = layui.$;
-                $.ajax({
-                    url: SELECT_API,
-                    dataType: "json",
-                    success: function (res) {
-                        
-                        // 给表单初始化数据
-                        layui.each(res.data[0], function (key, value) {
-                            let obj = $('*[name="'+key+'"]');
-                            if (key === "password") {
-                                obj.attr("placeholder", "不更新密码请留空");
-                                return;
-                            }
-                            if (typeof obj[0] === "undefined" || !obj[0].nodeName) return;
-                            if (obj[0].nodeName.toLowerCase() === "textarea") {
-                                obj.val(value);
-                            } else {
-                                obj.attr("value", value);
-                                obj[0].value = value;
-                            }
-                        });
-                        
-                        // 字段 日期 date
-                        layui.use(["laydate"], function() {
-                            layui.laydate.render({
-                                elem: "#date",
-                        
-                            });
-                        })
-                        
-                        // 字段 时间 time
-                        layui.use(["laydate"], function() {
-                            layui.laydate.render({
-                                elem: "#time",
-                                type: "datetime",
-                            });
-                        })
-                        
-                        // 字段 月份 month
-                        layui.use(["laydate"], function() {
-                            layui.laydate.render({
-                                elem: "#month",
-                        
-                            });
-                        })
-                        
-                        
-                        // ajax返回失败
-                        if (res.code) {
-                            layui.popup.failure(res.msg);
+            <div class="layui-form-item">
+                <label class="layui-form-label">中国时间</label>
+                <div class="layui-input-block">
+                    <input type="text" name="time" id="time" value="{$teacher_free_time['time']}" autocomplete="off" readonly 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" id="hour" value="{$teacher_free_time['hour']}" value="0.00" class="layui-input">
+                </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 INSERT_API = "/app/admin/teacher-free-time/update";
+
+    // 字段 日期 date
+    layui.use(["laydate"], function () {
+        layui.laydate.render({
+            elem: "#date",
+            done: function (value, date) {
+                let start_date_time = new Date(date.year, date.month, date.date, date.hours, date.minutes, date.seconds)
+                let month = date.year + '-' + ((date.month).toString().padStart(2, '0'))
+                console.log(month)
+                layui.$('#month').val(month)
+            }
+        });
+    })
+
+
+    // 字段 时间 time
+    layui.use(["laydate", "form"], function () {
+
+        layui.form.on('select(selectTeacher)', function (data) {
+            var elem = data.elem; // 获得 select 原始 DOM 对象
+            var value = data.value; // 获得被选中的值
+            var othis = data.othis; // 获得 select 元素被替换后的 jQuery 对象
+
+            layui.$.ajax({
+                url: '/app/admin/teacher/getTeacherTimeZone',
+                type: "POST",
+                dateType: "json",
+                data: {id: value},
+                success: function (res) {
+                    if (!res.code) {
+                        if (!res.data.time_zone_name) {
+                            return layui.popup.failure('为查询到该教师时区信息，请先添加时区信息');
+                        } else {
+                            layui.$('#time_zone_name').val(res.data.time_zone_name);
+                            layui.$('#time_zone_offset').val(res.data.time_zone_offset);
                         }
-                        
                     }
-                });
+                }
             });
 
-            //提交事件
-            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: UPDATE_API,
-                        type: "POST",
-                        dateType: "json",
-                        data: data.field,
-                        success: function (res) {
-                            if (res.code) {
-                                return layui.popup.failure(res.msg);
+
+        });
+
+        layui.laydate.render({
+            elem: "#en_time",
+            type: "time",
+            format: 'HH:mm',
+            range: '-',
+            ready: function (date) {
+                if (layui.$('#time_zone_name').val()) {
+                    var layKey = layui.$(this.elem).attr('lay-key');
+                    layui.$('#layui-laydate' + layKey).children().eq(0).find('.layui-laydate-list>li').width('50%').last('li').hide();
+                    layui.$('#layui-laydate' + layKey).children().eq(1).find('.layui-laydate-list>li').width('50%').last('li').hide();
+                } else {
+                    layui.popup.failure('未查询到该教师时区信息，请先添加时区信息');
+                }
+
+            },
+            done: function (value, date, endDate) {
+
+                Number.prototype.toFixed = function (d) {
+                    var s = this + "";
+                    if (!d) d = 0;
+                    if (s.indexOf(".") == -1) s += ".";
+                    s += new Array(d + 1).join("0");
+                    if (new RegExp("^(-|\\+)?(\\d+(\\.\\d{0," + (d + 1) + "})?)\\d*$").test(s)) {
+                        var s = "0" + RegExp.$2,
+                            pm = RegExp.$1,
+                            a = RegExp.$3.length,
+                            b = true;
+                        if (a == d + 2) {
+                            a = s.match(/\d/g);
+                            if (parseInt(a[a.length - 1]) > 4) {
+                                for (var i = a.length - 2; i >= 0; i--) {
+                                    a[i] = parseInt(a[i]) + 1;
+                                    if (a[i] == 10) {
+                                        a[i] = 0;
+                                        b = i != 1;
+                                    } else break;
+                                }
                             }
-                            return layui.popup.success("操作成功", function () {
-                                parent.refreshTable();
-                                parent.layer.close(parent.layer.getFrameIndex(window.name));
-                            });
+                            s = a.join("").replace(new RegExp("(\\d+)(\\d{" + d + "})\\d$"), "$1.$2");
+
                         }
+                        if (b) s = s.substr(1);
+                        return (pm + s).replace(/\.$/, "");
+                    }
+                    return this + "";
+
+                };
+
+                if (layui.$('#time_zone_name').val()) {
+                    let time_zone_offset = layui.$('#time_zone_offset').val()
+                    let start_date_time = new Date(date.year, date.month, date.date, parseInt(date.hours + parseInt(time_zone_offset)), date.minutes, date.seconds)
+                    let start_time = start_date_time.toLocaleTimeString([], {hour: "2-digit", minute: "2-digit"})
+                    let end_date_time = new Date(endDate.year, endDate.month, endDate.date, parseInt(endDate.hours + parseInt(time_zone_offset)), endDate.minutes, endDate.seconds)
+                    let end_time = end_date_time.toLocaleTimeString([], {hour: "2-digit", minute: "2-digit"})
+                    layui.$('#time').val(start_time + ' - ' + end_time)
+                    //课时
+                    let hour = (Math.round((end_date_time.valueOf() - start_date_time.valueOf()) / 1000 / 60 / 60)).toFixed(2);  //小时
+                    layui.$('#hour').val(hour)
+                }
+            }
+        });
+    })
+
+
+    //提交事件
+    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) {
+            layui.$.ajax({
+                url: INSERT_API,
+                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.layer.close(parent.layer.getFrameIndex(window.name));
                     });
-                    return false;
-                });
+                }
             });
+            return false;
+        });
+    });
 
-        </script>
 
-    </body>
+</script>
 
+</body>
 </html>