多考试块表：每场考试改为单列并修正第几次列合并
- ny_assemble_block_sheet() 中每场考试由 2 列改为 1 列，删除历史遗留的 「是否最佳」空白列，消除每场右侧多余空白窄列 - 删除「第几次」列的纵向合并，改为逐行显示 1/2/3…，不再被吞成 1 - 合格次数行同步改为每场 1 列；未考合并加 $end > $start 跨行守卫， 规避单行学生产生的非法 1x1 合并（Excel 修复提示） - 列宽按考试名估算（CJK 记 2 半角宽），clamp 8~18 - 同步更新 test-multi-export.php（95 项含 4 条防回归断言）、 make-samples.php（李四数学改为真正整场未考）、导出/接口/测试文档 及样例预览文件；全量回归 404 项 0 失败
This commit is contained in:
Binary file not shown.
Binary file not shown.
@@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8">
|
||||
<title>多考试导出 · 每次考试（两行表头）（预览）</title><style>body{font-family:"Microsoft YaHei","PingFang SC",sans-serif;color:#222;background:#f7f7f7;margin:0;padding:24px}.page{background:#fff;border:1px solid #e3e3e3;border-radius:6px;padding:20px 22px;margin:0 auto 20px;max-width:1100px}.page h2{font-size:16px;margin:0 0 4px}.page .sub{font-size:12px;color:#777;margin:0 0 14px}table.bt{border-collapse:collapse;border:1px solid #999;width:100%;background:#fff;font-size:11px}table.bt td,table.bt th{border:1px solid #999;text-align:center;padding:3px 5px}table.bt th,table.bt thead td{background:#eaeaea;font-weight:700}table.bt thead tr:first-child td{background:#eaeaea}table.bt td.absent{color:#888}table.bt td.max{color:#d0021b;font-weight:700}table.bt td.pass{background:#63c384;font-weight:700;-webkit-print-color-adjust:exact;print-color-adjust:exact}html,body,.pass,.absent,.max{-webkit-print-color-adjust:exact;print-color-adjust:exact}.legend{margin:10px 0 0;font-size:12px;color:#555}.legend i{display:inline-block;width:11px;height:11px;vertical-align:-1px;margin:0 4px 0 12px}.legend .r{color:#d0021b;font-weight:700}.legend .g{background:#63c384;font-weight:700}.sign{margin-top:16px;font-size:12px}</style></head><body>
|
||||
<div class="page"><h2>多考试导出 · 每次考试（两行表头）</h2><p class="sub">合格线 110 分，达 1 次标绿</p>
|
||||
<table class="bt"><thead><tr><td rowspan="2">学号</td><td rowspan="2">姓名</td><td rowspan="2">第几次</td><td colspan="2">第一次月考·数学</td><td colspan="2">第一次月考·英语</td></tr><tr><td>成绩</td><td></td><td>成绩</td><td></td></tr></thead><tbody><tr><td rowspan="5">356001</td><td rowspan="5">张三</td><td rowspan="4">1</td><td>112</td><td></td><td class="max">112</td><td></td></tr><tr><td>100</td><td></td><td>99</td><td></td></tr><tr><td class="max">136</td><td></td><td></td><td></td></tr><tr><td>127</td><td></td><td></td><td></td></tr><tr><td>合格次数</td><td class="pass">3</td><td></td><td class="pass">1</td><td></td></tr><tr><td rowspan="4">356002</td><td rowspan="4">李四</td><td rowspan="3">1</td><td></td><td></td><td>130</td><td></td></tr><tr><td></td><td></td><td>129</td><td></td></tr><tr><td></td><td></td><td class="max">133</td><td></td></tr><tr><td>合格次数</td><td>0</td><td></td><td class="pass">3</td><td></td></tr><tr><td rowspan="2">356003</td><td rowspan="2">王五</td><td>1</td><td class="max">95</td><td></td><td colspan="2" class="absent">未考</td></tr><tr><td>合格次数</td><td>0</td><td></td><td></td><td></td></tr></tbody></table>
|
||||
<table class="bt"><thead><tr><td rowspan="2">学号</td><td rowspan="2">姓名</td><td rowspan="2">第几次</td><td>第一次月考·数学</td><td>第一次月考·英语</td></tr><tr><td>成绩</td><td>成绩</td></tr></thead><tbody><tr><td rowspan="5">356001</td><td rowspan="5">张三</td><td>1</td><td>112</td><td class="max">112</td></tr><tr><td>2</td><td>100</td><td>99</td></tr><tr><td>3</td><td class="max">136</td><td></td></tr><tr><td>4</td><td>127</td><td></td></tr><tr><td>合格次数</td><td class="pass">3</td><td class="pass">1</td></tr><tr><td rowspan="4">356002</td><td rowspan="4">李四</td><td>1</td><td rowspan="3" class="absent">未考</td><td>130</td></tr><tr><td>2</td><td>129</td></tr><tr><td>3</td><td class="max">133</td></tr><tr><td>合格次数</td><td></td><td class="pass">3</td></tr><tr><td rowspan="2">356003</td><td rowspan="2">王五</td><td>1</td><td class="max">95</td><td class="absent">未考</td></tr><tr><td>合格次数</td><td>0</td><td></td></tr></tbody></table>
|
||||
<p class="legend">标记说明：<span class="r">最高分</span> 标红、<i class="r">红字</i>；<span class="g">合格次数</span> 始终显示（含 0 次），达 1 次标绿、<i class="g">绿底</i>；未达标显示次数、不标绿。
|
||||
<p class="sign">教师签字：______________ 教研组长签字：______________ 日期：____________</p>
|
||||
</div></body></html>
|
||||
@@ -1,7 +1,7 @@
|
||||
<!DOCTYPE html><html lang="zh-CN"><head><meta charset="utf-8">
|
||||
<title>单场导出 · 每次考试（每人一行的宽表）（预览）</title><style>body{font-family:"Microsoft YaHei","PingFang SC",sans-serif;color:#222;background:#f7f7f7;margin:0;padding:24px}.page{background:#fff;border:1px solid #e3e3e3;border-radius:6px;padding:20px 22px;margin:0 auto 20px;max-width:1100px}.page h2{font-size:16px;margin:0 0 4px}.page .sub{font-size:12px;color:#777;margin:0 0 14px}table.bt{border-collapse:collapse;border:1px solid #999;width:100%;background:#fff;font-size:11px}table.bt td,table.bt th{border:1px solid #999;text-align:center;padding:3px 5px}table.bt th,table.bt thead td{background:#eaeaea;font-weight:700}table.bt thead tr:first-child td{background:#eaeaea}table.bt td.absent{color:#888}table.bt td.max{color:#d0021b;font-weight:700}table.bt td.pass{background:#63c384;font-weight:700;-webkit-print-color-adjust:exact;print-color-adjust:exact}html,body,.pass,.absent,.max{-webkit-print-color-adjust:exact;print-color-adjust:exact}.legend{margin:10px 0 0;font-size:12px;color:#555}.legend i{display:inline-block;width:11px;height:11px;vertical-align:-1px;margin:0 4px 0 12px}.legend .r{color:#d0021b;font-weight:700}.legend .g{background:#63c384;font-weight:700}.sign{margin-top:16px;font-size:12px}</style></head><body>
|
||||
<div class="page"><h2>单场导出 · 每次考试（每人一行的宽表）</h2><p class="sub">第一次月考·数学 · 合格线 110 分，达 1 次标绿</p>
|
||||
<table class="bt"><thead><tr><td>学号</td><td>姓名</td><td>第1次</td><td>第2次</td><td>第3次</td><td>第4次</td><td>合格次数</td></tr></thead><tbody><tr><td>356001</td><td>张三</td><td>112</td><td>100</td><td class="max">136</td><td>127</td><td class="pass">3</td></tr><tr><td>356002</td><td>李四</td><td></td><td></td><td></td><td></td><td>0</td></tr><tr><td>356003</td><td>王五</td><td class="max">95</td><td></td><td></td><td></td><td>0</td></tr></tbody></table>
|
||||
<table class="bt"><thead><tr><td>学号</td><td>姓名</td><td>第1次</td><td>第2次</td><td>第3次</td><td>第4次</td><td>合格次数</td></tr></thead><tbody><tr><td>356001</td><td>张三</td><td>112</td><td>100</td><td class="max">136</td><td>127</td><td class="pass">3</td></tr><tr><td>356003</td><td>王五</td><td class="max">95</td><td></td><td></td><td></td><td>0</td></tr></tbody></table>
|
||||
<p class="legend">标记说明：<span class="r">最高分</span> 标红、<i class="r">红字</i>；<span class="g">合格次数</span> 始终显示（含 0 次），达 1 次标绿、<i class="g">绿底</i>；未达标显示次数、不标绿。
|
||||
<p class="sign">教师签字：______________ 教研组长签字：______________ 日期：____________</p>
|
||||
</div></body></html>
|
||||
+39
-104
@@ -8,44 +8,34 @@
|
||||
"姓名",
|
||||
"第几次",
|
||||
"第一次月考·数学",
|
||||
"",
|
||||
"第一次月考·英语",
|
||||
""
|
||||
"第一次月考·英语"
|
||||
],
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"成绩",
|
||||
"",
|
||||
"成绩",
|
||||
""
|
||||
"成绩"
|
||||
],
|
||||
[
|
||||
"356001",
|
||||
"张三",
|
||||
"1",
|
||||
"112",
|
||||
"",
|
||||
"112",
|
||||
""
|
||||
"112"
|
||||
],
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"2",
|
||||
"100",
|
||||
"",
|
||||
"99",
|
||||
""
|
||||
"99"
|
||||
],
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"3",
|
||||
"136",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
],
|
||||
[
|
||||
@@ -53,8 +43,6 @@
|
||||
"",
|
||||
"4",
|
||||
"127",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
],
|
||||
[
|
||||
@@ -62,62 +50,48 @@
|
||||
"",
|
||||
"合格次数",
|
||||
"3",
|
||||
"",
|
||||
"1",
|
||||
""
|
||||
"1"
|
||||
],
|
||||
[
|
||||
"356002",
|
||||
"李四",
|
||||
"1",
|
||||
"",
|
||||
"",
|
||||
"130",
|
||||
""
|
||||
"未考",
|
||||
"130"
|
||||
],
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"2",
|
||||
"",
|
||||
"",
|
||||
"129",
|
||||
""
|
||||
"129"
|
||||
],
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"3",
|
||||
"",
|
||||
"",
|
||||
"133",
|
||||
""
|
||||
"133"
|
||||
],
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"合格次数",
|
||||
"0",
|
||||
"",
|
||||
"3",
|
||||
""
|
||||
"3"
|
||||
],
|
||||
[
|
||||
"356003",
|
||||
"王五",
|
||||
"1",
|
||||
"95",
|
||||
"",
|
||||
"未考",
|
||||
""
|
||||
"未考"
|
||||
],
|
||||
[
|
||||
"",
|
||||
"",
|
||||
"合格次数",
|
||||
"0",
|
||||
"",
|
||||
"",
|
||||
""
|
||||
]
|
||||
],
|
||||
@@ -141,58 +115,34 @@
|
||||
3
|
||||
],
|
||||
[
|
||||
3,
|
||||
1,
|
||||
7,
|
||||
1
|
||||
],
|
||||
[
|
||||
3,
|
||||
2,
|
||||
7,
|
||||
2
|
||||
],
|
||||
[
|
||||
8,
|
||||
4,
|
||||
1,
|
||||
5
|
||||
],
|
||||
[
|
||||
1,
|
||||
6,
|
||||
1,
|
||||
7
|
||||
],
|
||||
[
|
||||
3,
|
||||
1,
|
||||
7,
|
||||
1
|
||||
],
|
||||
[
|
||||
3,
|
||||
2,
|
||||
7,
|
||||
2
|
||||
],
|
||||
[
|
||||
3,
|
||||
3,
|
||||
6,
|
||||
3
|
||||
],
|
||||
[
|
||||
8,
|
||||
1,
|
||||
11,
|
||||
1
|
||||
],
|
||||
[
|
||||
8,
|
||||
2,
|
||||
11,
|
||||
2
|
||||
],
|
||||
[
|
||||
8,
|
||||
3,
|
||||
10,
|
||||
3
|
||||
4
|
||||
],
|
||||
[
|
||||
12,
|
||||
6,
|
||||
12,
|
||||
7
|
||||
8,
|
||||
1,
|
||||
11,
|
||||
1
|
||||
],
|
||||
[
|
||||
8,
|
||||
2,
|
||||
11,
|
||||
2
|
||||
],
|
||||
[
|
||||
12,
|
||||
@@ -205,22 +155,16 @@
|
||||
2,
|
||||
13,
|
||||
2
|
||||
],
|
||||
[
|
||||
12,
|
||||
3,
|
||||
12,
|
||||
3
|
||||
]
|
||||
],
|
||||
"header_rows": 2,
|
||||
"cell_styles": {
|
||||
"3,6": "red",
|
||||
"3,5": "red",
|
||||
"5,4": "red",
|
||||
"7,4": "green",
|
||||
"7,6": "green",
|
||||
"10,6": "red",
|
||||
"11,6": "green",
|
||||
"7,5": "green",
|
||||
"10,5": "red",
|
||||
"11,5": "green",
|
||||
"12,4": "red"
|
||||
}
|
||||
},
|
||||
@@ -251,15 +195,6 @@
|
||||
"127",
|
||||
"3"
|
||||
],
|
||||
[
|
||||
"356002",
|
||||
"李四",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
"0"
|
||||
],
|
||||
[
|
||||
"356003",
|
||||
"王五",
|
||||
@@ -275,7 +210,7 @@
|
||||
"cell_styles": {
|
||||
"2,5": "red",
|
||||
"2,7": "green",
|
||||
"4,3": "red"
|
||||
"3,3": "red"
|
||||
}
|
||||
},
|
||||
"meta": {
|
||||
|
||||
Reference in New Issue
Block a user