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

Compare commits

base: admin:008ed9c58afdef05e5d162e956217457e7b944b3
Branches Tags
admin:master
...
compare: admin:76ba5585aaa5bf486a1313f29ad36f96ab64de42
Branches Tags
admin:master

10 Commits
008ed9c58a ... 76ba5585aa

Author SHA1 Message Date
Dai
76ba5585aa 课程作业添加是否合并报告 2025-05-16 15:27:28 +08:00
Dai
fa5394ce81 限制上传大小20M 2025-05-14 19:36:39 +08:00
Dai
b163364831 添加上传大小限制20M 2025-05-14 19:28:44 +08:00
Dai
9a4f207d37 同步教师排课、课程作业、家庭作业时间 2025-05-10 09:45:41 +08:00
Dai
74138793a5 教师端用本地时间查询 2025-05-09 16:59:45 +08:00
Dai
d2942f4bd2 教师端接口添加本地时间、中国时间字段，教师排课添加时区信息 2025-05-09 16:32:55 +08:00
Dai
f5c7092f1a 时间区分中国时间和本地时间 2025-05-08 17:30:26 +08:00
Dai
e89b70c3fb 添加check_chinese_chars函数 2025-05-07 16:02:02 +08:00
Dai
c61727dff2 fix 空闲时间添加教师时区数据 2025-05-07 10:56:00 +08:00
Dai
b868dd0a87 优化任务结果页面 2025-03-12 20:29:01 +08:00
23 changed files with 839 additions and 301 deletions
Show Stats Expand all files Collapse all files

4
app/common/model/TeacherFreeTime.php
View File

@ -29,9 +29,7 @@ class TeacherFreeTime extends BaseModel
{
return $this->hasOne(Teacher::class, 'id', 'teacher_id')->bind([
'teacher_name',
'teacher_account' => "account",
'time_zone_name',
'time_zone_offset'
'teacher_account' => "account"
]);
}

2
app/common/model/TeacherScheduleTime.php
View File

@ -24,8 +24,6 @@ class TeacherScheduleTime extends BaseModel
return $this->hasOne(Teacher::class, 'id', 'teacher_id')->bind([
'teacher_account' => 'account',
'teacher_name',
'time_zone_name',
'time_zone_offset'
]);
}

6
app/common/service/StudentHomeworkService.php
View File

@ -68,6 +68,7 @@ class StudentHomeworkService
'teacher_schedule_time_id' => $subject_homework->teacher_schedule_time_id,
'subject_id' => $subject_homework->subject_id,
'date' => $subject_homework->date,
'en_date' => $subject_homework->en_date,
'time' => $subject_homework->time,
'en_time' => $subject_homework->en_time,
'hour' => $subject_homework->hour,
@ -76,6 +77,11 @@ class StudentHomeworkService
'en_start_time' => $subject_homework->start_time,
'en_end_time' => $subject_homework->end_time,
'month' => $subject_homework->month,
'en_month' => $subject_homework->en_month,
'time_zone_id' => $subject_homework->time_zone_id,
'time_zone_name' => $subject_homework->time_zone_name,
'time_zone_abbr' => $subject_homework->time_zone_abbr,
'time_zone_offset' => $subject_homework->time_zone_offset,
'feedback_file_url' => $feedback_file_url,
]);

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

@ -82,6 +82,7 @@ class SubjectHomeworkService
'teacher_id' => $teacher->id,
'teacher_schedule_time_id' => $data['teacher_schedule_time_id'],
'date' => $teacher_schedule_time->date,
'en_date' => $teacher_schedule_time->en_date,
'time' => $teacher_schedule_time->time,
'en_time' => $teacher_schedule_time->en_time,
'hour' => $teacher_schedule_time->hour,
@ -90,6 +91,11 @@ class SubjectHomeworkService
'en_start_time' => $teacher_schedule_time->en_start_time,
'en_end_time' => $teacher_schedule_time->en_end_time,
'month' => $teacher_schedule_time->month,
'en_month' => $teacher_schedule_time->en_month,
'time_zone_id'=>$teacher_schedule_time->time_zone_id,
'time_zone_name'=>$teacher_schedule_time->time_zone_name,
'time_zone_abbr'=>$teacher_schedule_time->time_zone_abbr,
'time_zone_offset'=>$teacher_schedule_time->time_zone_offset,
'subject_id' => $teacher_schedule_time->subject_id,
'content' => isset($data['content']) ? $data['content'] : '',
'homework_web_url' => isset($data['homework_web_url']) ? $data['homework_web_url'] : '',
@ -97,6 +103,7 @@ class SubjectHomeworkService
'last_homework_feedback_url' => $last_homework_feedback_url,
'subject_report_url' => $subject_report_url,
'subject_file_url' => $subject_file_url,
'is_merge_report' => isset($data['is_merge_report']) && $data['is_merge_report']? 1 :0,
]);
return [

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

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

10
app/common/service/TeacherScheduleTimeService.php
View File

@ -93,14 +93,14 @@ class TeacherScheduleTimeService
$data = $request->get();
$schedule = TeacherScheduleTime::order('id desc')->where(['teacher_id' => $teacher->id, 'is_publish' => 1]);
if (isset($data['month']) && !empty($data['month'])) {
$schedule->where('month', $data['month']);
if (isset($data['en_month']) && !empty($data['en_month'])) {
$schedule->where('en_month', $data['en_month']);
}
if (isset($data['date']) && !empty($data['date'])) {
$schedule->where('date', $data['date']);
if (isset($data['en_date']) && !empty($data['en_date'])) {
$schedule->where('en_date', $data['en_date']);
}
$list = $schedule->field('id,teacher_id,date,time,en_time,hour,month,subject_id,is_publish')
$list = $schedule->field('id,teacher_id,date,en_date,time,en_time,hour,month,en_month,time_zone_id,time_zone_name,time_zone_abbr,time_zone_offset,subject_id,is_publish')
->with(['subject', 'studentSchedule', 'teacher', 'studentHomework'])
->select()->toArray();

10
app/common/service/UploadService.php
View File

@ -24,6 +24,10 @@ class UploadService
}
$fileSize = $file->getSize();
if ($fileSize > 20 * 1024 * 1024){
throw new Exception('文件超出20M');
}
$uploadDir = '/files/' . $type . '/' . date('Ym') . '/';
$filename = date('YmdHis') . rand(999, 99999);
$uploadPath = $uploadDir . $filename . '.' . $ext;
@ -67,12 +71,16 @@ class UploadService
if ($file && $file->isValid()) {
$ext = $file->getUploadExtension();
if (in_array($ext, ['pdf', 'doc', 'docx', 'xlsx', 'xls', 'csv', 'pptx', 'ppt', 'zip', 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'JPG', 'JPEG', 'PBG', 'txt'])) {
if (in_array($ext, ['pdf', 'doc', 'docx', 'xlsx', 'xls', 'csv', 'pptx', 'ppt', 'zip', 'jpg', 'jpeg', 'png', 'gif', 'bmp', 'JPG', 'JPEG', 'PBG', 'txt', 'zip', 'rar', '7z', 'tgz'])) {
$type = 'files';
} else {
$type = 'other';
}
$fileSize = $file->getSize();
if ($fileSize > 20 * 1024 * 1024){
throw new Exception('文件超出20M');
}
$origin_name = $file->getUploadName();
$uploadDir = '/files/' . $type . '/' . date('Ym') . '/';

9
app/functions.php
View File

@ -119,3 +119,12 @@ if(!function_exists('is_time_cross')){
return $checkCross(0, $timePeriods); // 从第一个时间段开始检查
}
}
//写一个检测字符串是否包含中文的函数
if(!function_exists('check_chinese_chars')){
function check_chinese_chars($str){
return preg_match('/[\x{4e00}-\x{9fa5}]/u', $str);
}
}

2
config/server.php
View File

@ -27,5 +27,5 @@ return [
'status_file' => runtime_path() . '/webman.status',
'stdout_file' => runtime_path() . '/logs/stdout.log',
'log_file' => runtime_path() . '/logs/workerman.log',
'max_package_size' => 10 * 1024 * 1024
'max_package_size' => 20 * 1024 * 1024
];

3
plugin/admin/app/controller/SubjectHomeworkController.php
View File

@ -71,6 +71,9 @@ class SubjectHomeworkController extends Crud
if (isset($data['is_publish']) && $data['is_publish'] !== '') {
$homework->where('sh.is_publish', $data['is_publish']);
}
if (isset($data['is_merge_report']) && $data['is_merge_report'] !== '') {
$homework->where('sh.is_merge_report', $data['is_merge_report']);
}
if (isset($data['student_id']) && $data['student_id']) {
$homework->where(['sth.student_id'=> $data['student_id']]);
}

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

@ -95,13 +95,24 @@ class TeacherFreeTimeController extends Crud
if ($request->method() === 'POST') {
$postData = $request->post();
try {
$teacher = Teacher::where(['id'=> $request->post('teacher_id')])->findOrEmpty();
if($teacher->isEmpty()){
throw new Exception('未找到教师信息');
}
$teacher_free_time = \app\common\model\TeacherFreeTime::where([
'teacher_id' => $postData['teacher_id'],
'date' => $postData['date'],
'en_date' => $postData['en_date'],
'month' => $postData['month'],
'en_month' => $postData['en_month'],
'time' => $postData['time'],
'en_time' => $postData['en_time'],
'time_zone_id' => $teacher['time_zone_id'],
'time_zone_name' => $teacher['time_zone_name'],
'time_zone_offset' => $teacher['time_zone_offset'],
])
->findOrEmpty();
if (!$teacher_free_time->isEmpty()) {
@ -112,20 +123,31 @@ class TeacherFreeTimeController extends Crud
$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]));
$enFirstDate = new DateTime($postData['en_date'] . ' ' . trim($en_time_period[0]));
$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([
'teacher_id' => $request->post('teacher_id'),
'date' => $request->post('date'),
'en_date' => $request->post('en_date'),
'month' => $request->post('month'),
'en_month' => $request->post('en_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()),
'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()),
'time_zone_id' => $teacher['time_zone_id'],
'time_zone_name' => $teacher['time_zone_name'],
'time_zone_offset' => $teacher['time_zone_offset'],
]);
return json([
@ -170,18 +192,26 @@ class TeacherFreeTimeController extends Crud
$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]));
$enFirstDate = new DateTime($postData['en_date'] . ' ' . trim($en_time_period[0]));
$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_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()),
'date' => $request->post('date'),
'en_date' => $request->post('en_date'),
'month' => $request->post('month'),
'en_month' => $request->post('en_month'),
'time' => $request->post('time'),
'en_time' => $request->post('en_time'),
'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_end_time' => date('Y-m-d H:i:s', $enSecondDate->getTimestamp()),
]);

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

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

2
plugin/admin/app/view/cron-job/index.html
View File

@ -117,7 +117,7 @@
{{# }else if(d.msg_type == 'class_begin_notify_teacher'){ }}
<span class="layui-badge layui-bg-green">课程开始提醒教师</span>
{{# }else if(d.msg_type == 'class_begin_notify_student'){ }}
<span class="layui-badge layui-bg-green">课程开始提醒学生</span>
<span class="layui-badge layui-bg-blue">课程开始提醒学生</span>
{{# }else if(d.msg_type == 'class_begin_notify_parent'){ }}
<span class="layui-badge layui-bg-green">课程开始提醒家长</span>
{{# }else if(d.msg_type == 'subject_upload_notify_admin'){ }}

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

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

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

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

33
plugin/admin/app/view/subject-homework/index.html
View File

@ -86,6 +86,12 @@
<div name="is_publish" id="is_publish" value=""></div>
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label">合并报告</label>
<div class="layui-input-block">
<div name="is_merge_report" id="is_merge_report" value=""></div>
</div>
</div>
<div class="layui-form-item layui-inline">
<label class="layui-form-label"></label>
@ -194,6 +200,22 @@
})
});
// 字段 是否发布 is_merge_report
layui.use(["jquery", "xmSelect"], function () {
let value = layui.$("#is_merge_report").attr("value");
let initValue = value ? value.split(",") : [];
layui.xmSelect.render({
el: "#is_merge_report",
name: "is_merge_report",
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 () {
let table = layui.table;
@ -262,6 +284,17 @@
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: "is_merge_report",
templet: function (d) {
let field = "is_merge_report";
if(d[field]){
return '<span class="layui-bg-green">是</span>'
}else{
return '<span class="layui-badge">否</span>'
}
}
}, {
title: "创建时间", align: "center",
field: "created_at",

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

@ -147,17 +147,23 @@
title: "教师",align: "center",
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",
},{
title: "日期",align: "center",
field: "date",
},{
title: "中国日期",align: "center",
field: "date",
},{
title: "中国时间",align: "center",
field: "time",
},{
title: "当地时间",align: "center",
field: "en_time",
},{
title: "课时/h",align: "center",
field: "hour",
@ -170,6 +176,12 @@
field: "end_time",
hide: true,
},{
title: "时区",align: "center",
field: "time_zone_name",
},{
title: "时差",align: "center",
field: "time_zone_offset",
},{
title: "课程id",align: "center",
field: "subject_id",
hide: true,
@ -180,6 +192,7 @@
},{
title: "创建时间",align: "center",
field: "created_at",
width: 160
},{
title: "更新时间",align: "center",
field: "updated_at",

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

@ -1,244 +1,425 @@
<!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" />
</head>
<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="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="en_month"
id="en_month"
autocomplete="off"
readonly
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="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>
<div class="layui-form-item">
<label class="layui-form-label required">本地时间</label>
<div class="layui-input-block">
<input
type="text"
name="en_time"
id="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"
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="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="date" id="date" required lay-verify="required" 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="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="time"
id="time"
autocomplete="off"
readonly
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="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="hour" id="hour" value="0.00" 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="en_time" id="en_time" required lay-verify="required" autocomplete="off" class="layui-input">
</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>
<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>
<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>
<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>
<script>
// 相关接口
const INSERT_API = '/app/admin/teacher-free-time/insert';
<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>
// 字段 日期 date
layui.use(['laydate'], function () {
layui.laydate.render({
elem: '#en_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.$('#en_month').val(month);
},
});
});
<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>
// 字段 时间 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 对象
<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);
}
}
},
});
});
// 相关接口
const INSERT_API = "/app/admin/teacher-free-time/insert";
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;
}
}
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
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)
}
});
})
if (layui.$('#time_zone_name').val()) {
let time_zone_offset = layui.$('#time_zone_offset').val();
let en_date = layui.$('#en_date').val();
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 对象
var value = data.value; // 获得被选中的值
var othis = data.othis; // 获得 select 元素被替换后的 jQuery 对象
// 计算教师本地年月日并填充
let teacher_date =
enYear +
'-' +
enMonth.toString().padStart(2, '0') +
'-' +
enDay.toString().padStart(2, '0');
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);
}
}
}
});
// 计算教师本地月份
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); // 教师时区偏移量
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('未查询到该教师时区信息，请先添加时区信息');
}
// 创建中国时间对象（基于教师本地时间转换）
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);
},
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 + "";
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");
// 计算中国日期（根据中国时间）
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);
}
if(b) s = s.substr(1);
return(pm + s).replace(/\.$/, "");
}
return this + "";
// 计算中国月份（根据中国时间）
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);
}
},
});
});
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;
});
});
</script>
</body>
//提交事件
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;
});
});
</script>
</body>
</html>

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

@ -19,7 +19,7 @@
<label class="layui-form-label required">教师</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" required lay-verify="required" lay-filter="selectTeacher">
<select lay-search="" name="teacher_id" required lay-verify="required" lay-filter="selectTeacher" disabled>
<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>
@ -43,30 +43,95 @@
</div>
</div>
<div class="layui-form-item">
<label class="layui-form-label required">日期</label>
<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" 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 class="layui-form-item">
<label class="layui-form-label">月份</label>
<label class="layui-form-label required">本地月份</label>
<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 class="layui-form-item">
<label class="layui-form-label required">本地时间</label>
<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 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">
<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">
<input
type="text"
name="time"
id="time"
value="{$teacher_free_time['time']}"
autocomplete="off"
readonly
class="layui-input"
/>
</div>
</div>
@ -105,7 +170,7 @@
// 字段 日期 date
layui.use(["laydate"], function () {
layui.laydate.render({
elem: "#date",
elem: "#en_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'))
@ -191,18 +256,107 @@
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)
}
let time_zone_offset = layui.$('#time_zone_offset').val();
let en_date = layui.$('#en_date').val();
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]);
// 教师当地时间
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 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="month" id="month" placeholder="请选择月份" autocomplete="off" class="layui-input">
</div>
@ -212,29 +212,40 @@
title: "教师", align: "center",
field: "teacher_name",
}, {
title: "日期", align: "center",
field: "date",
title: "本地日期", align: "center",
field: "en_date",
width: 120
}, {
title: "本地时间", align: "center",
field: "en_time",
width: 120
}, {
title: "中国日期", align: "center",
field: "date",
width: 120
}, {
title: "中国时间", align: "center",
field: "time",
width: 120
}, {
title: "课时", align: "center",
field: "hour",
}, {
title: "月份", align: "center",
title: "中国月份", align: "center",
field: "month",
width: 100
}, {
title: "课程", align: "center",
field: "subject_name",
width: 120
}, {
title: "学生", align: "center",
field: "student_name",
width: 120
}, {
title: "是否发布", align: "center",
field: "is_publish",
width: 120,
templet: function (d) {
let field = "is_publish";
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",
field: "teacher_name",
},{
title: "月份",align: "center",
title: "中国月份",align: "center",
field: "month",
},{
title: "总时间段/个",align: "center",

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

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

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

@ -24,11 +24,12 @@
</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="time_zone_name" value="{$free_time['time_zone_name']}" disabled
class="layui-input">
</div>
<span style="font-size: 12px;margin-left: 110px;color: chocolate;">此时区为教师添加空闲时的时区</span>
</div>
<div class="layui-form-item">
<label class="layui-form-label">时区时差</label>
@ -36,27 +37,42 @@
<input type="text" name="time_zone_offset" value="{$free_time['time_zone_offset']}" disabled
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="month" value="{$free_time['month']}" disabled 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" 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 class="layui-form-item">
<label class="layui-form-label">时间(本地)</label>
<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 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">
<label class="layui-form-label">时间(中国)</label>
<div class="layui-input-block">