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

学生排课，添加家长

Browse Source
This commit is contained in:
Dai 2024-07-16 23:51:41 +08:00
parent 939c2c9930
commit b503c1de16
6 changed files with 256 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/common/model/Student.php
View File

@ -23,6 +23,9 @@ use support\Model;
*/ */
class Student extends BaseModel class Student extends BaseModel
{ {
public function parent()
{
return $this->hasOne(StudentParent::class, 'id', 'parent_id')->bind(['parent_name']);
}
} }

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

@ -74,6 +74,11 @@ class TeacherScheduleTimeService
} }
} }
/**
* @desc 获取排课列表
* @param $request
* @return array
*/
public function getScheduleTime($request) public function getScheduleTime($request)
{ {
try { try {
@ -87,8 +92,17 @@ class TeacherScheduleTimeService
} }
$data = $request->get(); $data = $request->get();
$schedule = TeacherScheduleTime::where(['teacher_id'=>$teacher->id, 'date'=>$data['schedule_date']])->select(); $schedule = TeacherScheduleTime::where(['teacher_id'=>$teacher->id, 'month'=>$data['month']])
->field('id,teacher_id,date,time,hour,month,subject_id,is_publish')
->with(['subject'])
->select();
// foreach ($schedule as &$item){
// if(!$item->is_publish){
// $item->subject_name = '';
// $item->english_name = '';
// }
// }
return [ return [
'code' => ResponseCode::SUCCESS, 'code' => ResponseCode::SUCCESS,

50
plugin/admin/app/controller/StudentController.php
View File

@ -2,6 +2,7 @@
namespace plugin\admin\app\controller; namespace plugin\admin\app\controller;
use app\common\model\StudentParent;
use app\constant\ResponseCode; use app\constant\ResponseCode;
use support\Request; use support\Request;
use support\Response; use support\Response;
@ -39,6 +40,39 @@ class StudentController extends Crud
return view('student/index'); return view('student/index');
} }
public function select(Request $request): Response
{
try {
$data = $request->get();
$student = \app\common\model\Student::order('id asc');
if (isset($data['id']) && $data['id']) {
$student->where(['id' => $data['id']]);
}
$limit = (int)$request->get('limit', 10);
$limit = $limit <= 0 ? 10 : $limit;
$page = (int)$request->get('page');
$page = $page > 0 ? $page : 1;
$total = $student->count();
$list = $student->page($page, $limit)->with(['parent'])->select();
return json([
'code' => ResponseCode::WEB_API_SUCCESS,
'count' => $total,
'data' => $list,
'msg' => 'success'
]);
} catch (Exception $e) {
return json([
'code' => ResponseCode::WEB_API_FAIL,
'msg' => $e->getMessage()
]);
}
}
/** /**
* 插入 * 插入
* @param Request $request * @param Request $request
@ -64,7 +98,7 @@ class StudentController extends Crud
'password' => $password, 'password' => $password,
'salt' => $salt, 'salt' => $salt,
'avatar' => $request_data['avatar'], 'avatar' => $request_data['avatar'],
'parent_id' => 0, 'parent_id' => $request_data['parent_id'],
]); ]);
return json([ return json([
@ -73,7 +107,9 @@ class StudentController extends Crud
]); ]);
// return parent::insert($request); // return parent::insert($request);
} }
return view('student/insert');
$parent = StudentParent::order('id asc')->field('id,parent_name,account')->select()->toArray();
return view('student/insert', ['parent' => $parent]);
} }
/** /**
@ -98,7 +134,7 @@ class StudentController extends Crud
'student_name' => $request_data['student_name'], 'student_name' => $request_data['student_name'],
'account' => $request_data['account'], 'account' => $request_data['account'],
'avatar' => $request_data['avatar'], 'avatar' => $request_data['avatar'],
'parent_id' => 0, 'parent_id' => $request_data['parent_id'],
]; ];
} else { } else {
$salt = random_str(16); $salt = random_str(16);
@ -109,7 +145,7 @@ class StudentController extends Crud
'password' => $password, 'password' => $password,
'salt' => $salt, 'salt' => $salt,
'avatar' => $request_data['avatar'], 'avatar' => $request_data['avatar'],
'parent_id' => 0, 'parent_id' => $request_data['parent_id'],
]; ];
} }
@ -128,7 +164,9 @@ class StudentController extends Crud
// return parent::update($request); // return parent::update($request);
} }
return view('student/update');
$parent = StudentParent::order('id asc')->field('id,parent_name,account')->select()->toArray();
return view('student/update', ['parent' => $parent]);
} }
@ -150,7 +188,7 @@ class StudentController extends Crud
'salt' => $salt, 'salt' => $salt,
'password' => $password 'password' => $password
]); ]);
if(!$res){ if (!$res) {
throw new Exception('重置失败'); throw new Exception('重置失败');
} }

6
plugin/admin/app/view/student/index.html
View File

@ -102,7 +102,7 @@
hide: true hide: true
}, { }, {
title: "家长", align: "center", title: "家长", align: "center",
field: "parent_id", field: "parent_name",
}, { }, {
title: "创建时间", align: "center", title: "创建时间", align: "center",
field: "created_at", field: "created_at",
@ -213,7 +213,7 @@
title: "新增", title: "新增",
shade: 0.1, shade: 0.1,
maxmin: true, maxmin: true,
area: [common.isModile() ? "100%" : "500px", common.isModile() ? "100%" : "450px"], area: [common.isModile() ? "100%" : "750px", common.isModile() ? "100%" : "700px"],
content: INSERT_URL content: INSERT_URL
}); });
} }
@ -226,7 +226,7 @@
title: "修改", title: "修改",
shade: 0.1, shade: 0.1,
maxmin: true, maxmin: true,
area: [common.isModile() ? "100%" : "500px", common.isModile() ? "100%" : "450px"], area: [common.isModile() ? "100%" : "650px", common.isModile() ? "100%" : "700px"],
content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value content: UPDATE_URL + "?" + PRIMARY_KEY + "=" + value
}); });
} }

7
plugin/admin/app/view/student/insert.html
View File

@ -66,7 +66,12 @@
<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="parent_id" value="0" class="layui-input"> <select lay-search="" name="parent_id">
<option value="">请选择或搜索家长</option>
{foreach $parent as $item}
<option value="{$item['id']}">{$item['parent_name']}</option>
{/foreach}
</select>
</div> </div>
</div> </div>

78
plugin/admin/app/view/student/update.html
View File

@ -1,16 +1,16 @@
<!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"> <form class="layui-form">
<div class="mainBox"> <div class="mainBox">
<div class="main-container mr-5"> <div class="main-container mr-5">
@ -36,29 +36,31 @@
</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="salt" value="" class="layui-input">--> <!-- <input type="text" name="salt" 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>-->
<!-- <div class="layui-input-block">--> <!-- <div class="layui-input-block">-->
<!-- <input type="text" name="nickname" value="" class="layui-input">--> <!-- <input type="text" name="nickname" 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>
<div class="layui-input-block"> <div class="layui-input-block">
<img class="img-3" src=""/> <img class="img-3" src=""/>
<input type="text" style="display:none" name="avatar" value="" /> <input type="text" style="display:none" name="avatar" value=""/>
<button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="avatar" permission="app.admin.upload.image"> <button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="avatar"
permission="app.admin.upload.image">
<i class="layui-icon layui-icon-upload"></i>上传图片 <i class="layui-icon layui-icon-upload"></i>上传图片
</button> </button>
<button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="attachment-choose-avatar" permission="app.admin.upload.attachment"> <button type="button" class="pear-btn pear-btn-primary pear-btn-sm" id="attachment-choose-avatar"
permission="app.admin.upload.attachment">
<i class="layui-icon layui-icon-align-left"></i>选择图片 <i class="layui-icon layui-icon-align-left"></i>选择图片
</button> </button>
</div> </div>
@ -67,7 +69,13 @@
<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="parent_id" value="" class="layui-input"> <!-- <input type="text" name="parent_id" value="" class="layui-input">-->
<select lay-search="" name="parent_id">
<option value="">请选择或搜索家长</option>
{foreach $parent as $item}
<option value="{$item['id']}">{$item['parent_name']}</option>
{/foreach}
</select>
</div> </div>
</div> </div>
@ -85,14 +93,14 @@
</div> </div>
</div> </div>
</form> </form>
<script src="/app/admin/component/layui/layui.js?v=2.8.12"></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/component/pear/pear.js"></script>
<script src="/app/admin/component/jsoneditor/jsoneditor.js"></script> <script src="/app/admin/component/jsoneditor/jsoneditor.js"></script>
<script src="/app/admin/admin/js/permission.js"></script> <script src="/app/admin/admin/js/permission.js"></script>
<script> <script>
// 相关接口 // 相关接口
const PRIMARY_KEY = "id"; const PRIMARY_KEY = "id";
@ -109,7 +117,7 @@
// 给表单初始化数据 // 给表单初始化数据
layui.each(res.data[0], function (key, value) { layui.each(res.data[0], function (key, value) {
let obj = $('*[name="'+key+'"]'); let obj = $('*[name="' + key + '"]');
if (key === "password") { if (key === "password") {
obj.attr("placeholder", "不更新密码请留空"); obj.attr("placeholder", "不更新密码请留空");
return; return;
@ -124,10 +132,10 @@
}); });
// 字段 头像 avatar // 字段 头像 avatar
layui.use(["upload", "layer"], function() { layui.use(["upload", "layer"], function () {
let input = layui.$("#avatar").prev(); let input = layui.$("#avatar").prev();
input.prev().attr("src", input.val()); input.prev().attr("src", input.val());
layui.$("#attachment-choose-avatar").on("click", function() { layui.$("#attachment-choose-avatar").on("click", function () {
parent.layer.open({ parent.layer.open({
type: 2, type: 2,
title: "选择附件", title: "选择附件",
@ -169,7 +177,7 @@
phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"], phone: [/(^$)|^1\d{10}$/, "请输入正确的手机号"],
email: [/(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/, "邮箱格式不正确"], email: [/(^$)|^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/, "邮箱格式不正确"],
url: [/(^$)|(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/, "链接格式不正确"], url: [/(^$)|(^#)|(^http(s*):\/\/[^\s]+\.[^\s]+)/, "链接格式不正确"],
number: [/(^$)|^\d+$/,'只能填写数字'], 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]))*$/, "日期格式不正确"], 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)$)/, "请输入正确的身份证号"] identity: [/(^$)|(^\d{15}$)|(^\d{17}(x|X|\d)$)/, "请输入正确的身份证号"]
}); });
@ -194,8 +202,8 @@
}); });
}); });
</script> </script>
</body> </body>
</html> </html>