课程作业添加是否合并报告

This commit is contained in:
Dai 2025-05-16 15:27:28 +08:00
parent fa5394ce81
commit 76ba5585aa
3 changed files with 37 additions and 0 deletions

View File

@ -103,6 +103,7 @@ class SubjectHomeworkService
'last_homework_feedback_url' => $last_homework_feedback_url, 'last_homework_feedback_url' => $last_homework_feedback_url,
'subject_report_url' => $subject_report_url, 'subject_report_url' => $subject_report_url,
'subject_file_url' => $subject_file_url, 'subject_file_url' => $subject_file_url,
'is_merge_report' => isset($data['is_merge_report']) && $data['is_merge_report']? 1 :0,
]); ]);
return [ return [

View File

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

View File

@ -86,6 +86,12 @@
<div name="is_publish" id="is_publish" value=""></div> <div name="is_publish" id="is_publish" value=""></div>
</div> </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"> <div class="layui-form-item layui-inline">
<label class="layui-form-label"></label> <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 () { layui.use(["table", "form", "common", "popup", "util"], function () {
let table = layui.table; let table = layui.table;
@ -262,6 +284,17 @@
let checked = d[field] === 1 ? "checked" : ""; 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 + '/>'; 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", title: "创建时间", align: "center",
field: "created_at", field: "created_at",