This commit is contained in:
Dai 2024-07-18 00:27:40 +08:00
commit 9498626c22
7 changed files with 756 additions and 1 deletions

View File

@ -3,6 +3,7 @@
namespace plugin\admin\app\controller;
use app\common\model\StudentParent;
use app\common\model\StudentSchedule;
use app\constant\ResponseCode;
use support\Request;
use support\Response;
@ -170,6 +171,65 @@ class StudentController extends Crud
}
/**
* @desc 查看课表
* @param Request $request
* @return Response
*/
public function checkSchedule(Request $request)
{
$data = $request->get();
$student = \app\common\model\Student::where(['id' => $data['student_id']])->findOrEmpty();
return view('student/check_schedule', ['student_id' => $data['student_id']]);
}
/**
* @desc 获取学生排课月份总览
* @param Request $request
* @return Response
*/
public function getStudentScheduleMonth(Request $request)
{
try {
$data = $request->get();
$schedule_time = StudentSchedule::where(['student_id' => $data['student_id']])
->field('
student_id,
month,
COUNT(id) AS total_courses,
SUM(hour) AS total_hours,
SUM(CASE WHEN is_publish = 1 THEN 1 ELSE 0 END) AS published_courses,
SUM(CASE WHEN is_publish = 0 THEN 1 ELSE 0 END) AS unpublished_courses
')
->group('month')
->with(['student']);
$limit = (int)$request->get('limit', 10);
$limit = $limit <= 0 ? 10 : $limit;
$page = (int)$request->get('page');
$page = $page > 0 ? $page : 1;
$total = $schedule_time->count();
$list = $schedule_time->page($page, $limit)->select();
return json([
'code' => ResponseCode::WEB_API_SUCCESS,
'data' => $list,
'count' => $total,
'msg' => 'success',
]);
} catch (Exception $e) {
return json([
'code' => ResponseCode::WEB_API_FAIL,
'msg' => $e->getMessage()
]);
}
}
/**
* @desc 重置密码
* @param Request $request

View File

@ -226,4 +226,71 @@ class StudentScheduleController extends Crud
}
}
/**
* @desc 教师月份课程安排日历
* @param Request $request
* @return Response
*/
public function studentSchedule(Request $request)
{
$data = $request->get();
$student_id = $data['student_id'];
$month = $data['month'];
$student = \app\common\model\Student::where(['id' => $student_id])->findOrEmpty()->toArray();
return view('student/student_schedule', ['student' => $student, 'month' => $month]);
}
/**
* @desc 学生排课日历数据
* @param Request $request
* @return Response
*/
public function getStudentSchedule(Request $request)
{
try {
$student_id = $request->post('id');
$start_date = date('Y-m-d H:i:s', strtotime($request->post('start_date')));
$end_date = date('Y-m-d 23:59:59', strtotime($request->post('end_date')));
$list = \app\common\model\StudentSchedule::where(['student_id' => $student_id])
->whereBetweenTime('start_time', $start_date, $end_date)
->with(['subject', 'teacher'])
->select()
->toArray();
$free_time = [];
foreach ($list as $item) {
$time_period = explode('-', $item['time']);
if ($item['subject_id']) {
$title = $item['time'] . PHP_EOL . $item['teacher_name'] . PHP_EOL . $item['subject_name'] . '/' . $item['english_name'];
if ($item['is_publish'] == 0) {
$color = 'orange';
} else {
$color = 'green';
}
} else {
$color = 'red';
$title = $item['time'];
}
$free_time[] = [
'free_time_id' => $item['id'],
'title' => $title,
'start' => $item['date'] . ' ' . $time_period[0],
'color' => $color,
];
}
return json([
'code' => ResponseCode::WEB_API_SUCCESS,
'data' => $free_time,
'msg' => 'success'
]);
} catch (Exception $e) {
return json([
'code' => ResponseCode::WEB_API_FAIL,
'msg' => $e->getMessage()
]);
}
}
}

View File

@ -0,0 +1,319 @@
<!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/admin/css/reset.css" />
</head>
<body class="pear-container">
<!-- 数据表格 -->
<div class="layui-card">
<div class="layui-card-body">
<table id="data-table" lay-filter="data-table"></table>
</div>
</div>
<!-- 表格顶部工具栏 -->
<script type="text/html" id="table-toolbar">
<!-- <button class="pear-btn pear-btn-primary pear-btn-md" lay-event="add" permission="app.admin.teacher.insert">-->
<!-- <i class="layui-icon layui-icon-add-1"></i>新增-->
<!-- </button>-->
<!-- <button class="pear-btn pear-btn-danger pear-btn-md" lay-event="batchRemove" permission="app.admin.teacher.delete">-->
<!-- <i class="layui-icon layui-icon-delete"></i>删除-->
<!-- </button>-->
</script>
<!-- 表格行工具栏 -->
<script type="text/html" id="table-bar">
<button class="pear-btn pear-btn-xs tool-btn" lay-event="check_schedule" permission="app.admin.teacher.update">查看排课</button>
<!-- <button class="pear-btn pear-btn-xs tool-btn" lay-event="remove" permission="app.admin.teacher.delete">删除</button>-->
</script>
<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/admin/js/permission.js"></script>
<script src="/app/admin/admin/js/common.js"></script>
<script>
// 相关常量
const PRIMARY_KEY = "id";
const SELECT_API = "/app/admin/student/getStudentScheduleMonth?student_id={$student_id}";
// 表格渲染
layui.use(["table", "form", "common", "popup", "util"], function() {
let table = layui.table;
let form = layui.form;
let $ = layui.$;
let common = layui.common;
let util = layui.util;
// 表头参数
let cols = [
{
type: "checkbox",
align: "center"
},{
title: "学生",align: "center",
field: "student_name",
},{
title: "月份",align: "center",
field: "month",
},{
title: "总时间段/个",align: "center",
field: "total_courses",
templet: function (d) {
let field = "total_courses";
return '<span class="layui-badge layui-bg-blue">'+ d[field] +'</span>';
}
},{
title: "总时长/h",align: "center",
field: "total_hours",
templet: function (d) {
let field = "total_hours";
return '<span class="layui-badge layui-bg-blue">'+ d[field] +'</span>';
}
},{
title: "已发布课程",align: "center",
field: "published_courses",
templet: function (d) {
let field = "published_courses";
return '<span class="layui-badge layui-bg-green">'+ d[field] +'</span>';
}
},{
title: "未发布课程",align: "center",
field: "unpublished_courses",
templet: function (d) {
let field = "unpublished_courses";
return '<span class="layui-badge layui-bg-oragne">'+ d[field] +'</span>';
}
},{
title: "deleted_at",align: "center",
field: "deleted_at",
hide: true,
},{
title: "操作",
toolbar: "#table-bar",
align: "center",
fixed: "right",
width: 180,
}
];
// 渲染表格
table.render({
elem: "#data-table",
url: SELECT_API,
page: true,
cols: [cols],
skin: "line",
size: "lg",
toolbar: "#table-toolbar",
autoSort: false,
defaultToolbar: [{
title: "刷新",
layEvent: "refresh",
icon: "layui-icon-refresh",
}, "filter", "print", "exports"],
done: function () {
layer.photos({photos: 'div[lay-id="data-table"]', anim: 5});
}
});
// 编辑或删除行事件
table.on("tool(data-table)", function(obj) {
if (obj.event === "remove") {
remove(obj);
} else if (obj.event === "edit") {
edit(obj);
}else if (obj.event === "check_schedule") {
check_schedule(obj);
} else if (obj.event === "rest_password") {
rest_password(obj);
}
});
// 表格顶部工具栏事件
table.on("toolbar(data-table)", function(obj) {
if (obj.event === "add") {
add();
} else if (obj.event === "refresh") {
refreshTable();
} else if (obj.event === "batchRemove") {
batchRemove(obj);
}
});
// 表格顶部搜索事件
form.on("submit(table-query)", function(data) {
table.reload("data-table", {
page: {
curr: 1
},
where: data.field
})
return false;
});
// 表格顶部搜索重置事件
form.on("submit(table-reset)", function(data) {
table.reload("data-table", {
where: []
})
});
// 字段允许为空
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)$)/, "请输入正确的身份证号"]
});
// 表格排序事件
table.on("sort(data-table)", function(obj){
table.reload("data-table", {
initSort: obj,
scrollPos: "fixed",
where: {
field: obj.field,
order: obj.type
}
});
});
// 表格新增数据
let add = function() {
layer.open({
type: 2,
title: "新增",
shade: 0.1,
maxmin: true,
area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
content: INSERT_URL
});
}
// 表格编辑数据
let edit = function(obj) {
let value = obj.data[PRIMARY_KEY];
layer.open({
type: 2,
title: "修改",
shade: 0.1,
maxmin: true,
area: [common.isModile()?"100%":"500px", common.isModile()?"100%":"450px"],
content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
});
}
// 老师课程安排
let check_schedule = function(obj) {
console.log(21312,obj);
let student_id = obj.data['student_id'];
let month = obj.data['month'];
let index = layer.open({
type: 2,
title: "修改",
shade: 0.1,
maxmin: true,
area: [common.isModile()?"100%":"950px", common.isModile()?"100%":"650px"],
content: '/app/admin/studentSchedule/studentSchedule?student_id=' + student_id + '&month=' + month
});
// layer.full(index);
}
// 表格编辑数据
let rest_password = function(obj) {
console.log()
let data = {};
data[PRIMARY_KEY] = obj.data[PRIMARY_KEY];
let new_password = 'YD' + obj.data['account'] + '123';
layer.confirm("确定充值密码?重置后新密码为【"+ new_password +"】", {
icon: 3,
title: "提示"
}, function(index) {
layer.close(index);
let loading = layer.load();
$.ajax({
url: '/app/admin/teacher/resetPassword',
data: data,
dataType: "json",
type: "post",
success: function(res) {
layer.close(loading);
if (res.code) {
return layui.popup.failure(res.msg);
}
return layui.popup.success("操作成功", refreshTable);
}
})
});
}
// 删除一行
let remove = function(obj) {
return doRemove(obj.data[PRIMARY_KEY]);
}
// 删除多行
let batchRemove = function(obj) {
let checkIds = common.checkField(obj, PRIMARY_KEY);
if (checkIds === "") {
layui.popup.warning("未选中数据");
return false;
}
doRemove(checkIds.split(","));
}
// 执行删除
let doRemove = function (ids) {
let data = {};
data[PRIMARY_KEY] = ids;
layer.confirm("确定删除?", {
icon: 3,
title: "提示"
}, function(index) {
layer.close(index);
let loading = layer.load();
$.ajax({
url: DELETE_API,
data: data,
dataType: "json",
type: "post",
success: function(res) {
layer.close(loading);
if (res.code) {
return layui.popup.failure(res.msg);
}
return layui.popup.success("操作成功", refreshTable);
}
})
});
}
// 刷新表格数据
window.refreshTable = function() {
table.reloadData("data-table", {
scrollPos: "fixed",
done: function (res, curr) {
if (curr > 1 && res.data && !res.data.length) {
curr = curr - 1;
table.reloadData("data-table", {
page: {
curr: curr
},
})
}
}
});
}
})
</script>
</body>
</html>

View File

@ -31,6 +31,7 @@
<!-- 表格行工具栏 -->
<script type="text/html" id="table-bar">
<button class="pear-btn pear-btn-xs tool-btn" lay-event="edit" permission="app.admin.student.update">编辑</button>
<button class="pear-btn pear-btn-xs tool-btn" lay-event="check_schedule" permission="app.admin.student.update">查看课表</button>
<button class="pear-btn pear-btn-xs tool-btn" lay-event="rest_password" permission="app.admin.teacher.update">
重置密码
</button>
@ -150,6 +151,8 @@
remove(obj);
} else if (obj.event === "edit") {
edit(obj);
} else if (obj.event === "check_schedule") {
check_schedule(obj);
} else if (obj.event === "rest_password") {
rest_password(obj);
}
@ -230,6 +233,18 @@
content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
});
}
// 查看课表
let check_schedule = function (obj) {
let value = obj.data[PRIMARY_KEY];
layer.open({
type: 2,
title: "查看课表",
shade: 0.1,
maxmin: true,
area: [common.isModile() ? "100%" : "1000px", common.isModile() ? "100%" : "750px"],
content: "/app/admin/student/checkSchedule?student_id=" + value
});
}
let rest_password = function (obj) {
console.log()

View File

@ -0,0 +1,291 @@
<!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"/>
<script src='/app/admin/resource/fullcalendar/index.global6.1.15.min.js'></script>
<!-- <script src='https://cdn.jsdelivr.net/npm/fullcalendar@6.1.15/index.global.min.js'></script>-->
<style>
body {
margin-top: 40px;
font-size: 14px;
font-family: Arial, Helvetica Neue, Helvetica, sans-serif;
}
#external-events {
/*position: fixed;*/
left: 20px;
top: 20px;
width: 150px;
padding: 0 10px;
border: 1px solid #ccc;
background: #eee;
text-align: left;
}
#external-events h4 {
font-size: 16px;
margin-top: 0;
padding-top: 1em;
}
#external-events .fc-event {
margin: 3px 0;
cursor: move;
}
#external-events p {
margin: 1.5em 0;
font-size: 11px;
color: #666;
}
#external-events p input {
margin: 0;
vertical-align: middle;
}
#calendar-wrap {
margin-left: 200px;
}
#calendar {
max-width: 1100px;
margin: 0 auto;
}
</style>
</head>
<body>
<form class="layui-form">
<div class="mainBox">
<div class="main-container mr-5">
<div id='wrap' style="display: flex;">
<div id='external-events'>
<h4>学生信息</h4>
<div>
<div class='fc-event-main'>{$student['student_name']}</div>
</div>
<div style="display: flex;flex-direction: column;">
<!-- <div style="width: 100px;height: 20px;">-->
<!-- <span class="layui-badge-dot layui-bg-danger"></span>-->
<!-- <span>未排课</span>-->
<!-- </div>-->
<div style="width: 120px;height: 20px;">
<span class="layui-badge-dot layui-bg-orange"></span>
<span>已排课,未发布</span>
</div>
<div style="width: 100px;height: 20px;">
<span class="layui-badge-dot layui-bg-green"></span>
<span>已发布</span>
</div>
</div>
<div id='external-events-list'>
</div>
</div>
<div id='calendar' style="height: 650px;width: 750px;"></div>
</div>
</div>
</div>
<div class="bottom">
<div class="button-container">
<button type="submit" class="pear-btn pear-btn-primary pear-btn-md" lay-submit="" lay-filter="save">
确定
</button>
<!-- <button type="reset" class="pear-btn pear-btn-md">-->
<!-- 重置-->
<!-- </button>-->
</div>
</div>
</form>
<script src="/app/admin/component/layui/layui.js?v=2.8.12"></script>
<script src="/app/admin/component/pear/pear.js"></script>
<script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
<script src="/app/admin/admin/js/permission.js"></script>
<script>
// 相关接口
const PRIMARY_KEY = "id";
const SELECT_API = "/app/admin/teacher-free-time/select" + location.search;
const UPDATE_API = "/app/admin/teacher-free-time/update";
// // 获取数据库记录
layui.use(["form", "util", "popup"], function () {
let $ = layui.$;
// var containerEl = document.getElementById('external-events-list');
// new FullCalendar.Draggable(containerEl, {
// itemSelector: '.fc-event',
// eventData: function (eventEl) {
// return {
// title: eventEl.innerText.trim()
// }
// }
// });
// document.addEventListener('DOMContentLoaded', function () {
var calendarEl = document.getElementById('calendar');
var calendar = new FullCalendar.Calendar(calendarEl, {
// plugins: [ 'interaction', 'dayGrid', 'timeGrid' ],
locale: 'zh-cn', // 设置中文
headerToolbar: {
// left: 'prev,next today',
left: 'today',
center: 'title',
right: 'dayGridMonth,timeGridWeek,timeGridDay'
},
buttonText: {
today: '今日',
month: '月',
week: '周',
day: '日',
list: '列表'
},
allDayText : '全天',
initialDate: '{$month}',
eventLimit: 4, // 显示更多
navLinks: true, // can click day/week names to navigate views
selectable: true,
selectMirror: true,
displayEventEnd: true, // 显示结束时间
select: function (arg) {
// var title = prompt('Event Title:');
// if (title) {
// calendar.addEvent({
// title: title,
// start: arg.start,
// end: arg.end,
// allDay: arg.allDay
// })
// }
// calendar.unselect()
},
eventClick: function (arg) {
console.log('点击时间', arg)
console.log('点击时间', arg.event.extendedProps.free_time_id)
let free_time_id = arg.event.extendedProps.free_time_id
// 表格编辑数据
layer.open({
type: 2,
fix: false,
title: "学生排课",
shade: 0.1,
maxmin: true,
area: ["750px", "700px"],
content: "/app/admin/teacher/scheduleTimeSet?free_time_id=" + free_time_id
});
// if (confirm('您确定要删除此事件吗?')) {
// arg.event.remove()
// }
},
editable: true,
dayMaxEvents: true, // allow "more" link when too many events
events: function (info, successCallback, failureCallback) {
console.log('12312313', info)
let start_date = info.startStr;
let end_date = info.endStr;
let student_id = "{$student['id']}"
layui.$.ajax({
url: '/app/admin/studentSchedule/getStudentSchedule',
type: "POST",
dateType: "json",
data: {id: student_id, start_date: start_date, end_date: end_date},
success: function (res) {
console.log(res)
if (res.code == 0) {
successCallback(res.data);
} else {
failureCallback(res.errStr);
}
// if (res.code) {
// return layui.popup.failure(res.msg);
// }
// return layui.popup.success("操作成功", function () {
// parent.refreshTable();
// parent.layer.close(parent.layer.getFrameIndex(window.name));
// });
}
});
},
eventTextColor: function (obj) {
console.log('字体颜色', obj)
},
eventMouseEnter: function (info) {
console.log('鼠标', info)
let jsEvent = info.jsEvent
let tip_content = info.event.title;
layer.tips(tip_content, jsEvent.toElement, {
tips: 2
});
// 将弹窗添加到页面上
// layui.$('body').append(popup);
// new toolTop();
// layer.open()
// var index = layer.open({
// type: 4, // page 层类型,其他类型详见「基础属性」
// // content: layui.$('.' + jsEvent.toElement.getAttribute('class'))
// content: jsEvent.toElement,
// tips:2,
// });
},
eventMouseLeave: function (info) {
// console.log('移走', info)
// layui.$('.popup').remove();
layer.closeAll('tips');
}
});
calendar.render();
// });
});
//提交事件
layui.use(["form", "popup"], function () {
// parent.layer.close(parent.layer.getFrameIndex(window.name));
// return false;
// 字段验证允许为空
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) {
parent.refreshTable();
parent.layer.close(parent.layer.getFrameIndex(window.name));
// return false;
});
});
// 刷新表格数据
window.refreshTable = function() {
parent.refreshTable();
}
</script>
</body>
</html>

View File

@ -178,6 +178,7 @@
day: '日',
list: '列表'
},
allDayText : '全天',
// initialDate: '2024-07-14',
eventLimit: 4, // 显示更多
navLinks: true, // can click day/week names to navigate views

View File

@ -145,7 +145,8 @@
// plugins: [ 'interaction', 'dayGrid', 'timeGrid' ],
locale: 'zh-cn', // 设置中文
headerToolbar: {
left: 'prev,next today',
// left: 'prev,next today',
left: 'today',
center: 'title',
right: 'dayGridMonth,timeGridWeek,timeGridDay'
},
@ -194,6 +195,7 @@
// }
},
editable: true,
allDayText : '全天',
dayMaxEvents: true, // allow "more" link when too many events
events: function (info, successCallback, failureCallback) {
console.log('12312313', info)