nxxy335/ny-exam-platform
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: 抽取页分组均衡5:5 / 重置清累计 / 历史记录 / 排除管理 / 登陆账号字段 / side等高

Browse Source 
随机抽取页：
- 分组均衡抽取：有组别(≥2个)时默认按名额均分到组(12/8抽10→5/5)，
  其次按班级均分，否则整池随机；可勾选关闭
- 名额均分算法 allocQuotas：floor 均分 + 余数小组优先补齐 +
  超容量退回 + 差额给剩余容量大者
- 重置结果：同时清零累计已抽取数（历史记录仍保留）
- 历史记录：每批次入 localStorage ny_draw_log（上限50），
  重置不清，支持查看详情/恢复结果/删除/清空
- 抽取排除：排除管理弹窗（搜索/清空），结果行可"移出并加入排除"
- 白名单列表下载：登陆账号优先，缺失回退学号

名单登陆账号：
- 模板解析识别"登陆/登录账号/账号/手机号"列，手机号去 .0 尾巴
- Db ny_roster 增 login 列 + 旧表自动升级(三方言)
- roster_save 透传 login；draw_export 使用 login
- 登陆账号仅用于白名单列表下载，其余界面不展示

布局：side 模式下成绩明细/缺考名单 panel 改 flex 撑满，
.table-scroll 取消 320px 限高，两侧等高不再留白

测试：tools/test-draw-alloc.js 18/18 通过（含 1000 组随机 fuzz）
This commit is contained in:
nxxy335
2026-09-09 12:29:49 +08:00
parent ba0e64ed51
commit 6772aeae11
7 changed files with 640 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/Db.php
+45 -10
View File
@@ -164,26 +164,57 @@ class Db
}
$pdo->exec($sql); $n++;
// roster —— 名单表（学号/姓名/班级/组别）
// roster —— 名单表（学号/姓名/班级/组别/登陆账号）
if ($driver === 'sqlite') {
$sql = 'CREATE TABLE IF NOT EXISTS ny_roster (' .
'id INTEGER PRIMARY KEY AUTOINCREMENT, ' .
'sid VARCHAR(64), name VARCHAR(128), cls VARCHAR(64), grp VARCHAR(32))';
'sid VARCHAR(64), name VARCHAR(128), cls VARCHAR(64), grp VARCHAR(32), login VARCHAR(64))';
} elseif ($driver === 'pgsql') {
$sql = 'CREATE TABLE IF NOT EXISTS ny_roster (' .
'id SERIAL PRIMARY KEY, ' .
'sid VARCHAR(64), name VARCHAR(128), cls VARCHAR(64), grp VARCHAR(32))';
'sid VARCHAR(64), name VARCHAR(128), cls VARCHAR(64), grp VARCHAR(32), login VARCHAR(64))';
} else {
$sql = 'CREATE TABLE IF NOT EXISTS ny_roster (' .
'id INT AUTO_INCREMENT PRIMARY KEY, ' .
'sid VARCHAR(64), name VARCHAR(128), cls VARCHAR(64), grp VARCHAR(32)) ' .
'sid VARCHAR(64), name VARCHAR(128), cls VARCHAR(64), grp VARCHAR(32), login VARCHAR(64)) ' .
'ENGINE=InnoDB DEFAULT CHARSET=utf8mb4';
}
$pdo->exec($sql); $n++;
// 旧版本升级：补 login 列
self::ensureRosterLogin();
return $n;
}
/** 旧表升级：ny_roster 缺 login 列时自动补（三方言兼容） */
public static function ensureRosterLogin(): void
{
$pdo = self::pdo();
if ($pdo === null) {
return;
}
$has = false;
if (self::$driver === 'sqlite') {
foreach ($pdo->query('PRAGMA table_info(ny_roster)')->fetchAll() as $c) {
if (strtolower((string)$c['name']) === 'login') {
$has = true;
break;
}
}
} elseif (self::$driver === 'pgsql') {
$st = $pdo->prepare("SELECT COUNT(*) FROM information_schema.columns " .
"WHERE table_name = 'ny_roster' AND column_name = 'login'");
$st->execute();
$has = (int)$st->fetchColumn() > 0;
} else {
$has = $pdo->query("SHOW COLUMNS FROM ny_roster LIKE 'login'")->fetch() !== false;
}
if (!$has) {
$pdo->exec('ALTER TABLE ny_roster ADD COLUMN login VARCHAR(64)');
}
}
/**
* 把所有 settings 读成数组
*/
@@ -227,14 +258,16 @@ class Db
if ($pdo === null) {
return [];
}
$stmt = $pdo->query('SELECT sid, name, cls, grp FROM ny_roster ORDER BY id');
self::ensureRosterLogin();
$stmt = $pdo->query('SELECT sid, name, cls, grp, login FROM ny_roster ORDER BY id');
$rows = [];
foreach ($stmt->fetchAll() as $r) {
$rows[] = [
'sid' => (string)$r['sid'],
'name' => (string)$r['name'],
'cls' => (string)$r['cls'],
'grp' => (string)$r['grp'],
'sid' => (string)$r['sid'],
'name' => (string)$r['name'],
'cls' => (string)$r['cls'],
'grp' => (string)$r['grp'],
'login' => (string)($r['login'] ?? ''),
];
}
return $rows;
@@ -247,16 +280,18 @@ class Db
if ($pdo === null) {
return;
}
self::ensureRosterLogin();
$pdo->beginTransaction();
try {
$pdo->exec('DELETE FROM ny_roster');
$st = $pdo->prepare('INSERT INTO ny_roster(sid, name, cls, grp) VALUES(?, ?, ?, ?)');
$st = $pdo->prepare('INSERT INTO ny_roster(sid, name, cls, grp, login) VALUES(?, ?, ?, ?, ?)');
foreach ($students as $s) {
$st->execute([
(string)($s['sid'] ?? ''),
(string)($s['name'] ?? ''),
(string)($s['cls'] ?? ''),
(string)($s['grp'] ?? ''),
(string)($s['login'] ?? ''),
]);
}
$pdo->commit();
lib/Roster.php
+25 -15
View File
@@ -35,10 +35,11 @@ class Roster
continue;
}
$out[] = [
'sid' => trim((string)($s['sid'] ?? '')),
'name' => trim((string)($s['name'] ?? '')),
'cls' => trim((string)($s['cls'] ?? '')),
'grp' => trim((string)($s['grp'] ?? '')),
'sid' => trim((string)($s['sid'] ?? '')),
'name' => trim((string)($s['name'] ?? '')),
'cls' => trim((string)($s['cls'] ?? '')),
'grp' => trim((string)($s['grp'] ?? '')),
'login' => trim((string)($s['login'] ?? '')),
];
}
return $out;
@@ -63,10 +64,11 @@ class Roster
continue;
}
$clean[] = [
'sid' => $sid,
'name' => $name,
'cls' => trim((string)($s['cls'] ?? '')),
'grp' => trim((string)($s['grp'] ?? '')),
'sid' => $sid,
'name' => $name,
'cls' => trim((string)($s['cls'] ?? '')),
'grp' => trim((string)($s['grp'] ?? '')),
'login' => trim((string)($s['login'] ?? '')),
];
}
if (self::useDb()) {
@@ -191,15 +193,17 @@ class Roster
}
/**
* 识别 学号/姓名/班级 列
* @return array<int,array{sid:string,name:string,cls:string}>
* 识别 学号/姓名/班级/组别/登陆账号 列
* 登陆账号仅用于随机抽取页导出白名单，界面任何位置都不显示
* @return array<int,array{sid:string,name:string,cls:string,grp:string,login:string}>
*/
public static function rowsToStudents(array $rows): array
{
$sidCol = -1;
$nameCol = -1;
$clsCol = -1;
$grpCol = -1;
$sidCol = -1;
$nameCol = -1;
$clsCol = -1;
$grpCol = -1;
$loginCol = -1;
$headerIdx = -1;
// 找表头
@@ -228,6 +232,9 @@ class Roster
if ($grpCol < 0 && preg_match('/组\s*别|分\s*组|^\s*组\s*$|group/i', $c)) {
$grpCol = $j;
}
if ($loginCol < 0 && preg_match('/登\s*[陆录]\s*账\s*号|登\s*[陆录]\s*账号|账\s*号|手\s*机\s*号|手\s*机/i', $c)) {
$loginCol = $j;
}
}
}
if ($sidCol < 0) {
@@ -249,7 +256,10 @@ class Roster
$sid = preg_replace('/\.0+$/', '', $sid) ?? $sid;
$cls = $clsCol >= 0 ? trim((string)($row[$clsCol] ?? '')) : '';
$grp = $grpCol >= 0 ? trim((string)($row[$grpCol] ?? '')) : '';
$out[] = ['sid' => $sid, 'name' => $name, 'cls' => $cls, 'grp' => $grp];
$login = $loginCol >= 0 ? trim((string)($row[$loginCol] ?? '')) : '';
// 登陆账号同样去掉 Excel 数字尾巴（手机号被读成 13912687810.0）
$login = preg_replace('/\.0+$/', '', $login) ?? $login;
$out[] = ['sid' => $sid, 'name' => $name, 'cls' => $cls, 'grp' => $grp, 'login' => $login];
}
return $out;
}