diff --git a/frontend/admin/subjects.php b/frontend/admin/subjects.php
index 6fe47c4..1158e24 100644
--- a/frontend/admin/subjects.php
+++ b/frontend/admin/subjects.php
@@ -1,11 +1,11 @@
false,
- CURLOPT_SSL_VERIFYHOST => 0
+ CURLOPT_SSL_VERIFYPEER => true,
+ CURLOPT_SSL_VERIFYHOST => 2
]);
$apiResponse = curl_exec($ch);
diff --git a/frontend/api/clear_session.php b/frontend/api/clear_session.php
index 13c84ed..e0c7eb3 100644
--- a/frontend/api/clear_session.php
+++ b/frontend/api/clear_session.php
@@ -1,11 +1,11 @@
false, 'error' => '未授权']);
exit();
}
+$userType = $_SESSION['user_type'];
$role = $_SESSION['role'] ?? '';
-if ($role !== '班主任') {
+if ($userType === 'admin' && $role !== '班主任') {
http_response_code(403);
echo json_encode(['success' => false, 'error' => '权限不足']);
exit();
@@ -27,7 +28,8 @@ if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
exit();
}
-$stepVersion = $_GET['version'] ?? '';
+$input = json_decode(file_get_contents('php://input'), true);
+$stepVersion = $input['version'] ?? '';
if (empty($stepVersion)) {
http_response_code(400);
echo json_encode(['success' => false, 'error' => '缺少版本号参数']);
@@ -56,8 +58,8 @@ curl_setopt_array($ch, [
'Authorization: Bearer ' . $token,
'Content-Type: application/json'
],
- CURLOPT_SSL_VERIFYPEER => false,
- CURLOPT_SSL_VERIFYHOST => 0
+ CURLOPT_SSL_VERIFYPEER => true,
+ CURLOPT_SSL_VERIFYHOST => 2
]);
$apiResponse = curl_exec($ch);
diff --git a/frontend/api/save_session.php b/frontend/api/save_session.php
index 6d0b4f0..91c829b 100644
--- a/frontend/api/save_session.php
+++ b/frontend/api/save_session.php
@@ -1,11 +1,11 @@
false,
+ 'message' => '跨域请求被拒绝'
+ ]);
+ exit();
+ }
+} elseif (!empty($referer)) {
+ $parsedReferer = parse_url($referer, PHP_URL_HOST);
+ if ($parsedReferer !== $host && $parsedReferer !== $serverName) {
+ http_response_code(403);
+ echo json_encode([
+ 'success' => false,
+ 'message' => '跨域请求被拒绝'
+ ]);
+ exit();
+ }
+}
+
// 获取原始输入
$input = file_get_contents('php://input');
@@ -82,7 +109,7 @@ if (!empty($missingFields)) {
}
// 验证 user_type 是否合法
-$validUserTypes = ['student', 'parent', 'admin'];
+$validUserTypes = ['student', 'parent', 'admin', 'super_admin'];
if (!in_array($data['user_type'], $validUserTypes)) {
http_response_code(400);
echo json_encode([
@@ -115,8 +142,8 @@ curl_setopt_array($ch, [
'Authorization: Bearer ' . $token,
'Content-Type: application/json'
],
- CURLOPT_SSL_VERIFYPEER => false,
- CURLOPT_SSL_VERIFYHOST => 0
+ CURLOPT_SSL_VERIFYPEER => true,
+ CURLOPT_SSL_VERIFYHOST => 2
]);
$apiResponse = curl_exec($ch);
@@ -153,18 +180,23 @@ if ($tokenUserId === null || intval($tokenUserId) !== intval($data['user_id']))
exit();
}
-// 设置 Session 变量
-$_SESSION['user_id'] = $data['user_id'];
-$_SESSION['user_type'] = $data['user_type'];
-$_SESSION['username'] = $data['username'];
-$_SESSION['real_name'] = $data['real_name'] ?? '';
-$_SESSION['role'] = $data['role'] ?? '';
+// 从后端 JWT 解析权威数据（不信任客户端传入的 user_type/role）
+$tokenData_user = $tokenData['data'];
+// 登录成功后重新生成 Session ID，防止 Session 固定攻击
+session_regenerate_id(true);
+$_SESSION['user_id'] = intval($tokenData_user['user_id']);
+$_SESSION['user_type'] = $tokenData_user['user_type'];
+$_SESSION['username'] = $tokenData_user['username'];
+$_SESSION['real_name'] = $tokenData_user['real_name'] ?? '';
+$_SESSION['role'] = $tokenData_user['role'] ?? '';
+$_SESSION['class_id'] = $tokenData_user['class_id'] ?? null;
+$_SESSION['class_name'] = $tokenData_user['class_name'] ?? '';
$_SESSION['login_time'] = time();
$_SESSION['jwt_token'] = $token;
-
-// 如果是学生，额外设置 student_id
-if ($data['user_type'] === 'student') {
- if (empty($data['student_id'])) {
+// 如果是学生，额外设置 student_id（仅从 JWT 解析，不信任客户端传入值）
+if ($_SESSION['user_type'] === 'student') {
+ $studentId = $tokenData_user['student_id'] ?? null;
+ if (empty($studentId)) {
http_response_code(400);
echo json_encode([
'success' => false,
@@ -172,7 +204,7 @@ if ($data['user_type'] === 'student') {
]);
exit();
}
- $_SESSION['student_id'] = $data['student_id'];
+ $_SESSION['student_id'] = $studentId;
}
// 保存 Session
diff --git a/frontend/assets/css/admin.css b/frontend/assets/css/admin.css
index 871595a..497d5e8 100644
--- a/frontend/assets/css/admin.css
+++ b/frontend/assets/css/admin.css
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 管理端样式
+ * 多班级版班级管理系统 - 管理端样式
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/css/style.css b/frontend/assets/css/style.css
index 86bcf54..624a044 100644
--- a/frontend/assets/css/style.css
+++ b/frontend/assets/css/style.css
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 全局样式
+ * 多班级版班级管理系统 - 全局样式
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
@@ -691,6 +691,10 @@ tr:hover {
background: #ed8936;
}
+.toast-info {
+ background: var(--color-primary);
+}
+
@keyframes fadeInUp {
from {
opacity: 0;
diff --git a/frontend/assets/js/admins.js b/frontend/assets/js/admins.js
index c4e2f06..d943d6d 100644
--- a/frontend/assets/js/admins.js
+++ b/frontend/assets/js/admins.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 管理员管理页JS
+ * 多班级版班级管理系统 - 管理员管理页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
diff --git a/frontend/assets/js/attendance-manage.js b/frontend/assets/js/attendance-manage.js
index ec79f9a..6302f49 100644
--- a/frontend/assets/js/attendance-manage.js
+++ b/frontend/assets/js/attendance-manage.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 考勤管理页JS
+ * 多班级版班级管理系统 - 考勤管理页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
diff --git a/frontend/assets/js/cadre-homework.js b/frontend/assets/js/cadre-homework.js
new file mode 100644
index 0000000..688b5ee
--- /dev/null
+++ b/frontend/assets/js/cadre-homework.js
@@ -0,0 +1,159 @@
+/**
+ * 多班级版班级管理系统 - 课代表作业管理JS
+ *
+ * 开发者: Canglan
+ * 版权归属: Sea Network Technology Studio
+ *
+ * 版权所有 © Sea Network Technology Studio
+ */
+
+(function() {
+'use strict';
+
+var currentPage = 1;
+var pageSize = 20;
+var currentAssignmentId = null;
+
+async function loadHomework(page) {
+ var res = await apiGet('/api/cadre/homework', { page: page, page_size: pageSize });
+ if (res && res.success && res.data) {
+ var items = res.data.items || res.data.records || [];
+ var total = res.data.total || 0;
+ var html = '';
+ if (items.length === 0) {
+ html = '
| 暂无作业记录 |
';
+ } else {
+ items.forEach(function(item) {
+ html += '
' +
+ '| ' + escapeHtml(item.title || '-') + ' | ' +
+ '' + escapeHtml(item.subject_name || '-') + ' | ' +
+ '' + formatDate(item.deadline) + ' | ' +
+ '' + escapeHtml(item.description || '-') + ' | ' +
+ ' | ' +
+ '
';
+ });
+ }
+ document.getElementById('homeworkList').innerHTML = html;
+
+ var totalPages = Math.ceil(total / pageSize);
+ if (totalPages > 1) {
+ document.getElementById('pagination').style.display = 'flex';
+ document.getElementById('pageInfo').textContent = page + ' / ' + totalPages;
+ document.getElementById('prevBtn').disabled = page <= 1;
+ document.getElementById('nextBtn').disabled = page >= totalPages;
+ } else {
+ document.getElementById('pagination').style.display = 'none';
+ }
+ }
+}
+
+window.changePage = function(delta) {
+ currentPage += delta;
+ loadHomework(currentPage);
+};
+
+window.showPublishModal = function() {
+ document.getElementById('publishForm').reset();
+ document.getElementById('hwDeadline').value = new Date().toISOString().split('T')[0];
+ document.getElementById('publishModal').style.display = 'flex';
+};
+
+window.submitHomework = async function() {
+ var title = document.getElementById('hwTitle').value.trim();
+ var deadline = document.getElementById('hwDeadline').value;
+ var description = document.getElementById('hwDescription').value.trim();
+
+ if (!title) {
+ showToast('请填写作业标题', 'error');
+ return;
+ }
+ if (!deadline) {
+ showToast('请选择截止日期', 'error');
+ return;
+ }
+
+ var res = await apiPost('/api/cadre/homework', {
+ title: title,
+ deadline: deadline,
+ description: description
+ });
+
+ if (res && res.success) {
+ showToast('作业发布成功');
+ closeModal('publishModal');
+ loadHomework(currentPage);
+ } else {
+ showToast(res && res.message ? res.message : '发布失败', 'error');
+ }
+};
+
+window.showAbsentModal = async function(assignmentId) {
+ currentAssignmentId = assignmentId;
+ var res = await apiGet('/api/admin/students', { page_size: 1000 });
+ if (res && res.success && res.data) {
+ var students = res.data.students || res.data.items || [];
+ var html = '
';
+ if (students.length === 0) {
+ html += '
暂无学生数据
';
+ } else {
+ html += '
';
+ }
+ document.getElementById('absentStudentList').innerHTML = html;
+ document.getElementById('absentModal').style.display = 'flex';
+ } else {
+ showToast('获取学生列表失败', 'error');
+ }
+};
+
+window.toggleAllAbsent = function(el) {
+ var checkboxes = document.querySelectorAll('.absent-checkbox');
+ checkboxes.forEach(function(cb) { cb.checked = el.checked; });
+};
+
+window.submitAbsent = async function() {
+ var checkboxes = document.querySelectorAll('.absent-checkbox:checked');
+ if (checkboxes.length === 0) {
+ showToast('请选择至少一名缺交学生', 'error');
+ return;
+ }
+
+ var studentIds = [];
+ checkboxes.forEach(function(cb) {
+ studentIds.push(parseInt(cb.getAttribute('data-id')));
+ });
+
+ var hwDeduct = window.DEDUCTION_HOMEWORK_NOT_SUBMIT || 2;
+ var res = await apiPost('/api/cadre/conduct/add', {
+ student_ids: studentIds,
+ points_change: -hwDeduct,
+ reason: '作业未提交',
+ related_type: 'homework'
+ });
+
+ if (res && res.success) {
+ showToast('已登记 ' + studentIds.length + ' 名学生缺交');
+ closeModal('absentModal');
+ } else {
+ showToast(res && res.message ? res.message : '提交失败', 'error');
+ }
+};
+
+window.closeModal = function(id) {
+ document.getElementById(id).style.display = 'none';
+};
+
+document.addEventListener('DOMContentLoaded', function() {
+ loadHomework(currentPage);
+});
+
+})();
diff --git a/frontend/assets/js/common.js b/frontend/assets/js/common.js
index 7c693a7..1f61775 100644
--- a/frontend/assets/js/common.js
+++ b/frontend/assets/js/common.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 公共JS
+ * 多班级版班级管理系统 - 公共JS
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
@@ -18,7 +18,7 @@ function getUserInfo() {
if (!userStr) return null;
try {
return JSON.parse(userStr);
- } catch {
+ } catch (e) {
return null;
}
}
@@ -191,11 +191,13 @@ async function logout() {
function escapeHtml(str) {
if (!str) return '';
return String(str)
- .replace(/&/g, '\x26amp;')
- .replace(//g, '\x26gt;')
- .replace(/"/g, '\x26quot;')
- .replace(/'/g, '\x26#x27;');
+ .replace(/&/g, '&')
+ .replace(//g, '>')
+ .replace(/"/g, '"')
+ .replace(/'/g, ''')
+ .replace(/`/g, '`')
+ .replace(/\//g, '/');
}
/**
@@ -383,21 +385,19 @@ document.addEventListener('click', function(e) {
}
});
-// 全局textarea键盘事件：Enter提交表单，Ctrl+Enter换行
+// 全局textarea键盘事件：Ctrl+Enter提交表单，Enter换行（默认行为）
document.addEventListener('keydown', function(e) {
if (e.target.tagName !== 'TEXTAREA') return;
- if (e.key === 'Enter' && !e.ctrlKey && !e.shiftKey && !e.metaKey) {
- // Enter键提交表单
+ if (e.key === 'Enter' && (e.ctrlKey || e.metaKey)) {
+ // Ctrl+Enter / Cmd+Enter 提交表单
e.preventDefault();
var form = e.target.closest('form');
if (form) {
- // 触发form的submit事件
var submitEvent = new Event('submit', { cancelable: true, bubbles: true });
form.dispatchEvent(submitEvent);
}
}
- // Ctrl+Enter和Shift+Enter保持默认换行行为（不拦截）
});
window.selectDeductionType = function(points, reason) {
diff --git a/frontend/assets/js/conduct.js b/frontend/assets/js/conduct.js
index 78d4bc5..5457493 100644
--- a/frontend/assets/js/conduct.js
+++ b/frontend/assets/js/conduct.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 操行分管理页JS
+ * 多班级版班级管理系统 - 操行分管理页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
@@ -20,7 +20,7 @@ async function loadStudents() {
${escapeHtml(student.student_no)} |
${escapeHtml(student.name)} |
${student.total_points} |
-
|
+
|
`;
});
if (res.data.students.length === 0) {
@@ -39,7 +39,7 @@ function showSinglePointsModal(studentId, studentName) {
}
async function exportMoralityRecords() {
- showToast('正在导出德育分记录...', 'info');
+ showToast('正在导出操行分记录...', 'info');
try {
const studentsRes = await apiGet('/api/admin/students', { page_size: 1000 });
@@ -54,13 +54,20 @@ async function exportMoralityRecords() {
return;
}
- const historyRes = await apiGet('/api/admin/conduct/history', { page: 1, page_size: 1000 });
- if (!historyRes || !historyRes.success) {
- showToast('获取历史记录失败', 'error');
- return;
- }
-
- const allRecords = historyRes.data.records || [];
+ const allRecords = [];
+ let page = 1;
+ let totalPages = 1;
+ do {
+ const historyRes = await apiGet('/api/admin/conduct/history', { page: page, page_size: 500 });
+ if (!historyRes || !historyRes.success) {
+ showToast('获取历史记录失败', 'error');
+ return;
+ }
+ const records = historyRes.data.records || [];
+ allRecords.push(...records);
+ totalPages = historyRes.data.total_pages || 1;
+ page++;
+ } while (page <= totalPages);
const recordsByStudent = {};
allRecords.forEach(record => {
@@ -90,7 +97,7 @@ async function exportMoralityRecords() {
if (field === null || field === undefined) return '';
let str = String(field).replace(/[\r\n]+/g, ' ');
str = str.replace(/"/g, '""');
- if (/[\,\;\"\s]/.test(str)) {
+ if (/[\,\"\s]/.test(str)) {
str = '"' + str + '"';
}
return str;
@@ -106,7 +113,7 @@ async function exportMoralityRecords() {
const url = URL.createObjectURL(blob);
const link = document.createElement('a');
link.href = url;
- link.download = `德育分记录_${new Date().toISOString().slice(0,10)}.csv`;
+ link.download = `操行分记录_${new Date().toISOString().slice(0,10)}.csv`;
document.body.appendChild(link);
link.click();
document.body.removeChild(link);
@@ -119,7 +126,7 @@ async function exportMoralityRecords() {
}
}
// 宿舍集体加分相关
-var dormitoryStudentIds = [];
+let dormitoryStudentIds = [];
async function showDormitoryPointsModal() {
dormitoryStudentIds = [];
@@ -196,6 +203,11 @@ async function submitDormitoryPoints() {
return;
}
+ if (Math.abs(pointsChange) > 100) {
+ showToast('分值绝对值不能超过100', 'error');
+ return;
+ }
+
if (!reason.trim()) {
showToast('请填写原因', 'error');
return;
@@ -204,7 +216,8 @@ async function submitDormitoryPoints() {
const data = {
student_ids: dormitoryStudentIds,
points_change: pointsChange,
- reason: reason
+ reason: reason,
+ related_type: 'manual'
};
const res = await apiPost('/api/admin/conduct/add', data);
@@ -220,6 +233,16 @@ async function submitDormitoryPoints() {
loadStudents();
+document.getElementById('studentList').addEventListener('click', function(e) {
+ const btn = e.target.closest('.js-single-points');
+ if (btn) {
+ showSinglePointsModal(
+ parseInt(btn.dataset.studentId, 10),
+ btn.dataset.studentName
+ );
+ }
+});
+
window.loadStudents = loadStudents;
window.showSinglePointsModal = showSinglePointsModal;
window.exportMoralityRecords = exportMoralityRecords;
diff --git a/frontend/assets/js/dashboard.js b/frontend/assets/js/dashboard.js
index 3a948f9..5c7b375 100644
--- a/frontend/assets/js/dashboard.js
+++ b/frontend/assets/js/dashboard.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 管理端首页JS
+ * 多班级版班级管理系统 - 管理端首页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
diff --git a/frontend/assets/js/history.js b/frontend/assets/js/history.js
index 766cf2a..2a13bb9 100644
--- a/frontend/assets/js/history.js
+++ b/frontend/assets/js/history.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 历史记录页JS
+ * 多班级版班级管理系统 - 历史记录页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
@@ -15,11 +15,14 @@ const currentUserId = window.PAGE_CONFIG.userId;
let currentHistoryPage = 1;
let totalHistoryPages = 1;
-function escapeHtml(str) {
- if (!str) return '';
- var el = document.createElement('span');
- el.appendChild(document.createTextNode(str));
- return el.innerHTML;
+function getTypeLabel(relatedType) {
+ if (!relatedType) return '操行';
+ switch (relatedType) {
+ case 'conduct': return '操行';
+ case 'homework': return '作业';
+ case 'attendance': return '考勤';
+ default: return relatedType;
+ }
}
async function loadStudentsForSelect() {
@@ -35,9 +38,9 @@ async function loadStudentsForSelect() {
// 加载科目下拉列表
async function loadSubjectsForFilter() {
- var subjectSelect = document.getElementById('historySubjectFilter');
+ let subjectSelect = document.getElementById('historySubjectFilter');
if (!subjectSelect) return;
- var res = await apiGet('/api/subject/list', { is_active: true });
+ let res = await apiGet('/api/subject/list', { is_active: true });
if (res && res.success && res.data && res.data.subjects) {
let html = '
';
res.data.subjects.forEach(s => {
@@ -49,16 +52,16 @@ async function loadSubjectsForFilter() {
// 筛选学生时自动取消合并记录
function onStudentFilterChange() {
- var studentId = document.getElementById('historyStudentId').value;
+ let studentId = document.getElementById('historyStudentId').value;
if (studentId) {
- var grouped = document.getElementById('historyGrouped');
+ let grouped = document.getElementById('historyGrouped');
if (grouped) grouped.checked = false;
}
}
// 科目筛选变化时，取消扣分类型筛选（互斥）
function onSubjectFilterChange() {
- var subjectVal = document.getElementById('historySubjectFilter').value;
+ let subjectVal = document.getElementById('historySubjectFilter').value;
if (subjectVal) {
document.getElementById('historyReasonFilter').value = '';
}
@@ -66,8 +69,8 @@ function onSubjectFilterChange() {
// 折叠/展开筛选面板
function toggleFilterPanel() {
- var panel = document.getElementById('advancedFilters');
- var btn = document.getElementById('filterToggleBtn');
+ let panel = document.getElementById('advancedFilters');
+ let btn = document.getElementById('filterToggleBtn');
if (!panel || !btn) return;
if (panel.style.display === 'none') {
panel.style.display = 'block';
@@ -81,19 +84,19 @@ function toggleFilterPanel() {
async function loadHistory(page) {
page = page || 1;
currentHistoryPage = page;
- var startDate = document.getElementById('historyStartDate').value;
- var endDate = document.getElementById('historyEndDate').value;
- var studentId = document.getElementById('historyStudentId').value;
- var reasonFilter = document.getElementById('historyReasonFilter').value;
- var subjectFilter = document.getElementById('historySubjectFilter').value;
- var reasonSearch = document.getElementById('historyReasonSearch').value.trim();
- var isGrouped = document.getElementById('historyGrouped').checked;
- var statusFilter = document.getElementById('historyStatusFilter') ? document.getElementById('historyStatusFilter').value : '';
+ let startDate = document.getElementById('historyStartDate').value;
+ let endDate = document.getElementById('historyEndDate').value;
+ let studentId = document.getElementById('historyStudentId').value;
+ let reasonFilter = document.getElementById('historyReasonFilter').value;
+ let subjectFilter = document.getElementById('historySubjectFilter').value;
+ let reasonSearch = document.getElementById('historyReasonSearch').value.trim();
+ let isGrouped = document.getElementById('historyGrouped').checked;
+ let statusFilter = document.getElementById('historyStatusFilter') ? document.getElementById('historyStatusFilter').value : '';
// 筛选学生时强制取消合并
if (studentId) isGrouped = false;
- var params = {
+ let params = {
page: page, page_size: 20,
start_date: startDate,
end_date: endDate
@@ -111,37 +114,38 @@ async function loadHistory(page) {
if (isGrouped) params.grouped = true;
if (statusFilter !== '') params.is_revoked = parseInt(statusFilter);
- var res = await apiGet('/api/admin/conduct/history', params);
+ let res = await apiGet('/api/admin/conduct/history', params);
if (res && res.success) {
- var nowrapStyle = ' style="white-space:nowrap;min-width:80px;"';
- var headHtml = '';
+ let nowrapStyle = ' style="white-space:nowrap;min-width:80px;"';
+ let headHtml = '';
if (isGrouped) {
- headHtml = '
时间 | 原因 | 分值 | 操作人涉及学生 | ';
+ headHtml = '类型 | 分值 | 原因 | 学生名单 | 操作人时间 | ';
if (role === '班主任' || role === '班长') {
headHtml += '操作 | ';
}
} else {
- headHtml = '时间 | 学生 | 分数变动 | 原因 | 操作人';
+ headHtml = '类型 | 分值 | 原因 | 学生 | 操作人时间 | ';
if (role === '班主任' || role === '班长' || role === '考勤委员') {
headHtml += '操作 | ';
}
}
document.getElementById('historyTableHead').innerHTML = headHtml;
- var html = '';
+ let html = '';
if (isGrouped) {
res.data.records.forEach(function(record) {
- var pointsClass = record.points_change > 0 ? 'plus' : 'minus';
- var names = record.student_names || '';
- var allRevoked = record.all_revoked;
- var revokedStyle = allRevoked ? ' style="opacity:0.5;text-decoration:line-through;"' : '';
+ let pointsClass = record.points_change > 0 ? 'plus' : 'minus';
+ let names = record.student_names || '';
+ let allRevoked = record.all_revoked;
+ let revokedStyle = allRevoked ? ' style="opacity:0.5;text-decoration:line-through;"' : '';
html += '' +
- '' + formatDateTime(record.created_at) + ' | ' +
- '' + escapeHtml(record.reason) + ' | ' +
+ '' + escapeHtml(getTypeLabel(record.related_type)) + ' | ' +
'' + (record.points_change > 0 ? '+' : '') + record.points_change + '×' + record.student_count + ' | ' +
+ '' + escapeHtml(record.reason) + ' | ' +
+ '' + escapeHtml(names) + ' | ' +
'' + escapeHtml(record.recorder_name || '') + ' | ' +
- '' + escapeHtml(names) + ' | ';
+ '' + formatDateTime(record.created_at) + ' | ';
if (role === '班主任' || role === '班长') {
if (allRevoked) {
html += '已撤销 | ';
@@ -152,29 +156,30 @@ async function loadHistory(page) {
html += '';
});
if (res.data.records.length === 0) {
- var colSpan = (role === '班主任' || role === '班长') ? 6 : 5;
+ let colSpan = (role === '班主任' || role === '班长') ? 7 : 6;
html = '| 暂无记录 |
';
}
} else {
res.data.records.forEach(function(record) {
- var pointsClass = record.points_change > 0 ? 'plus' : 'minus';
- var revokedStyle = record.is_revoked == 1 ? ' style="opacity:0.5;text-decoration:line-through;"' : '';
+ let pointsClass = record.points_change > 0 ? 'plus' : 'minus';
+ let revokedStyle = record.is_revoked == 1 ? ' style="opacity:0.5;text-decoration:line-through;"' : '';
html += '' +
- '' + formatDateTime(record.created_at) + ' | ' +
- '' + escapeHtml(record.student_name) + ' | ' +
+ '' + escapeHtml(getTypeLabel(record.related_type)) + ' | ' +
'' + (record.points_change > 0 ? '+' : '') + record.points_change + ' | ' +
'' + escapeHtml(record.reason) + ' | ' +
- '' + escapeHtml(record.recorder_name) + ' | ';
+ '' + escapeHtml(record.student_name) + ' | ' +
+ '' + escapeHtml(record.recorder_name) + ' | ' +
+ '' + formatDateTime(record.created_at) + ' | ';
if (role === '班主任') {
if (record.is_revoked == 1) {
- var revokerInfo = record.revoker_name ? '由 ' + escapeHtml(record.revoker_name) + ' 撤销' : '已撤销';
+ let revokerInfo = record.revoker_name ? '由 ' + escapeHtml(record.revoker_name) + ' 撤销' : '已撤销';
html += '' + revokerInfo + ' | ';
} else {
html += ' | ';
}
} else if (role === '班长') {
if (record.is_revoked == 1) {
- var revokerInfo = record.revoker_name ? '由 ' + escapeHtml(record.revoker_name) + ' 撤销' : '已撤销';
+ let revokerInfo = record.revoker_name ? '由 ' + escapeHtml(record.revoker_name) + ' 撤销' : '已撤销';
html += '' + revokerInfo + ' | ';
} else {
html += ' | ';
@@ -192,7 +197,7 @@ async function loadHistory(page) {
});
if (res.data.records.length === 0) {
- var colSpan = (role === '班主任' || role === '班长' || role === '考勤委员') ? 6 : 5;
+ let colSpan = (role === '班主任' || role === '班长' || role === '考勤委员') ? 7 : 6;
html = '| 暂无记录 |
';
}
}
@@ -211,17 +216,17 @@ function renderHistoryPagination() {
}
async function exportHistoryRecords() {
- var startDate = document.getElementById('historyStartDate').value;
- var endDate = document.getElementById('historyEndDate').value;
- var studentId = document.getElementById('historyStudentId').value;
+ let startDate = document.getElementById('historyStartDate').value;
+ let endDate = document.getElementById('historyEndDate').value;
+ let studentId = document.getElementById('historyStudentId').value;
showToast('正在导出历史记录...', 'info');
try {
- var reasonFilter = document.getElementById('historyReasonFilter').value;
- var subjectFilter = document.getElementById('historySubjectFilter').value;
- var reasonSearch = document.getElementById('historyReasonSearch').value.trim();
- var params = { page: 1, page_size: 1000 };
+ let reasonFilter = document.getElementById('historyReasonFilter').value;
+ let subjectFilter = document.getElementById('historySubjectFilter').value;
+ let reasonSearch = document.getElementById('historyReasonSearch').value.trim();
+ let params = { page: 1, page_size: 1000 };
if (startDate) params.start_date = startDate;
if (endDate) params.end_date = endDate;
if (studentId) params.student_id = studentId;
@@ -232,24 +237,31 @@ async function exportHistoryRecords() {
}
if (reasonSearch) params.reason_search = reasonSearch;
- var res = await apiGet('/api/admin/conduct/history', params);
+ let res = await apiGet('/api/admin/conduct/history', params);
if (res && res.success && res.data.records) {
- var records = res.data.records;
+ let records = res.data.records;
if (records.length === 0) {
showToast('没有找到记录', 'warning');
return;
}
- var csv = '\uFEFF';
+ function csvField(val) {
+ let s = String(val == null ? '' : val);
+ if (s.indexOf(',') >= 0 || s.indexOf('"') >= 0 || s.indexOf('\n') >= 0) {
+ return '"' + s.replace(/"/g, '""') + '"';
+ }
+ return s;
+ }
+ let csv = '\uFEFF';
csv += '时间,学号,姓名,分数变动,原因,操作人\n';
records.forEach(function(r) {
if (r.is_revoked == 1) return;
- csv += (r.created_at || '') + ',' + (r.student_no || '') + ',' + (r.student_name || '') + ',' + (r.points_change > 0 ? '+' : '') + r.points_change + ',' + (r.reason || '').replace(/,/g, ';') + ',' + (r.recorder_name || '') + '\n';
+ csv += csvField(r.created_at) + ',' + csvField(r.student_no) + ',' + csvField(r.student_name) + ',' + csvField((r.points_change > 0 ? '+' : '') + r.points_change) + ',' + csvField(r.reason) + ',' + csvField(r.recorder_name) + '\n';
});
- var blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
- var url = URL.createObjectURL(blob);
- var link = document.createElement('a');
+ let blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
+ let url = URL.createObjectURL(blob);
+ let link = document.createElement('a');
link.href = url;
link.download = '历史记录_' + new Date().toISOString().slice(0,10) + '.csv';
document.body.appendChild(link);
@@ -273,21 +285,21 @@ async function batchRevokeGrouped(reason, pointsChange, recorderName, createdAt)
showToast('正在批量撤销...', 'info');
try {
- var params = {
+ let params = {
page: 1, page_size: 1000,
start_date: document.getElementById('historyStartDate').value,
end_date: document.getElementById('historyEndDate').value,
- reason_prefix: reason.substring(0, 4),
+ reason_prefix: reason,
grouped: false
};
- var res = await apiGet('/api/admin/conduct/history', params);
+ let res = await apiGet('/api/admin/conduct/history', params);
if (!res || !res.success || !res.data.records) {
showToast('查询记录失败', 'error');
return;
}
- var matchedIds = [];
+ let matchedIds = [];
res.data.records.forEach(function(r) {
if (r.reason === reason && r.points_change === pointsChange && r.is_revoked == 0) {
matchedIds.push(r.record_id);
@@ -299,7 +311,7 @@ async function batchRevokeGrouped(reason, pointsChange, recorderName, createdAt)
return;
}
- var revokeRes = await apiPost('/api/admin/conduct/batch-revoke', { record_ids: matchedIds });
+ let revokeRes = await apiPost('/api/admin/conduct/batch-revoke', { record_ids: matchedIds });
if (revokeRes && revokeRes.success) {
showToast('批量撤销完成: ' + (revokeRes.data ? revokeRes.data.success_count : 0) + '条成功');
loadHistory(currentHistoryPage);
@@ -313,8 +325,8 @@ async function batchRevokeGrouped(reason, pointsChange, recorderName, createdAt)
// 初始化：并行加载学生和科目列表，然后加载历史记录
Promise.all([loadStudentsForSelect(), loadSubjectsForFilter()]).then(function() {
- var urlParams = new URLSearchParams(window.location.search);
- var preStudentId = urlParams.get('student_id');
+ let urlParams = new URLSearchParams(window.location.search);
+ let preStudentId = urlParams.get('student_id');
if (preStudentId) {
document.getElementById('historyStudentId').value = preStudentId;
onStudentFilterChange();
diff --git a/frontend/assets/js/homework-manage.js b/frontend/assets/js/homework-manage.js
index e4256ad..a7f6897 100644
--- a/frontend/assets/js/homework-manage.js
+++ b/frontend/assets/js/homework-manage.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 作业扣分页JS
+ * 多班级版班级管理系统 - 作业扣分页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
@@ -187,7 +187,7 @@ async function submitAddSubject() {
}
async function toggleSubjectStatus(subjectId, enable) {
- const res = await apiPut(`/api/subject/update/${subjectId}`, { is_active: enable });
+ const res = await apiPut(`/api/subject/toggle/${subjectId}`, { is_active: enable });
if (res && res.success) {
showToast(enable ? '科目已启用' : '科目已禁用');
loadSubjectList();
diff --git a/frontend/assets/js/modules/admin-mgmt.js b/frontend/assets/js/modules/admin-mgmt.js
index 3f709a1..a416837 100644
--- a/frontend/assets/js/modules/admin-mgmt.js
+++ b/frontend/assets/js/modules/admin-mgmt.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 管理员管理函数
+ * 多班级版班级管理系统 - 管理员管理函数
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/js/modules/modal-utils.js b/frontend/assets/js/modules/modal-utils.js
index 3d0cf1f..eeeb47f 100644
--- a/frontend/assets/js/modules/modal-utils.js
+++ b/frontend/assets/js/modules/modal-utils.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 模态框工具函数
+ * 多班级版班级管理系统 - 模态框工具函数
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/js/modules/points-mgmt.js b/frontend/assets/js/modules/points-mgmt.js
index 4451f27..be5ccdb 100644
--- a/frontend/assets/js/modules/points-mgmt.js
+++ b/frontend/assets/js/modules/points-mgmt.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 加减分管理函数
+ * 多班级版班级管理系统 - 加减分管理函数
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/js/modules/student-mgmt.js b/frontend/assets/js/modules/student-mgmt.js
index 91df684..8b6f174 100644
--- a/frontend/assets/js/modules/student-mgmt.js
+++ b/frontend/assets/js/modules/student-mgmt.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 学生管理函数
+ * 多班级版班级管理系统 - 学生管理函数
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
@@ -32,7 +32,7 @@
const res = await apiPost('/api/admin/students', {
student_no: studentNo,
name: name,
- parent_phone: parentPhone,
+ parent_account: parentPhone,
dormitory_number: document.getElementById('addDormitoryNumber').value.trim()
});
@@ -68,7 +68,7 @@
const res = await apiPut(`/api/admin/students/${studentId}`, {
name: name,
- parent_phone: phone || null,
+ parent_account: phone || null,
dormitory_number: document.getElementById('editDormitoryNumber').value.trim()
});
@@ -146,14 +146,14 @@
const students = data.students || [];
let html = '预览数据
';
- html += '| 学号 | 姓名 | 家长手机号 | 宿舍号 | 初始密码 | ';
+ html += '学号 | 姓名 | 家长账号（推荐手机号） | 宿舍号 | 初始密码 | ';
html += '
';
students.forEach(s => {
html += `
| ${escapeHtml(s.student_no || '')} |
${escapeHtml(s.name || '')} |
- ${escapeHtml(s.parent_phone || '')} |
+ ${escapeHtml(s.parent_account || '')} |
${escapeHtml(s.dormitory_number || '-')} |
${escapeHtml(s.password || '123456')} |
`;
diff --git a/frontend/assets/js/modules/subject-mgmt.js b/frontend/assets/js/modules/subject-mgmt.js
index 9c55142..a0b30b5 100644
--- a/frontend/assets/js/modules/subject-mgmt.js
+++ b/frontend/assets/js/modules/subject-mgmt.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 科目管理函数
+ * 多班级版班级管理系统 - 科目管理函数
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/js/modules/utils.js b/frontend/assets/js/modules/utils.js
index 97aa8e2..b50fedd 100644
--- a/frontend/assets/js/modules/utils.js
+++ b/frontend/assets/js/modules/utils.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 通用工具函数
+ * 多班级版班级管理系统 - 通用工具函数
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/js/parent.js b/frontend/assets/js/parent.js
index a6db5b3..4b225a1 100644
--- a/frontend/assets/js/parent.js
+++ b/frontend/assets/js/parent.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 家长端JS
+ * 多班级版班级管理系统 - 家长端JS
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/js/rankings.js b/frontend/assets/js/rankings.js
new file mode 100644
index 0000000..00ffcdc
--- /dev/null
+++ b/frontend/assets/js/rankings.js
@@ -0,0 +1,59 @@
+/**
+ * 多班级版班级管理系统 - 排行榜JS
+ *
+ * 开发者: Canglan
+ * 版权归属: Sea Network Technology Studio
+ *
+ * 版权所有 © Sea Network Technology Studio
+ */
+
+(function() {
+'use strict';
+
+let currentType = 'conduct';
+
+async function loadRankings(type) {
+ const res = await apiGet('/api/admin/rankings', { type: type, limit: 50 });
+ if (res && res.success && res.data) {
+ const rankings = res.data.ranking || [];
+ let html = '';
+ if (rankings.length === 0) {
+ html = '| 暂无排行数据 |
';
+ } else {
+ rankings.forEach(function(item, index) {
+ let rankClass = '';
+ if (index === 0) rankClass = 'rank-gold';
+ else if (index === 1) rankClass = 'rank-silver';
+ else if (index === 2) rankClass = 'rank-bronze';
+
+ let pointsText = Number(item.points !== undefined ? item.points : (item.total_points || 0));
+ if (pointsText > 0) {
+ pointsText = '+' + pointsText;
+ }
+
+ html += '' +
+ '| ' + (index + 1) + ' | ' +
+ '' + escapeHtml(item.student_no || '-') + ' | ' +
+ '' + escapeHtml(item.name || '-') + ' | ' +
+ '' + pointsText + ' | ' +
+ '
';
+ });
+ }
+ document.getElementById('rankingList').innerHTML = html;
+ } else {
+ document.getElementById('rankingList').innerHTML = '| 加载失败 |
';
+ }
+}
+
+window.switchTab = function(type, btn) {
+ currentType = type;
+ document.querySelectorAll('.tab-btn').forEach(function(b) { b.classList.remove('active'); });
+ btn.classList.add('active');
+ loadRankings(type);
+};
+
+document.addEventListener('DOMContentLoaded', function() {
+ loadRankings(currentType);
+});
+
+})();
diff --git a/frontend/assets/js/semesters.js b/frontend/assets/js/semesters.js
index 960fa5a..05ddca2 100644
--- a/frontend/assets/js/semesters.js
+++ b/frontend/assets/js/semesters.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 学期管理页JS
+ * 多班级版班级管理系统 - 学期管理页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
@@ -41,7 +41,7 @@ async function loadSemesters() {
const res = await apiGet('/api/semester/list');
if (res && res.success) {
let html = '';
- const semesters = res.data || [];
+ const semesters = res.data.semesters || [];
semesters.forEach(sem => {
let statusText = '';
let statusClass = '';
@@ -252,7 +252,7 @@ async function viewArchiveData(semesterId, semesterName, page) {
if (res && res.success) {
const data = res.data || {};
- const archives = data.archives || [];
+ const archives = data.items || [];
let html = '';
archives.forEach(a => {
html += `
@@ -288,6 +288,80 @@ function renderArchivePagination(semesterId, semesterName) {
});
}
+// ========== 周期重置功能 ==========
+
+let pendingPeriodType = null;
+let periodArchivesType = null;
+let periodArchivesPage = 1;
+let periodArchivesTotalPages = 1;
+
+function confirmPeriodReset(periodType) {
+ pendingPeriodType = periodType;
+ const label = periodType === 'weekly' ? '本周' : '本月';
+ document.getElementById('periodResetText').innerHTML =
+ `确定要执行 ${label}重置 吗？
将保存当前所有学生的操行分快照，然后将所有学生操行分重置为初始值。`;
+ document.getElementById('periodResetModal').style.display = 'flex';
+}
+
+async function executePeriodReset() {
+ if (!pendingPeriodType) return;
+
+ const res = await apiPost('/api/semester/period-reset', { period: pendingPeriodType });
+ if (res && res.success) {
+ showToast(res.message || '重置成功');
+ closeModal('periodResetModal');
+ pendingPeriodType = null;
+ } else {
+ showToast(res?.message || '重置失败', 'error');
+ }
+}
+
+async function showPeriodArchives(type, page) {
+ var periodType = type || periodArchivesType;
+ page = page || 1;
+ periodArchivesType = periodType;
+ periodArchivesPage = page;
+
+ const label = periodType === 'weekly' ? '周' : '月';
+ document.getElementById('periodArchivesTitle').textContent = label + '归档数据';
+
+ const res = await apiGet('/api/semester/period-archives', {
+ period: periodType,
+ page: page,
+ page_size: 50
+ });
+
+ if (res && res.success) {
+ const data = res.data || {};
+ const archives = data.items || [];
+ let html = '';
+ archives.forEach(function(a) {
+ const resetByLabel = a.reset_by === 'auto' ? '自动' : '手动';
+ html += '
' +
+ '| ' + escapeHtml(a.period_label) + ' | ' +
+ '' + (a.rank_position || '-') + ' | ' +
+ '' + escapeHtml(a.student_no) + ' | ' +
+ '' + escapeHtml(a.student_name) + ' | ' +
+ '' + a.final_points + ' | ' +
+ '' + resetByLabel + ' | ' +
+ '' + formatDateTime(a.archived_at) + ' | ' +
+ '
';
+ });
+ if (archives.length === 0) {
+ html = '| 暂无归档数据 |
';
+ }
+ document.getElementById('periodArchivesList').innerHTML = html;
+
+ periodArchivesTotalPages = data.total_pages || 1;
+ renderSmartPagination('periodArchivePagination', periodArchivesPage, periodArchivesTotalPages, function(p) {
+ showPeriodArchives(periodArchivesType, p);
+ });
+ document.getElementById('periodArchivesModal').style.display = 'flex';
+ } else {
+ showToast(res?.message || '获取归档数据失败', 'error');
+ }
+}
+
loadSemesters();
window.fillSemesterDates = fillSemesterDates;
@@ -302,5 +376,8 @@ window.confirmAssociate = confirmAssociate;
window.showArchiveConfirm = showArchiveConfirm;
window.confirmArchive = confirmArchive;
window.viewArchiveData = viewArchiveData;
+window.confirmPeriodReset = confirmPeriodReset;
+window.executePeriodReset = executePeriodReset;
+window.showPeriodArchives = showPeriodArchives;
})();
diff --git a/frontend/assets/js/student-homework.js b/frontend/assets/js/student-homework.js
index 4ff9d5e..626a5a3 100644
--- a/frontend/assets/js/student-homework.js
+++ b/frontend/assets/js/student-homework.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 学生端作业情况JS
+ * 多班级版班级管理系统 - 学生端作业情况JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
diff --git a/frontend/assets/js/student.js b/frontend/assets/js/student.js
index eb00687..43b676f 100644
--- a/frontend/assets/js/student.js
+++ b/frontend/assets/js/student.js
@@ -1,10 +1,10 @@
/**
- * 班级操行分管理系统 - 学生端JS
+ * 多班级版班级管理系统 - 学生端JS
*
* 开发者: Canglan
* 联系方式: admin@sea-studio.top
* 版权归属: Sea Network Technology Studio
- * 许可证: MIT License
+ * 许可证: Apache License 2.0
*
* 版权所有 © Sea Network Technology Studio
*/
diff --git a/frontend/assets/js/students-manage.js b/frontend/assets/js/students-manage.js
index 4cf17ce..8bb0c7d 100644
--- a/frontend/assets/js/students-manage.js
+++ b/frontend/assets/js/students-manage.js
@@ -1,5 +1,5 @@
/**
- * 班级操行分管理系统 - 学生管理页JS
+ * 多班级版班级管理系统 - 学生管理页JS
*
* 开发者: Canglan
* 版权归属: Sea Network Technology Studio
@@ -28,13 +28,13 @@ async function loadStudents(page = 1) {
${escapeHtml(student.name)} |
${escapeHtml(student.dormitory_number || '-')} |
${student.total_points} |
- ${userRole === '班主任' ? `${student.parent_phone ? student.parent_phone.slice(0,3) + '******' + student.parent_phone.slice(-2) : '-'} | ` : ''}
+ ${userRole === '班主任' ? `${student.parent_account ? student.parent_account.slice(0,3) + '******' + student.parent_account.slice(-2) : '-'} | ` : ''}
${userRole === '班主任' ? `
+
|