修复考勤管理bug并加强了信息保护

2026-04-27 01:15:03 +08:00
parent bf0314f098
commit 439c074534
16 changed files with 176 additions and 49 deletions
--- a/frontend/admin/admins.php
+++ b/frontend/admin/admins.php
@@ -100,7 +100,7 @@ include __DIR__ . '/../includes/header.php';
            </div>
            <div class="form-group">
                <label>姓名</label>
-                <input type="text" id="editAdminRealName" disabled>
+                <input type="text" id="editAdminRealName" required>
            </div>
            <div class="form-group">
                <label>角色</label>
--- a/frontend/admin/attendance.php
+++ b/frontend/admin/attendance.php
@@ -82,6 +82,11 @@ include __DIR__ . '/../includes/header.php';
    </div>
 </div>

+<style>
+.student-cell { display: flex; flex-direction: column; align-items: center; }
+.student-cell-name { font-size: 14px; font-weight: 500; }
+.student-cell-no { font-size: 11px; color: #999; }
+</style>
 <script>
 let currentStatus = 'absent';
 let studentsData = [];
@@ -116,14 +121,16 @@ async function loadStudents() {

 // 渲染学生方格
 function renderStudentGrid() {
+    const currentSlot = document.getElementById('attendanceSlot').value;
    let html = '';
    studentsData.forEach(student => {
-        const hasRecord = existingRecords.some(r => r.student_id === student.student_id);
-        html += `<div class="student-cell${hasRecord ? ' has-record' : ''}" 
-                     data-id="${student.student_id}" 
+        const hasRecord = existingRecords.some(r => r.student_id === student.student_id && (!r.slot || r.slot === currentSlot));
+        html += `<div class="student-cell${hasRecord ? ' has-record' : ''}"
+                     data-id="${student.student_id}"
                     data-name="${escapeHtml(student.name)}"
                     onclick="toggleStudent(this)">
-                     ${escapeHtml(student.name)}
+                     <span class="student-cell-name">${escapeHtml(student.name)}</span>
+                     <span class="student-cell-no">${escapeHtml(student.student_no)}</span>
                 </div>`;
    });
    if (studentsData.length === 0) {
@@ -154,7 +161,8 @@ function deselectAllStudents() {
 // 加载当天已有考勤记录（用于标记 .has-record）
 async function loadExistingRecords() {
    const date = document.getElementById('attendanceDate').value;
-    const res = await apiGet('/api/admin/attendance/records', { date });
+    const slot = document.getElementById('attendanceSlot').value;
+    const res = await apiGet('/api/admin/attendance/records', { date, slot });
    if (res && res.success) {
        existingRecords = res.data.records || [];
        renderStudentGrid(); // 重新渲染以标记 has-record
@@ -232,11 +240,14 @@ async function loadAttendanceRecords() {
    }
 }

-// 日期变化时重新加载
+// 日期或时段变化时重新加载
 document.getElementById('attendanceDate').addEventListener('change', function() {
    loadExistingRecords();
    loadAttendanceRecords();
 });
+document.getElementById('attendanceSlot').addEventListener('change', function() {
+    loadExistingRecords();
+});

 // 页面初始化
 loadStudents();
--- a/frontend/admin/history.php
+++ b/frontend/admin/history.php
@@ -41,6 +41,15 @@ include __DIR__ . '/../includes/header.php';
                    <option value="">全部</option>
                </select>
            </div>
+            <div class="filter-group">
+                <label>扣分类型</label>
+                <select id="historyRelatedType">
+                    <option value="">全部</option>
+                    <option value="manual">手动加减分</option>
+                    <option value="homework">作业</option>
+                    <option value="attendance">考勤</option>
+                </select>
+            </div>
            <button class="btn btn-primary" onclick="loadHistory(1)">查询</button>
            <?php if ($role === '班主任'): ?>
            <button class="btn btn-secondary" onclick="exportHistoryRecords()">导出历史记录</button>
@@ -88,12 +97,15 @@ async function loadHistory(page = 1) {
    const endDate = document.getElementById('historyEndDate').value;
    const studentId = document.getElementById('historyStudentId').value;
    
+    const relatedType = document.getElementById('historyRelatedType').value;
+    
    const params = {
        page, page_size: 20,
        start_date: startDate,
        end_date: endDate
    };
    if (studentId) params.student_id = studentId;
+    if (relatedType) params.related_type = relatedType;
    
    const res = await apiGet('/api/admin/conduct/history', params);
    
@@ -110,13 +122,15 @@ async function loadHistory(page = 1) {
                <td>${escapeHtml(record.recorder_name)}</td>`;
            <?php if ($role === '班主任'): ?>
            if (record.is_revoked == 1) {
-                html += `<td><span class="text-muted" style="margin-right:4px;">已撤销</span><button class="btn btn-sm btn-secondary" onclick="restoreRecord(${record.record_id})">反撤销</button></td>`;
+                const revokerInfo = record.revoker_name ? `由 ${escapeHtml(record.revoker_name)} 撤销` : '已撤销';
+                html += `<td><span class="text-muted" style="margin-right:4px;">${revokerInfo}</span><button class="btn btn-sm btn-secondary" onclick="restoreRecord(${record.record_id})">反撤销</button></td>`;
            } else {
                html += `<td><button class="btn btn-sm btn-danger" onclick="revokeRecord(${record.record_id})">撤销</button></td>`;
            }
            <?php elseif ($role === '班长'): ?>
            if (record.is_revoked == 1) {
-                html += `<td><span class="text-muted">已撤销</span></td>`;
+                const revokerInfo = record.revoker_name ? `由 ${escapeHtml(record.revoker_name)} 撤销` : '已撤销';
+                html += `<td><span class="text-muted">${revokerInfo}</span></td>`;
            } else {
                html += `<td><button class="btn btn-sm btn-danger" onclick="revokeRecord(${record.record_id})">撤销</button></td>`;
            }
@@ -164,10 +178,12 @@ async function exportHistoryRecords() {
    showToast('正在导出历史记录...', 'info');
    
    try {
+        const relatedType = document.getElementById('historyRelatedType').value;
        const params = { page: 1, page_size: 1000 };
        if (startDate) params.start_date = startDate;
        if (endDate) params.end_date = endDate;
        if (studentId) params.student_id = studentId;
+        if (relatedType) params.related_type = relatedType;
        
        const res = await apiGet('/api/admin/conduct/history', params);
        if (res && res.success && res.data.records) {
--- a/frontend/admin/students.php
+++ b/frontend/admin/students.php
@@ -179,7 +179,7 @@ async function loadStudents(page = 1) {
                <td>${escapeHtml(student.student_no)}</td>
                <td><a href="/admin/history.php?student_id=${student.student_id}" style="color: #3498db; text-decoration: none;">${escapeHtml(student.name)}</a></td>
                <td>${student.total_points}</td>
-                ${userRole === '班主任' ? `<td>${student.parent_phone || '-'}</td>` : ''}
+                ${userRole === '班主任' ? `<td>${student.parent_phone ? student.parent_phone.slice(0,3) + '******' + student.parent_phone.slice(-2) : '-'}</td>` : ''}
                <td>
                    <button class="btn btn-sm btn-primary" onclick="showSinglePointsModal(${student.student_id}, '${escapeHtml(student.name)}')">加减分</button>
                    ${userRole === '班主任' ? `<button class="btn btn-sm btn-secondary" onclick="showEditStudentModal(${student.student_id}, '${escapeHtml(student.student_no)}', '${escapeHtml(student.name)}', '${escapeHtml(student.parent_phone || '')}')">编辑</button>
--- a/frontend/admin/subjects.php
+++ b/frontend/admin/subjects.php
@@ -63,6 +63,35 @@ include __DIR__ . '/../includes/header.php';
    </div>
 </div>

+<!-- 编辑科目模态框 -->
+<div id="editSubjectModal" class="modal">
+    <div class="modal-content">
+        <div class="modal-header">
+            <h3>编辑科目</h3>
+            <button class="modal-close" onclick="closeModal('editSubjectModal')">&times;</button>
+        </div>
+        <form onsubmit="event.preventDefault(); submitEditSubject()">
+            <input type="hidden" id="editSubjectId">
+            <div class="form-group">
+                <label>科目名称</label>
+                <input type="text" id="editSubjectName" required placeholder="例如：语文、数学">
+            </div>
+            <div class="form-group">
+                <label>科目代码</label>
+                <input type="text" id="editSubjectCode" placeholder="例如：CHI、MATH">
+            </div>
+            <div class="form-group">
+                <label>排序序号</label>
+                <input type="number" id="editSubjectSortOrder" placeholder="数字越小越靠前" min="0">
+            </div>
+            <div class="modal-footer">
+                <button type="submit" class="btn btn-primary">保存</button>
+                <button type="button" class="btn" onclick="closeModal('editSubjectModal')">取消</button>
+            </div>
+        </form>
+    </div>
+</div>
+
 <style>
 .subject-list {
    display: flex;
@@ -113,6 +142,7 @@ async function loadSubjects() {
                    <span class="subject-status ${sub.is_active ? 'subject-status-active' : 'subject-status-inactive'}">
                        ${sub.is_active ? '启用' : '禁用'}
                    </span>
+                    <button class="btn btn-sm btn-primary" onclick="showEditSubjectModal(${sub.subject_id}, '${escapeHtml(sub.subject_name)}', '${escapeHtml(sub.subject_code || '')}', ${sub.sort_order || 0})">编辑</button>
                    <button class="btn btn-sm" onclick="toggleSubject(${sub.subject_id}, ${!sub.is_active})">
                        ${sub.is_active ? '禁用' : '启用'}
                    </button>
@@ -161,6 +191,39 @@ async function submitAddSubject() {
    }
 }

+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');
+        loadSubjects();
+    } else {
+        showToast(res?.message || '更新失败', 'error');
+    }
+}
+
 function closeModal(modalId) {
    const modal = document.getElementById(modalId);
    if (modal) modal.style.display = 'none';