-
+
-
+
@@ -111,6 +128,114 @@ include __DIR__ . '/../includes/header.php';
+
+
+
+
+
+
+
+
diff --git a/frontend/admin/semesters.php b/frontend/admin/semesters.php
index 0416b2d..671f46b 100644
--- a/frontend/admin/semesters.php
+++ b/frontend/admin/semesters.php
@@ -42,6 +42,7 @@ include __DIR__ . '/../includes/header.php';
开始日期 |
结束日期 |
状态 |
+
记录数 |
创建时间 |
操作 |
diff --git a/frontend/admin/subjects.php b/frontend/admin/subjects.php
index 98e92cf..6fe47c4 100644
--- a/frontend/admin/subjects.php
+++ b/frontend/admin/subjects.php
@@ -1,6 +1,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+header('Location: /admin/homework.php');
+exit();
diff --git a/frontend/api/clear_session.php b/frontend/api/clear_session.php
index 48a2bea..13c84ed 100644
--- a/frontend/api/clear_session.php
+++ b/frontend/api/clear_session.php
@@ -18,8 +18,7 @@ require_once __DIR__ . '/../config.php';
// 设置响应头
header('Content-Type: application/json; charset=utf-8');
-// 允许跨域
-header('Access-Control-Allow-Origin: *');
+// 仅允许同源请求
header('Access-Control-Allow-Methods: POST, OPTIONS');
header('Access-Control-Allow-Headers: Content-Type');
diff --git a/frontend/api/save_session.php b/frontend/api/save_session.php
index 5b6ab24..c1b3c6d 100644
--- a/frontend/api/save_session.php
+++ b/frontend/api/save_session.php
@@ -18,10 +18,9 @@ require_once __DIR__ . '/../config.php';
// 设置响应头
header('Content-Type: application/json; charset=utf-8');
-// 允许跨域（如果需要）
-header('Access-Control-Allow-Origin: *');
+// 仅允许同源请求
header('Access-Control-Allow-Methods: POST, OPTIONS');
-header('Access-Control-Allow-Headers: Content-Type');
+header('Access-Control-Allow-Headers: Content-Type, Authorization');
// 处理预检请求
if ($_SERVER['REQUEST_METHOD'] === 'OPTIONS') {
@@ -93,6 +92,67 @@ if (!in_array($data['user_type'], $validUserTypes)) {
exit();
}
+// 验证 JWT Token
+$authHeader = $_SERVER['HTTP_AUTHORIZATION'] ?? '';
+if (empty($authHeader) || !preg_match('/^Bearer\s+(.+)$/i', $authHeader, $matches)) {
+ http_response_code(401);
+ echo json_encode([
+ 'success' => false,
+ 'message' => '缺少认证令牌'
+ ]);
+ exit();
+}
+
+$token = $matches[1];
+$apiUrl = API_BASE_URL . '/api/auth/me';
+
+$ch = curl_init();
+curl_setopt_array($ch, [
+ CURLOPT_URL => $apiUrl,
+ CURLOPT_RETURNTRANSFER => true,
+ CURLOPT_TIMEOUT => 10,
+ CURLOPT_HTTPHEADER => [
+ 'Authorization: Bearer ' . $token,
+ 'Content-Type: application/json'
+ ],
+ CURLOPT_SSL_VERIFYPEER => false,
+ CURLOPT_SSL_VERIFYHOST => 0
+]);
+
+$apiResponse = curl_exec($ch);
+$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+curl_close($ch);
+
+if ($httpCode !== 200 || empty($apiResponse)) {
+ http_response_code(401);
+ echo json_encode([
+ 'success' => false,
+ 'message' => '认证令牌无效或已过期'
+ ]);
+ exit();
+}
+
+$tokenData = json_decode($apiResponse, true);
+if (!$tokenData || !isset($tokenData['success']) || !$tokenData['success']) {
+ http_response_code(401);
+ echo json_encode([
+ 'success' => false,
+ 'message' => '认证验证失败'
+ ]);
+ exit();
+}
+
+// 验证 token 中的 user_id 与请求数据中的 user_id 一致
+$tokenUserId = $tokenData['data']['user_id'] ?? null;
+if ($tokenUserId === null || intval($tokenUserId) !== intval($data['user_id'])) {
+ http_response_code(403);
+ echo json_encode([
+ 'success' => false,
+ 'message' => '身份验证不匹配'
+ ]);
+ exit();
+}
+
// 设置 Session 变量
$_SESSION['user_id'] = $data['user_id'];
$_SESSION['user_type'] = $data['user_type'];
diff --git a/frontend/assets/css/style.css b/frontend/assets/css/style.css
index 95a001b..5035433 100644
--- a/frontend/assets/css/style.css
+++ b/frontend/assets/css/style.css
@@ -744,4 +744,89 @@ tr:hover {
.search-bar input {
flex: 1;
}
+}
+
+/* ========== 操作列下拉菜单 ========== */
+.action-dropdown {
+ position: relative;
+ display: inline-flex;
+ align-items: center;
+ gap: 4px;
+}
+
+.action-dropdown-toggle {
+ background: #f7fafc;
+ color: #4a5568;
+ border: 1px solid #e2e8f0;
+ padding: 4px 10px;
+ font-size: 12px;
+ cursor: pointer;
+ border-radius: 6px;
+ transition: all 0.2s;
+ white-space: nowrap;
+}
+
+.action-dropdown-toggle:hover {
+ background: #edf2f7;
+ border-color: #cbd5e0;
+}
+
+.action-dropdown-toggle.open {
+ background: #edf2f7;
+ border-color: #a0aec0;
+}
+
+.action-dropdown-menu {
+ display: none;
+ position: absolute;
+ top: 100%;
+ right: 0;
+ margin-top: 4px;
+ background: white;
+ border-radius: 8px;
+ box-shadow: 0 4px 16px rgba(0, 0, 0, 0.12);
+ border: 1px solid #e2e8f0;
+ min-width: 120px;
+ z-index: 200;
+ overflow: hidden;
+ padding: 4px 0;
+}
+
+.action-dropdown-menu.show {
+ display: block;
+}
+
+.action-dropdown-menu a {
+ display: block;
+ padding: 8px 14px;
+ color: #4a5568;
+ font-size: 13px;
+ cursor: pointer;
+ text-decoration: none;
+ transition: background 0.15s;
+ white-space: nowrap;
+}
+
+.action-dropdown-menu a:hover {
+ background: #f7fafc;
+ color: #2d3748;
+}
+
+.action-dropdown-menu a.danger {
+ color: #e53e3e;
+ border-top: 1px solid #edf2f7;
+ margin-top: 4px;
+ padding-top: 10px;
+}
+
+.action-dropdown-menu a.danger:hover {
+ background: #fff5f5;
+ color: #c53030;
+}
+
+@media (max-width: 768px) {
+ .action-dropdown-menu {
+ right: auto;
+ left: 0;
+ }
}
\ No newline at end of file
diff --git a/frontend/assets/js/admins.js b/frontend/assets/js/admins.js
index e18a5b4..c4e2f06 100644
--- a/frontend/assets/js/admins.js
+++ b/frontend/assets/js/admins.js
@@ -23,10 +23,15 @@ async function loadAdmins() {
${escapeHtml(admin.real_name)} |
${escapeHtml(admin.role_type)} |
-
-
-
-
+
+
+
+
|
`;
});
diff --git a/frontend/assets/js/common.js b/frontend/assets/js/common.js
index a20a5ed..c57cd0f 100644
--- a/frontend/assets/js/common.js
+++ b/frontend/assets/js/common.js
@@ -197,12 +197,12 @@ async function logout() {
function escapeHtml(str) {
if (!str) return '';
- return str.replace(/[&<>]/g, function(m) {
- if (m === '&') return '&';
- if (m === '<') return '<';
- if (m === '>') return '>';
- return m;
- });
+ return String(str)
+ .replace(/&/g, '\x26amp;')
+ .replace(//g, '\x26gt;')
+ .replace(/"/g, '\x26quot;')
+ .replace(/'/g, '\x26#x27;');
}
/**
@@ -336,6 +336,36 @@ document.addEventListener('DOMContentLoaded', () => {
}
});
+function toggleActionDropdown(el) {
+ var dropdown = el.closest('.action-dropdown');
+ if (!dropdown) return;
+ var menu = dropdown.querySelector('.action-dropdown-menu');
+ if (!menu) return;
+
+ var isOpen = menu.classList.contains('show');
+ // 先关闭所有
+ document.querySelectorAll('.action-dropdown-menu.show').forEach(function(m) {
+ m.classList.remove('show');
+ var toggle = m.closest('.action-dropdown').querySelector('.action-dropdown-toggle');
+ if (toggle) toggle.classList.remove('open');
+ });
+
+ if (!isOpen) {
+ menu.classList.add('show');
+ el.classList.add('open');
+ }
+}
+
+document.addEventListener('click', function(e) {
+ if (!e.target.closest('.action-dropdown')) {
+ document.querySelectorAll('.action-dropdown-menu.show').forEach(function(m) {
+ m.classList.remove('show');
+ var toggle = m.closest('.action-dropdown').querySelector('.action-dropdown-toggle');
+ if (toggle) toggle.classList.remove('open');
+ });
+ }
+});
+
// 全局textarea键盘事件：Enter提交表单，Ctrl+Enter换行
document.addEventListener('keydown', function(e) {
if (e.target.tagName !== 'TEXTAREA') return;
@@ -351,4 +381,28 @@ document.addEventListener('keydown', function(e) {
}
}
// Ctrl+Enter和Shift+Enter保持默认换行行为（不拦截）
-});
\ No newline at end of file
+});
+
+window.selectDeductionType = function(points, reason) {
+ var pointsEl = document.getElementById('pointsChange');
+ var reasonEl = document.getElementById('pointsReason');
+ if (points === 0 && reason === '') {
+ // 自定义模式 - 清空分值和原因，聚焦原因输入框
+ if (pointsEl) pointsEl.value = '';
+ if (reasonEl) {
+ reasonEl.value = '';
+ reasonEl.focus();
+ }
+ } else if (points === null || points === undefined) {
+ // 类别模式 - 仅填充原因，聚焦分值输入框
+ if (reasonEl) reasonEl.value = reason;
+ if (pointsEl) {
+ pointsEl.value = '';
+ pointsEl.focus();
+ }
+ } else {
+ // 预设模式 - 同时填充分值和原因
+ if (pointsEl) pointsEl.value = points;
+ if (reasonEl) reasonEl.value = reason;
+ }
+};
\ No newline at end of file
diff --git a/frontend/assets/js/homework-manage.js b/frontend/assets/js/homework-manage.js
index 247684d..c550650 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
@@ -28,7 +28,6 @@ document.getElementById('pointsChange').setAttribute('max', hwMaxPoints);
// 加载科目列表（学习委员）
async function loadSubjectsForHomework() {
- if (hwRole !== '学习委员') return;
const subjectSelect = document.getElementById('hwSubjectSelect');
if (!subjectSelect) return;
const res = await apiGet('/api/subject/list');
@@ -69,16 +68,6 @@ function showSinglePointsModal(studentId, studentName) {
document.getElementById('batchPointsModal').style.display = 'flex';
}
-function selectDeductionType(points, reason) {
- document.getElementById('pointsChange').value = points;
- if (points !== 0) {
- document.getElementById('pointsReason').value = reason;
- } else {
- document.getElementById('pointsReason').value = '';
- document.getElementById('pointsReason').focus();
- }
-}
-
function handleSubmitPoints() {
const pointsChange = parseInt(document.getElementById('pointsChange').value);
if (isNaN(pointsChange) || pointsChange === 0) {
@@ -91,7 +80,7 @@ function handleSubmitPoints() {
}
// 学习委员附加科目前缀、具体作业和缴交时间
- if (hwRole === '学习委员') {
+ if (hwRole === '学习委员' || hwRole === '班主任') {
const subjectSelect = document.getElementById('hwSubjectSelect');
const subjectName = subjectSelect ? subjectSelect.value : '';
const hwTitle = document.getElementById('hwTitle').value.trim();
@@ -113,7 +102,136 @@ function handleSubmitPoints() {
}
}
- submitBatchPoints();
+ submitBatchPoints({ related_type: 'homework' });
+}
+
+// ========== 科目管理功能 ==========
+
+function toggleSubjectPanel() {
+ const content = document.getElementById('subjectPanelContent');
+ const toggle = document.getElementById('subjectPanelToggle');
+ if (content.style.display === 'none') {
+ content.style.display = 'block';
+ toggle.textContent = '▼ 收起';
+ loadSubjectList();
+ } else {
+ content.style.display = 'none';
+ toggle.textContent = '▶ 展开';
+ }
+}
+
+async function loadSubjectList() {
+ const res = await apiGet('/api/subject/list');
+ if (res && res.success) {
+ let html = '';
+ res.data.subjects.forEach(sub => {
+ html += `
+
+ ${escapeHtml(sub.subject_name)}
+ ${escapeHtml(sub.subject_code || '')}
+
+ ${sub.is_active ? '启用' : '禁用'}
+
+
+
+
+
+ `;
+ });
+ if (res.data.subjects.length === 0) {
+ html = '
暂无科目，请点击"添加科目"
';
+ }
+ document.getElementById('subjectList').innerHTML = html;
+ }
+}
+
+function showAddSubjectModal() {
+ const form = document.getElementById('addSubjectFormInHw');
+ if (form) form.reset();
+ document.getElementById('addSubjectModal').style.display = 'flex';
+}
+
+async function submitAddSubject() {
+ const subjectName = document.getElementById('subjectName').value.trim();
+ const subjectCode = document.getElementById('subjectCode').value.trim();
+
+ if (!subjectName) {
+ showToast('请填写科目名称', 'warning');
+ return;
+ }
+
+ const res = await apiPost('/api/subject/create', {
+ subject_name: subjectName,
+ subject_code: subjectCode
+ });
+
+ if (res && res.success) {
+ showToast('科目添加成功');
+ closeModal('addSubjectModal');
+ loadSubjectList();
+ loadSubjectsForHomework();
+ } else {
+ showToast(res?.message || '添加失败', 'error');
+ }
+}
+
+async function toggleSubjectStatus(subjectId, enable) {
+ const res = await apiPut(`/api/subject/update/${subjectId}`, { is_active: enable });
+ if (res && res.success) {
+ showToast(enable ? '科目已启用' : '科目已禁用');
+ loadSubjectList();
+ loadSubjectsForHomework();
+ } else {
+ showToast(res?.message || '操作失败', 'error');
+ }
+}
+
+async function deleteSubject(subjectId) {
+ if (!confirm('确定要删除该科目吗？如果科目下有作业数据将无法删除。')) return;
+ const res = await apiDelete('/api/subject/delete/' + subjectId);
+ if (res && res.success) {
+ showToast('科目删除成功');
+ loadSubjectList();
+ loadSubjectsForHomework();
+ } else {
+ showToast(res?.message || '删除失败', 'error');
+ }
+}
+
+function showEditSubjectModal(subjectId, name, code, sortOrder) {
+ document.getElementById('editSubjectId').value = subjectId;
+ document.getElementById('editSubjectName').value = name;
+ document.getElementById('editSubjectCode').value = code;
+ document.getElementById('editSubjectSortOrder').value = sortOrder;
+ document.getElementById('editSubjectModal').style.display = 'flex';
+}
+
+async function submitEditSubject() {
+ const subjectId = document.getElementById('editSubjectId').value;
+ const subjectName = document.getElementById('editSubjectName').value.trim();
+ const subjectCode = document.getElementById('editSubjectCode').value.trim();
+ const sortOrder = document.getElementById('editSubjectSortOrder').value;
+
+ if (!subjectName) {
+ showToast('请填写科目名称', 'warning');
+ return;
+ }
+
+ const data = { subject_name: subjectName };
+ if (subjectCode) data.subject_code = subjectCode;
+ if (sortOrder !== '') data.sort_order = parseInt(sortOrder);
+
+ const res = await apiPut(`/api/subject/update/${subjectId}`, data);
+ if (res && res.success) {
+ showToast('科目更新成功');
+ closeModal('editSubjectModal');
+ loadSubjectList();
+ loadSubjectsForHomework();
+ } else {
+ showToast(res?.message || '更新失败', 'error');
+ }
}
loadStudents();
@@ -121,7 +239,13 @@ loadSubjectsForHomework();
window.loadStudents = loadStudents;
window.showSinglePointsModal = showSinglePointsModal;
-window.selectDeductionType = selectDeductionType;
window.handleSubmitPoints = handleSubmitPoints;
+window.toggleSubjectPanel = toggleSubjectPanel;
+window.showAddSubjectModal = showAddSubjectModal;
+window.submitAddSubject = submitAddSubject;
+window.toggleSubjectStatus = toggleSubjectStatus;
+window.deleteSubject = deleteSubject;
+window.showEditSubjectModal = showEditSubjectModal;
+window.submitEditSubject = submitEditSubject;
})();
diff --git a/frontend/assets/js/modules/points-mgmt.js b/frontend/assets/js/modules/points-mgmt.js
index 2edff8b..4451f27 100644
--- a/frontend/assets/js/modules/points-mgmt.js
+++ b/frontend/assets/js/modules/points-mgmt.js
@@ -35,7 +35,7 @@
}
// 提交批量加减分
- async function submitBatchPoints() {
+ async function submitBatchPoints(options = {}) {
const pointsChange = parseInt(document.getElementById('pointsChange').value);
const reason = document.getElementById('pointsReason').value;
@@ -49,11 +49,15 @@
return;
}
- const res = await apiPost('/api/admin/conduct/add', {
+ const data = {
student_ids: selectedStudentIds,
points_change: pointsChange,
reason: reason
- });
+ };
+ if (options.related_type) {
+ data.related_type = options.related_type;
+ }
+ const res = await apiPost('/api/admin/conduct/add', data);
if (res && res.success) {
showToast(`操作成功: ${res.data.success_count} 人成功`);
diff --git a/frontend/assets/js/semesters.js b/frontend/assets/js/semesters.js
index 832d427..bd58d18 100644
--- a/frontend/assets/js/semesters.js
+++ b/frontend/assets/js/semesters.js
@@ -60,28 +60,39 @@ async function loadSemesters() {
const startDate = sem.start_date || '';
const endDate = sem.end_date || '';
if (!sem.is_archived) {
- actions += `
`;
- if (!sem.is_active) {
- actions += `
`;
- }
- actions += `
`;
- actions += `
`;
+ actions += `
+
+
+
`;
}
if (sem.is_archived) {
actions += `
`;
}
+ const conductCount = sem.conduct_count || 0;
+ const attendanceCount = sem.attendance_count || 0;
+ let recordText = '-';
+ if (conductCount > 0 || attendanceCount > 0) {
+ recordText = `${conductCount}条操行分 / ${attendanceCount}条考勤`;
+ }
+
html += `
| ${escapeHtml(sem.semester_name)} |
${formatDate(sem.start_date)} |
${formatDate(sem.end_date)} |
${statusText} |
+ ${recordText} |
${formatDateTime(sem.created_at)} |
${actions} |
`;
});
if (semesters.length === 0) {
- html = '
| 暂无学期，请点击上方按钮创建新学期 |
';
+ html = '
| 暂无学期，请点击上方按钮创建新学期 |
';
}
document.getElementById('semesterList').innerHTML = html;
}
diff --git a/frontend/assets/js/student-homework.js b/frontend/assets/js/student-homework.js
index 0886a66..2b2a57c 100644
--- a/frontend/assets/js/student-homework.js
+++ b/frontend/assets/js/student-homework.js
@@ -17,17 +17,24 @@ async function loadHomework() {
if (res && res.success) {
let html = '';
res.data.homework.forEach(hw => {
- const pointsDisplay = hw.points ? hw.points + '分' : '-';
+ // 提交状态
+ let statusDisplay = '-';
+ if (hw.status) {
+ statusDisplay = getStatusBadge(hw.status, 'homework');
+ }
+ // 扣分显示
+ const pointsDisplay = hw.points ? `
${hw.points}分` : '-';
+
html += `
- | ${escapeHtml(hw.subject_name)} |
- ${hw.deadline || hw.created_at} |
- ${pointsDisplay} |
- ${escapeHtml(hw.comments || '-')} |
${escapeHtml(hw.title)} |
+ ${escapeHtml(hw.subject_name)} |
+ ${hw.deadline || '-'} |
+ ${statusDisplay} |
+ ${pointsDisplay} |
`;
});
if (res.data.homework.length === 0) {
- html = '
| 暂无作业 |
';
+ html = '
| 📝 暂无作业记录 |
';
}
document.getElementById('homeworkList').innerHTML = html;
}
diff --git a/frontend/assets/js/students-manage.js b/frontend/assets/js/students-manage.js
index 759a26b..59f2522 100644
--- a/frontend/assets/js/students-manage.js
+++ b/frontend/assets/js/students-manage.js
@@ -30,11 +30,16 @@ async function loadStudents(page = 1) {
${student.total_points} |
${userRole === '班主任' ? `
${student.parent_phone ? student.parent_phone.slice(0,3) + '******' + student.parent_phone.slice(-2) : '-'} | ` : ''}
-
- ${userRole === '班主任' ? `
-
-
- ` : ''}
+
+
+ ${userRole === '班主任' ? `
+ ` : ''}
+
|
`;
});
diff --git a/frontend/includes/nav.php b/frontend/includes/nav.php
index 7e5fcfa..a3b8631 100644
--- a/frontend/includes/nav.php
+++ b/frontend/includes/nav.php
@@ -5,14 +5,11 @@
操行分管理
-
作业管理
+
作业扣分
考勤管理
-
-
科目管理
-
管理员管理
diff --git a/frontend/index.php b/frontend/index.php
index 700f751..1b845f6 100644
--- a/frontend/index.php
+++ b/frontend/index.php
@@ -95,7 +95,10 @@ if (isset($_SESSION['user_id']) && isset($_SESSION['user_type'])) {
try {
const sessionResponse = await fetch('/api/save_session.php', {
method: 'POST',
- headers: { 'Content-Type': 'application/json' },
+ headers: {
+ 'Content-Type': 'application/json',
+ 'Authorization': 'Bearer ' + userData.token
+ },
body: JSON.stringify({
user_id: userData.user_id,
user_type: userData.user_type,
diff --git a/frontend/parent/history.php b/frontend/parent/history.php
index b6c5538..58b6823 100644
--- a/frontend/parent/history.php
+++ b/frontend/parent/history.php
@@ -35,14 +35,13 @@ include __DIR__ . '/../includes/header.php';
| 日期 |
- 类型 |
原因 |
分值 |
记录人 |
- | 加载中... |
+ | 加载中... |
@@ -76,17 +75,16 @@ async function loadHistory(page) {
if (res && res.success) {
let html = '';
if (res.data.records.length === 0) {
- html = '
';
} else {
res.data.records.forEach(record => {
const pointsClass = record.points_change > 0 ? 'plus' : 'minus';
const pointsText = record.points_change > 0 ? `+${record.points_change}` : record.points_change;
html += `
`;
});
}
diff --git a/frontend/student/dashboard.php b/frontend/student/dashboard.php
index 40fc616..9e795d6 100644
--- a/frontend/student/dashboard.php
+++ b/frontend/student/dashboard.php
@@ -356,12 +356,13 @@ include __DIR__ . '/../includes/header.php';
let html = '