admin/course
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

时间区分中国时间和本地时间

Browse Source
This commit is contained in:
Dai 2025-05-08 17:30:26 +08:00
parent e89b70c3fb
commit f5c7092f1a
13 changed files with 730 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/service/SubjectHomeworkService.php
View File

@ -82,6 +82,7 @@ class SubjectHomeworkService
'teacher_id' => $teacher->id, 'teacher_id' => $teacher->id,
'teacher_schedule_time_id' => $data['teacher_schedule_time_id'], 'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
'date' => $teacher_schedule_time->date, 'date' => $teacher_schedule_time->date,
'en_date' => $teacher_schedule_time->en_date,
'time' => $teacher_schedule_time->time, 'time' => $teacher_schedule_time->time,
'en_time' => $teacher_schedule_time->en_time, 'en_time' => $teacher_schedule_time->en_time,
'hour' => $teacher_schedule_time->hour, 'hour' => $teacher_schedule_time->hour,
@ -90,6 +91,7 @@ class SubjectHomeworkService
'en_start_time' => $teacher_schedule_time->en_start_time, 'en_start_time' => $teacher_schedule_time->en_start_time,
'en_end_time' => $teacher_schedule_time->en_end_time, 'en_end_time' => $teacher_schedule_time->en_end_time,
'month' => $teacher_schedule_time->month, 'month' => $teacher_schedule_time->month,
'en_month' => $teacher_schedule_time->en_month,
'subject_id' => $teacher_schedule_time->subject_id, 'subject_id' => $teacher_schedule_time->subject_id,
'content' => isset($data['content']) ? $data['content'] : '', 'content' => isset($data['content']) ? $data['content'] : '',
'homework_web_url' => isset($data['homework_web_url']) ? $data['homework_web_url'] : '', 'homework_web_url' => isset($data['homework_web_url']) ? $data['homework_web_url'] : '',

49
app/common/service/TeacherFreeTimeService.php
View File

@ -46,14 +46,23 @@ class TeacherFreeTimeService
foreach ($free_time as $item) { foreach ($free_time as $item) {
$free_date = $item['day']; $free_date = $item['day'];
foreach ($item['times'] as $val) { foreach ($item['times'] as $val) {
$time = $val['zh']; $time = $val['zh'];
$en_time = $val['en'];
$time_period = explode('-', $time); $time_period = explode('-', $time);
$en_time_period = explode('-', $en_time);
$firstDate = new DateTime($free_date . ' ' . trim($time_period[0])); $firstDate = new DateTime($free_date . ' ' . trim($time_period[0]));
$secondDate = new DateTime($free_date . ' ' . trim($time_period[1])); $secondDate = new DateTime($free_date . ' ' . trim($time_period[1]));
$en_time = $val['en'];
$en_time_period = explode('-', $en_time);
$enFirstDate = new DateTime($free_date . ' ' . trim($en_time_period[0])); $enFirstDate = new DateTime($free_date . ' ' . trim($en_time_period[0]));
$enSecondDate = new DateTime($free_date . ' ' . trim($en_time_period[1])); $enSecondDate = new DateTime($free_date . ' ' . trim($en_time_period[1]));
//根据时区计算教师国内时间
$start_time = date('Y-m-d H:i:s', strtotime( $teacher['time_zone_offset'] . ' hour', $enFirstDate->getTimestamp()));
$end_time = date('Y-m-d H:i:s', strtotime( $teacher['time_zone_offset'] . ' hour', $enSecondDate->getTimestamp()));
$diff = $secondDate->diff($firstDate); $diff = $secondDate->diff($firstDate);
$h = $diff->h; $h = $diff->h;
$m = round($diff->i / 60, 2); $m = round($diff->i / 60, 2);
@ -61,20 +70,23 @@ class TeacherFreeTimeService
$time = $time_period[0] . ' - ' . $time_period[1]; $time = $time_period[0] . ' - ' . $time_period[1];
$free_data = [ $free_data = [
'teacher_id' => $request->teacher->id, 'teacher_id' => $request->teacher->id,
'date' => $free_date, 'date' => date('Y-m-d', strtotime($start_time)),
'en_date' => $free_date,
'time' => $time, 'time' => $time,
'en_time' => implode(' - ', $en_time_period), 'en_time' => implode(' - ', $en_time_period),
'hour' => $hour, 'hour' => $hour,
'start_time' => date('Y-m-d H:i:s', $firstDate->getTimestamp()), 'start_time' => $start_time,
'end_time' => date('Y-m-d H:i:s', $secondDate->getTimestamp()), 'end_time' => $end_time,
'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->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()), 'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
'month' => date('Y-m', strtotime($free_date)), 'en_month' => date('Y-m', strtotime($free_date)),
'month' => date('Y-m', strtotime($start_time)),
'time_zone_id' => $teacher['time_zone_id'], 'time_zone_id' => $teacher['time_zone_id'],
'time_zone_name' => $teacher['time_zone_name'], 'time_zone_name' => $teacher['time_zone_name'],
'time_zone_offset' => $teacher['time_zone_offset'], 'time_zone_offset' => $teacher['time_zone_offset'],
]; ];
//判断是否已经存在 //判断是否已经存在
$exit = TeacherFreeTime::where($free_data)->findOrEmpty(); $exit = TeacherFreeTime::where($free_data)->findOrEmpty();
@ -204,6 +216,11 @@ class TeacherFreeTimeService
if ($teacher_free_time->isEmpty()) { if ($teacher_free_time->isEmpty()) {
throw new Exception('未找到数据'); throw new Exception('未找到数据');
} }
// $teacher = Teacher::where(['id' => $request->teacher->id])->findOrEmpty();
//
// if ($teacher->isEmpty()) {
// throw new Exception('未找到教师信息，设置失败');
// }
$data = $request->post(); $data = $request->post();
@ -223,17 +240,31 @@ class TeacherFreeTimeService
$en_time_period = explode('-', $en_time); $en_time_period = explode('-', $en_time);
$firstDate = new DateTime($free_date . ' ' . trim($time_period[0])); $firstDate = new DateTime($free_date . ' ' . trim($time_period[0]));
$secondDate = new DateTime($free_date . ' ' . trim($time_period[1])); $secondDate = new DateTime($free_date . ' ' . trim($time_period[1]));
$diff = $secondDate->diff($firstDate); $enFirstDate = new DateTime($free_date . ' ' . trim($en_time_period[0]));
$enSecondDate = new DateTime($free_date . ' ' . trim($en_time_period[1]));
//根据时区计算教师国内时间
$start_time = date('Y-m-d H:i:s', strtotime( $teacher_free_time['time_zone_offset'] . ' hour', $enFirstDate->getTimestamp()));
$end_time = date('Y-m-d H:i:s', strtotime( $teacher_free_time['time_zone_offset'] . ' hour', $enSecondDate->getTimestamp()));
$diff = $enSecondDate->diff($enFirstDate);
$h = $diff->h; $h = $diff->h;
$m = round($diff->i / 60, 2); $m = round($diff->i / 60, 2);
$hour = round($h + $m, 2); $hour = round($h + $m, 2);
$time = $time_period[0] . ' - ' . $time_period[1]; $time = $time_period[0] . ' - ' . $time_period[1];
$teacher_free_time->save([ $teacher_free_time->save([
'date' => $free_date, 'date' => date('Y-m-d', strtotime($start_time)),
'en_date' => $free_date,
'time' => $time, 'time' => $time,
'hour' => $hour,
'en_time' => implode(' - ', $en_time_period), 'en_time' => implode(' - ', $en_time_period),
'hour' => $hour,
'start_time' => $start_time,
'end_time' => $end_time,
'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->getTimestamp()),
'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
'en_month' => date('Y-m', strtotime($free_date)),
'month' => date('Y-m', strtotime($start_time)),
]); ]);
return [ return [

43
plugin/admin/app/controller/TeacherFreeTimeController.php
View File

@ -95,6 +95,7 @@ class TeacherFreeTimeController extends Crud
if ($request->method() === 'POST') { if ($request->method() === 'POST') {
$postData = $request->post(); $postData = $request->post();
try { try {
$teacher = Teacher::where(['id'=> $request->post('teacher_id')])->findOrEmpty(); $teacher = Teacher::where(['id'=> $request->post('teacher_id')])->findOrEmpty();
if($teacher->isEmpty()){ if($teacher->isEmpty()){
@ -104,7 +105,9 @@ class TeacherFreeTimeController extends Crud
$teacher_free_time = \app\common\model\TeacherFreeTime::where([ $teacher_free_time = \app\common\model\TeacherFreeTime::where([
'teacher_id' => $postData['teacher_id'], 'teacher_id' => $postData['teacher_id'],
'date' => $postData['date'], 'date' => $postData['date'],
'en_date' => $postData['en_date'],
'month' => $postData['month'], 'month' => $postData['month'],
'en_month' => $postData['en_month'],
'time' => $postData['time'], 'time' => $postData['time'],
'en_time' => $postData['en_time'], 'en_time' => $postData['en_time'],
'time_zone_id' => $teacher['time_zone_id'], 'time_zone_id' => $teacher['time_zone_id'],
@ -120,20 +123,26 @@ class TeacherFreeTimeController extends Crud
$en_time_period = explode('-', $postData['en_time']); $en_time_period = explode('-', $postData['en_time']);
$firstDate = new DateTime($postData['date'] . ' ' . trim($time_period[0])); $firstDate = new DateTime($postData['date'] . ' ' . trim($time_period[0]));
$secondDate = new DateTime($postData['date'] . ' ' . trim($time_period[1])); $secondDate = new DateTime($postData['date'] . ' ' . trim($time_period[1]));
$enFirstDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[0])); $enFirstDate = new DateTime($postData['en_date'] . ' ' . trim($en_time_period[0]));
$enSecondDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[1])); $enSecondDate = new DateTime($postData['en_date'] . ' ' . trim($en_time_period[1]));
//根据时区计算教师国内时间
$start_time = date('Y-m-d H:i:s', strtotime( $teacher['time_zone_offset'] . ' hour', $enFirstDate->getTimestamp()));
$end_time = date('Y-m-d H:i:s', strtotime( $teacher['time_zone_offset'] . ' hour', $enSecondDate->getTimestamp()));
\app\common\model\TeacherFreeTime::create([ \app\common\model\TeacherFreeTime::create([
'teacher_id' => $request->post('teacher_id'), 'teacher_id' => $request->post('teacher_id'),
'date' => $request->post('date'), 'date' => $request->post('date'),
'en_date' => $request->post('en_date'),
'month' => $request->post('month'), 'month' => $request->post('month'),
'en_month' => $request->post('en_month'),
'time' => $request->post('time'), 'time' => $request->post('time'),
'en_time' => $request->post('en_time'), 'en_time' => $request->post('en_time'),
'hour' => $request->post('hour'), 'hour' => $request->post('hour'),
'start_time' => date('Y-m-d H:i:s', $firstDate->getTimestamp()), 'start_time' => $start_time,
'end_time' => date('Y-m-d H:i:s', $secondDate->getTimestamp()), 'end_time' => $end_time,
'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->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()), 'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
'time_zone_id' => $teacher['time_zone_id'], 'time_zone_id' => $teacher['time_zone_id'],
@ -183,18 +192,26 @@ class TeacherFreeTimeController extends Crud
$en_time_period = explode('-', $postData['en_time']); $en_time_period = explode('-', $postData['en_time']);
$firstDate = new DateTime($postData['date'] . ' ' . trim($time_period[0])); $firstDate = new DateTime($postData['date'] . ' ' . trim($time_period[0]));
$secondDate = new DateTime($postData['date'] . ' ' . trim($time_period[1])); $secondDate = new DateTime($postData['date'] . ' ' . trim($time_period[1]));
$enFirstDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[0])); $enFirstDate = new DateTime($postData['en_date'] . ' ' . trim($en_time_period[0]));
$enSecondDate = new DateTime($postData['date'] . ' ' . trim($en_time_period[1])); $enSecondDate = new DateTime($postData['en_date'] . ' ' . trim($en_time_period[1]));
//根据时区计算教师国内时间
$start_time = date('Y-m-d H:i:s', strtotime( $teacher_free_time['time_zone_offset'] . ' hour', $enFirstDate->getTimestamp()));
$end_time = date('Y-m-d H:i:s', strtotime( $teacher_free_time['time_zone_offset'] . ' hour', $enSecondDate->getTimestamp()));
$teacher_free_time->save([ $teacher_free_time->save([
'teacher_id' => $postData['teacher_id'], 'teacher_id' => $postData['teacher_id'],
'date' => $postData['date'], 'date' => $request->post('date'),
'month' => $postData['month'], 'en_date' => $request->post('en_date'),
'time' => $postData['time'], 'month' => $request->post('month'),
'en_time' => $postData['en_time'], 'en_month' => $request->post('en_month'),
'hour' => $postData['hour'], 'time' => $request->post('time'),
'start_time' => date('Y-m-d H:i:s', $firstDate->getTimestamp()), 'en_time' => $request->post('en_time'),
'end_time' => date('Y-m-d H:i:s', $secondDate->getTimestamp()), 'hour' => $request->post('hour'),
'start_time' => $start_time,
'end_time' => $end_time,
'en_start_time' => date('Y-m-d H:i:s', $enFirstDate->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()), 'en_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
]); ]);

17
plugin/admin/app/controller/TeacherScheduleTimeController.php
View File

@ -167,9 +167,8 @@ class TeacherScheduleTimeController extends Crud
foreach ($data['schedule_en_time'] as $item) { foreach ($data['schedule_en_time'] as $item) {
$time_period = explode(' - ', $item); $time_period = explode(' - ', $item);
$start_time = strtotime($free_time->date . ' ' . trim($time_period[0])); $start_time = strtotime($free_time->en_date . ' ' . trim($time_period[0]));
$end_time = strtotime($free_time->date . ' ' . trim($time_period[1])); $end_time = strtotime($free_time->en_date . ' ' . trim($time_period[1]));
if (!(strtotime($free_time->en_start_time) <= $start_time && strtotime($free_time->en_end_time) >= $end_time)) { if (!(strtotime($free_time->en_start_time) <= $start_time && strtotime($free_time->en_end_time) >= $end_time)) {
throw new Exception('时间' . $item . '不在老师空闲范围内'); throw new Exception('时间' . $item . '不在老师空闲范围内');
} }
@ -213,8 +212,8 @@ class TeacherScheduleTimeController extends Crud
$en_time_period = explode(' - ', $data['schedule_en_time'][$index]); $en_time_period = explode(' - ', $data['schedule_en_time'][$index]);
$start_time = $free_time->date . ' ' . trim($time_period[0]); $start_time = $free_time->date . ' ' . trim($time_period[0]);
$end_time = $free_time->date . ' ' . trim($time_period[1]); $end_time = $free_time->date . ' ' . trim($time_period[1]);
$en_start_time = $free_time->date . ' ' . trim($en_time_period[0]); $en_start_time = $free_time->en_date . ' ' . trim($en_time_period[0]);
$en_end_time = $free_time->date . ' ' . trim($en_time_period[1]); $en_end_time = $free_time->en_date . ' ' . trim($en_time_period[1]);
$firstDate = new DateTime($start_time); $firstDate = new DateTime($start_time);
$secondDate = new DateTime($end_time); $secondDate = new DateTime($end_time);
@ -229,6 +228,7 @@ class TeacherScheduleTimeController extends Crud
$teacher_schedule_time->save([ $teacher_schedule_time->save([
'teacher_id' => $free_time->teacher_id, 'teacher_id' => $free_time->teacher_id,
'date' => $free_time->date, 'date' => $free_time->date,
'en_date' => $free_time->en_date,
'time' => $time, 'time' => $time,
'en_time' => $data['schedule_en_time'][$index], 'en_time' => $data['schedule_en_time'][$index],
'hour' => $hour, 'hour' => $hour,
@ -237,6 +237,7 @@ class TeacherScheduleTimeController extends Crud
'en_start_time' => $en_start_time, 'en_start_time' => $en_start_time,
'en_end_time' => $en_end_time, 'en_end_time' => $en_end_time,
'month' => $free_time->month, 'month' => $free_time->month,
'en_month' => $free_time->en_month,
'subject_id' => $data['subject_id'][$index], 'subject_id' => $data['subject_id'][$index],
'free_time_id' => $free_time->id, 'free_time_id' => $free_time->id,
]); ]);
@ -244,6 +245,7 @@ class TeacherScheduleTimeController extends Crud
$teacher_schedule_time = \app\common\model\TeacherScheduleTime::create([ $teacher_schedule_time = \app\common\model\TeacherScheduleTime::create([
'teacher_id' => $free_time->teacher_id, 'teacher_id' => $free_time->teacher_id,
'date' => $free_time->date, 'date' => $free_time->date,
'en_date' => $free_time->en_date,
'time' => $time, 'time' => $time,
'en_time' => $data['schedule_en_time'][$index], 'en_time' => $data['schedule_en_time'][$index],
'hour' => $hour, 'hour' => $hour,
@ -252,6 +254,7 @@ class TeacherScheduleTimeController extends Crud
'en_start_time' => $en_start_time, 'en_start_time' => $en_start_time,
'en_end_time' => $en_end_time, 'en_end_time' => $en_end_time,
'month' => $free_time->month, 'month' => $free_time->month,
'en_month' => $free_time->en_month,
'subject_id' => $data['subject_id'][$index], 'subject_id' => $data['subject_id'][$index],
'free_time_id' => $free_time->id, 'free_time_id' => $free_time->id,
]); ]);
@ -274,6 +277,7 @@ class TeacherScheduleTimeController extends Crud
'teacher_id' => $free_time->teacher_id, 'teacher_id' => $free_time->teacher_id,
'subject_id' => $data['subject_id'][$index], 'subject_id' => $data['subject_id'][$index],
'date' => $free_time->date, 'date' => $free_time->date,
'en_date' => $free_time->en_date,
'time' => $time, 'time' => $time,
'en_time' => $data['schedule_en_time'][$index], 'en_time' => $data['schedule_en_time'][$index],
'hour' => $hour, 'hour' => $hour,
@ -282,6 +286,7 @@ class TeacherScheduleTimeController extends Crud
'en_start_time' => $en_start_time, 'en_start_time' => $en_start_time,
'en_end_time' => $en_end_time, 'en_end_time' => $en_end_time,
'month' => $free_time->month, 'month' => $free_time->month,
'en_month' => $free_time->en_month,
]); ]);
} else { } else {
$student_schedule->save([ $student_schedule->save([
@ -291,6 +296,7 @@ class TeacherScheduleTimeController extends Crud
'teacher_id' => $free_time->teacher_id, 'teacher_id' => $free_time->teacher_id,
'subject_id' => $data['subject_id'][$index], 'subject_id' => $data['subject_id'][$index],
'date' => $free_time->date, 'date' => $free_time->date,
'en_date' => $free_time->en_date,
'time' => $time, 'time' => $time,
'en_time' => $data['schedule_en_time'][$index], 'en_time' => $data['schedule_en_time'][$index],
'hour' => $hour, 'hour' => $hour,
@ -299,6 +305,7 @@ class TeacherScheduleTimeController extends Crud
'en_start_time' => $en_start_time, 'en_start_time' => $en_start_time,
'en_end_time' => $en_end_time, 'en_end_time' => $en_end_time,
'month' => $free_time->month, 'month' => $free_time->month,
'en_month' => $free_time->en_month,
]); ]);
} }
} }

16
plugin/admin/app/view/student-homework/index.html
View File

@ -152,24 +152,35 @@
},{ },{
title: "学生",align: "center", title: "学生",align: "center",
field: "student_name", field: "student_name",
width: 120
},{ },{
title: "教师",align: "center", title: "教师",align: "center",
field: "teacher_name", field: "teacher_name",
width: 120
},{ },{
title: "日期",align: "center", title: "本地日期",align: "center",
field: "date", field: "en_date",
width: 120
},{ },{
title: "本地时间",align: "center", title: "本地时间",align: "center",
field: "en_time", field: "en_time",
width: 120
},{
title: "中国日期",align: "center",
field: "date",
width: 120
},{ },{
title: "中国时间",align: "center", title: "中国时间",align: "center",
field: "time", field: "time",
width: 120
},{ },{
title: "课程English",align: "center", title: "课程English",align: "center",
field: "english_name", field: "english_name",
width: 120
},{ },{
title: "课程",align: "center", title: "课程",align: "center",
field: "subject_name", field: "subject_name",
width: 120
},{ },{
title: "家庭作业反馈地址",align: "center", title: "家庭作业反馈地址",align: "center",
field: "feedback_file_url", field: "feedback_file_url",
@ -205,6 +216,7 @@
},{ },{
title: "创建时间",align: "center", title: "创建时间",align: "center",
field: "created_at", field: "created_at",
width: 160
},{ },{
title: "更新时间",align: "center", title: "更新时间",align: "center",
field: "update_at", field: "update_at",

22
plugin/admin/app/view/student-schedule/index.html
View File

@ -203,23 +203,29 @@
field: "week", field: "week",
width: 80 width: 80
}, { }, {
title: "日期", align: "center", title: "本地日期", align: "center",
field: "date", field: "en_date",
width: 150 width: 150
}, {
title: "中国时间", align: "center",
field: "time",
width: 120
}, { }, {
title: "本地时间", align: "center", title: "本地时间", align: "center",
field: "en_time", field: "en_time",
width: 120 width: 120
}, {
title: "中国日期", align: "center",
field: "date",
width: 120
}, {
title: "中国时间", align: "center",
field: "time",
width: 120
}, { }, {
title: "学科", align: "center", title: "学科", align: "center",
field: "subject_name", field: "subject_name",
width: 120
}, { }, {
title: "教师", align: "center", title: "教师", align: "center",
field: "teacher_name", field: "teacher_name",
width: 120
},{ },{
title: "学生", align: "center", title: "学生", align: "center",
field: "student_name", field: "student_name",
@ -244,11 +250,13 @@
field: "end_time", field: "end_time",
hide: true hide: true
}, { }, {
title: "月份", align: "center", title: "中国月份", align: "center",
field: "month", field: "month",
width: 120
}, { }, {
title: "是否发布", align: "center", title: "是否发布", align: "center",
field: "is_publish", field: "is_publish",
width: 120,
templet: function (d) { templet: function (d) {
let field = "is_publish"; let field = "is_publish";
form.on("switch(" + field + ")", function (data) { form.on("switch(" + field + ")", function (data) {

21
plugin/admin/app/view/teacher-free-time/index.html
View File

@ -147,17 +147,23 @@
title: "教师",align: "center", title: "教师",align: "center",
field: "teacher_name", field: "teacher_name",
},{ },{
title: "月份",align: "center", title: "当地月份",align: "center",
field: "en_month",
},{
title: "当地日期",align: "center",
field: "en_date",
},{
title: "当地时间",align: "center",
field: "en_time",
},{
title: "中国月份",align: "center",
field: "month", field: "month",
},{ },{
title: "日期",align: "center", title: "中国日期",align: "center",
field: "date", field: "date",
},{ },{
title: "中国时间",align: "center", title: "中国时间",align: "center",
field: "time", field: "time",
},{
title: "当地时间",align: "center",
field: "en_time",
},{ },{
title: "课时/h",align: "center", title: "课时/h",align: "center",
field: "hour", field: "hour",
@ -186,6 +192,7 @@
},{ },{
title: "创建时间",align: "center", title: "创建时间",align: "center",
field: "created_at", field: "created_at",
width: 160
},{ },{
title: "更新时间",align: "center", title: "更新时间",align: "center",
field: "updated_at", field: "updated_at",

611
plugin/admin/app/view/teacher-free-time/insert.html
View File

@ -1,244 +1,425 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="zh-cn"> <html lang="zh-cn">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8" />
<title>新增页面</title> <title>新增页面</title>
<link rel="stylesheet" href="/app/admin/component/pear/css/pear.css" /> <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/component/jsoneditor/css/jsoneditor.css" />
<link rel="stylesheet" href="/app/admin/admin/css/reset.css" /> <link rel="stylesheet" href="/app/admin/admin/css/reset.css" />
</head> </head>
<body> <body>
<form class="layui-form" action="">
<div class="mainBox">
<div class="main-container mr-5">
<div class="layui-form-item">
<label class="layui-form-label required">教师</label>
<div class="layui-input-block">
<!-- <input type="text" name="teacher_id" value="0" class="layui-input">-->
<select
lay-search=""
name="teacher_id"
required
lay-verify="required"
lay-filter="selectTeacher"
>
<option value="">请选择或搜索</option>
{foreach $teacher as $item}
<option value="{$item['id']}">{$item['teacher_name']}</option>
{/foreach}
</select>
</div>
</div>
<form class="layui-form" action=""> <div class="layui-form-item">
<label class="layui-form-label required">时区</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 required">时差/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 required">本地日期</label>
<div class="layui-input-block">
<input
type="text"
name="en_date"
id="en_date"
required
lay-verify="required"
autocomplete="off"
class="layui-input"
/>
</div>
</div>
<div class="mainBox"> <div class="layui-form-item">
<div class="main-container mr-5"> <label class="layui-form-label required">本地月份</label>
<div class="layui-input-block">
<input
type="text"
name="en_month"
id="en_month"
autocomplete="off"
readonly
class="layui-input"
/>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">教师</label> <label class="layui-form-label required">本地时间</label>
<div class="layui-input-block"> <div class="layui-input-block">
<!-- <input type="text" name="teacher_id" value="0" class="layui-input">--> <input
<select lay-search="" name="teacher_id" required lay-verify="required" lay-filter="selectTeacher"> type="text"
<option value="">请选择或搜索</option> name="en_time"
{foreach $teacher as $item} id="en_time"
<option value="{$item['id']}">{$item['teacher_name']}</option> required
{/foreach} lay-verify="required"
</select> readonly
</div> autocomplete="off"
</div> class="layui-input"
/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">中国日期</label>
<div class="layui-input-block">
<input
type="text"
name="date"
id="date"
required
lay-verify="required"
readonly
autocomplete="off"
class="layui-input"
/>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">时区</label> <label class="layui-form-label required">中国月份</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="time_zone_name" id="time_zone_name" readonly autocomplete="off" class="layui-input"> <input
</div> type="text"
</div> name="month"
<div class="layui-form-item"> id="month"
<label class="layui-form-label required">时差/h</label> autocomplete="off"
<div class="layui-input-block"> readonly
<input type="text" name="time_zone_offset" id="time_zone_offset" readonly autocomplete="off" class="layui-input"> class="layui-input"
</div> />
</div> </div>
<div class="layui-form-item"> </div>
<label class="layui-form-label required">日期</label> <div class="layui-form-item">
<div class="layui-input-block"> <label class="layui-form-label">中国时间</label>
<input type="text" name="date" id="date" required lay-verify="required" autocomplete="off" class="layui-input"> <div class="layui-input-block">
</div> <input
</div> type="text"
name="time"
id="time"
autocomplete="off"
readonly
class="layui-input"
/>
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">月份</label> <label class="layui-form-label">课时</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="month" id="month" autocomplete="off" readonly class="layui-input"> <input type="text" name="hour" id="hour" value="0.00" class="layui-input" />
</div> </div>
</div> </div>
</div>
</div>
<div class="layui-form-item"> <div class="bottom">
<label class="layui-form-label required">本地时间</label> <div class="button-container">
<div class="layui-input-block"> <button
<input type="text" name="en_time" id="en_time" required lay-verify="required" autocomplete="off" class="layui-input"> type="submit"
</div> class="pear-btn pear-btn-primary pear-btn-md"
</div> lay-submit=""
lay-filter="save"
>
提交
</button>
<button type="reset" class="pear-btn pear-btn-md">重置</button>
</div>
</div>
</form>
<div class="layui-form-item"> <script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<label class="layui-form-label">中国时间</label> <script src="/app/admin/component/pear/pear.js"></script>
<div class="layui-input-block"> <script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
<input type="text" name="time" id="time" autocomplete="off" readonly class="layui-input"> <script src="/app/admin/admin/js/permission.js"></script>
</div>
</div>
<div class="layui-form-item"> <script>
<label class="layui-form-label">课时</label> // 相关接口
<div class="layui-input-block"> const INSERT_API = '/app/admin/teacher-free-time/insert';
<input type="text" name="hour" id="hour" value="0.00" class="layui-input">
</div>
</div>
</div>
</div>
<div class="bottom"> // 字段 日期 date
<div class="button-container"> layui.use(['laydate'], function () {
<button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" layui.laydate.render({
lay-filter="save"> elem: '#en_date',
提交 done: function (value, date) {
</button> let start_date_time = new Date(
<button type="reset" class="pear-btn pear-btn-md"> date.year,
重置 date.month,
</button> date.date,
</div> date.hours,
</div> date.minutes,
</form> date.seconds
);
let month = date.year + '-' + date.month.toString().padStart(2, '0');
console.log(month);
layui.$('#en_month').val(month);
},
});
});
<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script> // 字段 时间 time
<script src="/app/admin/component/pear/pear.js"></script> layui.use(['laydate', 'form'], function () {
<script src="/app/admin/component/jsoneditor/jsoneditor.js"></script> layui.form.on('select(selectTeacher)', function (data) {
<script src="/app/admin/admin/js/permission.js"></script> var elem = data.elem; // 获得 select 原始 DOM 对象
var value = data.value; // 获得被选中的值
var othis = data.othis; // 获得 select 元素被替换后的 jQuery 对象
<script> 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({
const INSERT_API = "/app/admin/teacher-free-time/insert"; 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 + '';
};
// 字段 日期 date if (layui.$('#time_zone_name').val()) {
layui.use(["laydate"], function() { let time_zone_offset = layui.$('#time_zone_offset').val();
layui.laydate.render({ let en_date = layui.$('#en_date').val();
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)
}
});
})
console.log(date.year, date.month, date.date, date.hours, date.minutes, date.seconds);
console.log(
endDate.year,
endDate.month,
endDate.date,
endDate.hours,
endDate.minutes,
endDate.seconds
);
// 解析en_date字符串 (格式如 "2023-05-20")
let dateParts = en_date.split('-');
let enYear = parseInt(dateParts[0]);
let enMonth = parseInt(dateParts[1]);
let enDay = parseInt(dateParts[2]);
// 字段 时间 time // 教师当地时间
layui.use(["laydate", "form"], function() { let start_date_time = new Date(
enYear,
enMonth - 1,
enDay,
date.hours,
date.minutes,
date.seconds
);
let end_date_time = new Date(
enYear,
enMonth - 1,
enDay,
endDate.hours,
endDate.minutes,
endDate.seconds
);
layui.form.on('select(selectTeacher)', function(data){ // 计算教师本地年月日并填充
var elem = data.elem; // 获得 select 原始 DOM 对象 let teacher_date =
var value = data.value; // 获得被选中的值 enYear +
var othis = data.othis; // 获得 select 元素被替换后的 jQuery 对象 '-' +
enMonth.toString().padStart(2, '0') +
'-' +
enDay.toString().padStart(2, '0');
layui.$.ajax({ // 计算教师本地月份
url: '/app/admin/teacher/getTeacherTimeZone', let teacher_month = enYear + '-' + enMonth.toString().padStart(2, '0');
type: "POST", layui.$('#en_month').val(teacher_month);
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);
}
}
}
});
// 设置本地时间显示
let start_time = start_date_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
let end_time = end_date_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
layui.$('#en_time').val(start_time + ' - ' + end_time);
}); // 计算中国时间（直接加上时区偏移量）
let cn_offset = parseFloat(time_zone_offset); // 教师时区偏移量
layui.laydate.render({ // 创建中国时间对象（基于教师本地时间转换）
elem: "#en_time", let cn_start_time = new Date(start_date_time.getTime() + cn_offset * 60 * 60 * 1000);
type: "time", let cn_end_time = new Date(end_date_time.getTime() + cn_offset * 60 * 60 * 1000);
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) { let cn_start_time_str = cn_start_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
let cn_end_time_str = cn_end_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
layui.$('#time').val(cn_start_time_str + ' - ' + cn_end_time_str);
Number.prototype.toFixed = function(d) { // 计算中国日期（根据中国时间）
var s = this + ""; let cn_date =
if(!d) d = 0; cn_start_time.getFullYear() +
if(s.indexOf(".") == -1) s += "."; '-' +
s += new Array(d + 1).join("0"); (cn_start_time.getMonth() + 1).toString().padStart(2, '0') +
if(new RegExp("^(-|\\+)?(\\d+(\\.\\d{0," + (d + 1) + "})?)\\d*$").test(s)) { '-' +
var s = "0" + RegExp.$2, cn_start_time.getDate().toString().padStart(2, '0');
pm = RegExp.$1, layui.$('#date').val(cn_date);
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); let cn_month =
return(pm + s).replace(/\.$/, ""); cn_start_time.getFullYear() +
} '-' +
return this + ""; (cn_start_time.getMonth() + 1).toString().padStart(2, '0');
layui.$('#month').val(cn_month);
}; // 课时计算
let hour = Math.round(
(end_date_time.valueOf() - start_date_time.valueOf()) / 1000 / 60 / 60
).toFixed(2); //小时
layui.$('#hour').val(hour);
}
},
});
});
if(layui.$('#time_zone_name').val()){ //提交事件
let time_zone_offset = layui.$('#time_zone_offset').val() layui.use(['form', 'popup'], function () {
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"}) layui.form.verify({
let end_date_time = new Date(endDate.year, endDate.month, endDate.date, parseInt(endDate.hours + parseInt(time_zone_offset)), endDate.minutes, endDate.seconds) phone: [/(^$)|^1\d{10}$/, '请输入正确的手机号'],
let end_time = end_date_time.toLocaleTimeString([], {hour: "2-digit", minute: "2-digit"}) email: [
layui.$('#time').val(start_time + ' - ' + end_time) /(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,
//课时 '邮箱格式不正确',
let hour = (Math.round((end_date_time.valueOf() - start_date_time.valueOf()) / 1000 / 60 / 60)).toFixed(2); //小时 ],
layui.$('#hour').val(hour) 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.use(["form", "popup"], function () { layui.form.on('submit(save)', function (data) {
// 字段验证允许为空 layui.$.ajax({
layui.form.verify({ url: INSERT_API,
phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"], type: 'POST',
email: [/(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/, "邮箱格式不正确"], dateType: 'json',
url: [/(^$)|(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/, "链接格式不正确"], data: data.field,
number: [/(^$)|^\d+$/,'只能填写数字'], success: function (res) {
date: [/(^$)|^(\d{4})[-\/](\d{1}|0\d{1}|1[0-2])([-\/](\d{1}|0\d{1}|[1-2][0-9]|3[0-1]))*$/, "日期格式不正确"], if (res.code) {
identity: [/(^$)|(^\d{15}$)|(^\d{17}(x|X|\d)$)/, "请输入正确的身份证号"] return layui.popup.failure(res.msg);
}); }
layui.form.on("submit(save)", function (data) { return layui.popup.success('操作成功', function () {
layui.$.ajax({ parent.refreshTable();
url: INSERT_API, parent.layer.close(parent.layer.getFrameIndex(window.name));
type: "POST", });
dateType: "json", },
data: data.field, });
success: function (res) { return false;
if (res.code) { });
return layui.popup.failure(res.msg); });
} </script>
return layui.popup.success("操作成功", function () { </body>
parent.refreshTable();
parent.layer.close(parent.layer.getFrameIndex(window.name));
});
}
});
return false;
});
});
</script>
</body>
</html> </html>

190
plugin/admin/app/view/teacher-free-time/update.html
View File

@ -43,30 +43,95 @@
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">日期</label> <label class="layui-form-label required">本地日期</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="date" id="date" value="{$teacher_free_time['date']}" required lay-verify="required" autocomplete="off" class="layui-input"> <input
type="text"
name="en_date"
id="en_date"
value="{$teacher_free_time['en_date']}"
required
lay-verify="required"
autocomplete="off"
class="layui-input"
/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">月份</label> <label class="layui-form-label required">本地月份</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="month" id="month" value="{$teacher_free_time['month']}" required lay-verify="required" autocomplete="off" readonly class="layui-input"> <input
type="text"
name="en_month"
id="en_month"
value="{$teacher_free_time['en_month']}"
autocomplete="off"
readonly
class="layui-input"
/>
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label required">本地时间</label> <label class="layui-form-label required">本地时间</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="en_time" id="en_time" value="{$teacher_free_time['en_time']}" required lay-verify="required" autocomplete="off" class="layui-input"> <input
type="text"
name="en_time"
id="en_time"
value="{$teacher_free_time['en_time']}"
required
lay-verify="required"
readonly
autocomplete="off"
class="layui-input"
/>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">中国日期</label>
<div class="layui-input-block">
<input
type="text"
name="date"
id="date"
value="{$teacher_free_time['date']}"
required
lay-verify="required"
readonly
autocomplete="off"
class="layui-input"
/>
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label required">中国月份</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>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">中国时间</label> <label class="layui-form-label">中国时间</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="time" id="time" value="{$teacher_free_time['time']}" autocomplete="off" readonly class="layui-input"> <input
type="text"
name="time"
id="time"
value="{$teacher_free_time['time']}"
autocomplete="off"
readonly
class="layui-input"
/>
</div> </div>
</div> </div>
@ -105,7 +170,7 @@
// 字段 日期 date // 字段 日期 date
layui.use(["laydate"], function () { layui.use(["laydate"], function () {
layui.laydate.render({ layui.laydate.render({
elem: "#date", elem: "#en_date",
done: function (value, date) { done: function (value, date) {
let start_date_time = new Date(date.year, date.month, date.date, date.hours, date.minutes, date.seconds) 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')) let month = date.year + '-' + ((date.month).toString().padStart(2, '0'))
@ -191,18 +256,107 @@
return this + ""; return this + "";
}; };
if (layui.$('#time_zone_name').val()) { if (layui.$('#time_zone_name').val()) {
let time_zone_offset = layui.$('#time_zone_offset').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 en_date = layui.$('#en_date').val();
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) console.log(date.year, date.month, date.date, date.hours, date.minutes, date.seconds);
let end_time = end_date_time.toLocaleTimeString([], {hour: "2-digit", minute: "2-digit"}) console.log(
layui.$('#time').val(start_time + ' - ' + end_time) endDate.year,
//课时 endDate.month,
let hour = (Math.round((end_date_time.valueOf() - start_date_time.valueOf()) / 1000 / 60 / 60)).toFixed(2); //小时 endDate.date,
layui.$('#hour').val(hour) endDate.hours,
} endDate.minutes,
endDate.seconds
);
// 解析en_date字符串 (格式如 "2023-05-20")
let dateParts = en_date.split('-');
let enYear = parseInt(dateParts[0]);
let enMonth = parseInt(dateParts[1]);
let enDay = parseInt(dateParts[2]);
// 教师当地时间
let start_date_time = new Date(
enYear,
enMonth - 1,
enDay,
date.hours,
date.minutes,
date.seconds
);
let end_date_time = new Date(
enYear,
enMonth - 1,
enDay,
endDate.hours,
endDate.minutes,
endDate.seconds
);
// 计算教师本地年月日并填充
let teacher_date =
enYear +
'-' +
enMonth.toString().padStart(2, '0') +
'-' +
enDay.toString().padStart(2, '0');
// 计算教师本地月份
let teacher_month = enYear + '-' + enMonth.toString().padStart(2, '0');
layui.$('#en_month').val(teacher_month);
// 设置本地时间显示
let start_time = start_date_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
let end_time = end_date_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
layui.$('#en_time').val(start_time + ' - ' + end_time);
// 计算中国时间（直接加上时区偏移量）
let cn_offset = parseFloat(time_zone_offset); // 教师时区偏移量
// 创建中国时间对象（基于教师本地时间转换）
let cn_start_time = new Date(start_date_time.getTime() + cn_offset * 60 * 60 * 1000);
let cn_end_time = new Date(end_date_time.getTime() + cn_offset * 60 * 60 * 1000);
// 设置中国时间显示
let cn_start_time_str = cn_start_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
let cn_end_time_str = cn_end_time.toLocaleTimeString([], {
hour: '2-digit',
minute: '2-digit',
});
layui.$('#time').val(cn_start_time_str + ' - ' + cn_end_time_str);
// 计算中国日期（根据中国时间）
let cn_date =
cn_start_time.getFullYear() +
'-' +
(cn_start_time.getMonth() + 1).toString().padStart(2, '0') +
'-' +
cn_start_time.getDate().toString().padStart(2, '0');
layui.$('#date').val(cn_date);
// 计算中国月份（根据中国时间）
let cn_month =
cn_start_time.getFullYear() +
'-' +
(cn_start_time.getMonth() + 1).toString().padStart(2, '0');
layui.$('#month').val(cn_month);
// 课时计算
let hour = Math.round(
(end_date_time.valueOf() - start_date_time.valueOf()) / 1000 / 60 / 60
).toFixed(2); //小时
layui.$('#hour').val(hour);
}
} }
}); });
}) })

19
plugin/admin/app/view/teacher-schedule-time/index.html
View File

@ -47,7 +47,7 @@
<!-- </div>--> <!-- </div>-->
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">月份</label> <label class="layui-form-label">中国月份</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="month" id="month" placeholder="请选择月份" autocomplete="off" class="layui-input"> <input type="text" name="month" id="month" placeholder="请选择月份" autocomplete="off" class="layui-input">
</div> </div>
@ -212,29 +212,40 @@
title: "教师", align: "center", title: "教师", align: "center",
field: "teacher_name", field: "teacher_name",
}, { }, {
title: "日期", align: "center", title: "本地日期", align: "center",
field: "date", field: "en_date",
width: 120
}, { }, {
title: "本地时间", align: "center", title: "本地时间", align: "center",
field: "en_time", field: "en_time",
width: 120
}, {
title: "中国日期", align: "center",
field: "date",
width: 120
}, { }, {
title: "中国时间", align: "center", title: "中国时间", align: "center",
field: "time", field: "time",
width: 120
}, { }, {
title: "课时", align: "center", title: "课时", align: "center",
field: "hour", field: "hour",
}, { }, {
title: "月份", align: "center", title: "中国月份", align: "center",
field: "month", field: "month",
width: 100
}, { }, {
title: "课程", align: "center", title: "课程", align: "center",
field: "subject_name", field: "subject_name",
width: 120
}, { }, {
title: "学生", align: "center", title: "学生", align: "center",
field: "student_name", field: "student_name",
width: 120
}, { }, {
title: "是否发布", align: "center", title: "是否发布", align: "center",
field: "is_publish", field: "is_publish",
width: 120,
templet: function (d) { templet: function (d) {
let field = "is_publish"; let field = "is_publish";
form.on("switch(" + field + ")", function (data) { form.on("switch(" + field + ")", function (data) {

2
plugin/admin/app/view/teacher/check_free_time.html
View File

@ -65,7 +65,7 @@
title: "老师",align: "center", title: "老师",align: "center",
field: "teacher_name", field: "teacher_name",
},{ },{
title: "月份",align: "center", title: "中国月份",align: "center",
field: "month", field: "month",
},{ },{
title: "总时间段/个",align: "center", title: "总时间段/个",align: "center",

2
plugin/admin/app/view/teacher/check_schedule.html
View File

@ -66,7 +66,7 @@
title: "老师",align: "center", title: "老师",align: "center",
field: "teacher_name", field: "teacher_name",
},{ },{
title: "月份",align: "center", title: "中国月份",align: "center",
field: "month", field: "month",
},{ },{
title: "总时间段/个",align: "center", title: "总时间段/个",align: "center",

22
plugin/admin/app/view/teacher/free_time_setting.html
View File

@ -41,24 +41,38 @@
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">月份</label> <label class="layui-form-label">本地月份</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="month" value="{$free_time['month']}" disabled class="layui-input"> <input type="text" name="month" value="{$free_time['month']}" disabled class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">日期</label> <label class="layui-form-label">本地日期</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="date" value="{$free_time['date']}" disabled class="layui-input"> <input type="text" name="en_date" value="{$free_time['en_date']}" disabled class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">时间(本地)</label> <label class="layui-form-label">时间(本地)</label>
<div class="layui-input-block"> <div class="layui-input-block">
<input type="text" name="time" value="{$free_time['en_time']}" disabled class="layui-input"> <input type="text" name="en_time" value="{$free_time['en_time']}" disabled class="layui-input">
</div> </div>
</div> </div>
<div class="layui-form-item">
<label class="layui-form-label">中国月份</label>
<div class="layui-input-block">
<input type="text" name="month" value="{$free_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="{$free_time['date']}" disabled class="layui-input">
</div>
</div>
<div class="layui-form-item"> <div class="layui-form-item">
<label class="layui-form-label">时间(中国)</label> <label class="layui-form-label">时间(中国)</label>
<div class="layui-input-block"> <div class="layui-input-block">