课程反馈
This commit is contained in:
parent
56c137fa86
commit
1327e12b0f
@ -52,8 +52,11 @@ class StudentFeedbackService
|
|||||||
'subject_id' => $teacher_schedule_time->subject_id,
|
'subject_id' => $teacher_schedule_time->subject_id,
|
||||||
'date' => $teacher_schedule_time->date,
|
'date' => $teacher_schedule_time->date,
|
||||||
'time' => $teacher_schedule_time->time,
|
'time' => $teacher_schedule_time->time,
|
||||||
|
'en_time' => $teacher_schedule_time->en_time,
|
||||||
'start_time' => $teacher_schedule_time->start_time,
|
'start_time' => $teacher_schedule_time->start_time,
|
||||||
'end_time' => $teacher_schedule_time->end_time,
|
'end_time' => $teacher_schedule_time->end_time,
|
||||||
|
'en_start_time' => $teacher_schedule_time->en_start_time,
|
||||||
|
'en_end_time' => $teacher_schedule_time->en_end_time,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return [
|
return [
|
||||||
|
@ -57,7 +57,7 @@ class StudentFeedbackController extends Crud
|
|||||||
}
|
}
|
||||||
if(isset($data['date']) && !empty($data['date'])){
|
if(isset($data['date']) && !empty($data['date'])){
|
||||||
if($data['date'][0] && $data['date'][1]){
|
if($data['date'][0] && $data['date'][1]){
|
||||||
$feedback->whereBetweenTime('create_time',$data['date'][0], $data[1] . ' 23:59:59');
|
$feedback->whereBetweenTime('created_at', $data['date'][0] . ' 00:00:00', $data['date'][1] . ' 23:59:59');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -68,8 +68,8 @@ class StudentFeedbackController extends Crud
|
|||||||
$page = $page > 0 ? $page : 1;
|
$page = $page > 0 ? $page : 1;
|
||||||
|
|
||||||
$total = $feedback->count();
|
$total = $feedback->count();
|
||||||
$list = $feedback->with(['student', 'teacher', 'subject'])->page($page, $limit)->select();
|
$list = $feedback->with(['student', 'teacher', 'subject'])
|
||||||
|
->page($page, $limit)->select();
|
||||||
|
|
||||||
return json([
|
return json([
|
||||||
'code' => ResponseCode::WEB_API_SUCCESS,
|
'code' => ResponseCode::WEB_API_SUCCESS,
|
||||||
@ -82,7 +82,7 @@ class StudentFeedbackController extends Crud
|
|||||||
return json([
|
return json([
|
||||||
'code' => ResponseCode::WEB_API_FAIL,
|
'code' => ResponseCode::WEB_API_FAIL,
|
||||||
'data' => [],
|
'data' => [],
|
||||||
'msg' => 'success'
|
'msg' => $e->getMessage()
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,12 +27,12 @@
|
|||||||
</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="feedback" value="" class="layui-input">
|
<!-- <input type="text" name="feedback" value="" 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>
|
||||||
@ -169,11 +169,21 @@
|
|||||||
title: "日期",align: "center",
|
title: "日期",align: "center",
|
||||||
field: "date",
|
field: "date",
|
||||||
},{
|
},{
|
||||||
title: "时间",align: "center",
|
title: "本地时间",align: "center",
|
||||||
|
field: "en_time",
|
||||||
|
},{
|
||||||
|
title: "中国时间",align: "center",
|
||||||
field: "time",
|
field: "time",
|
||||||
},{
|
},{
|
||||||
|
title: "课程报告",align: "center",
|
||||||
|
field: "feedback",
|
||||||
|
templet: function (d) {
|
||||||
|
return '<span><a href="'+ d['feedback_file_url'] +'" target="_blank" download="' + d['feedback_file_name'] + '">'+ d['feedback_file_name'] +'</a></span>';
|
||||||
|
}
|
||||||
|
},{
|
||||||
title: "反馈内容",align: "center",
|
title: "反馈内容",align: "center",
|
||||||
field: "feedback",
|
field: "feedback",
|
||||||
|
hide: true,
|
||||||
},{
|
},{
|
||||||
title: "start_time",align: "center",
|
title: "start_time",align: "center",
|
||||||
field: "start_time",
|
field: "start_time",
|
||||||
|
Loading…
x
Reference in New Issue
Block a user