完成质量裁判

lib/core/models/deduction_rule_item.dart

@@ -21,6 +21,22 @@ class DeductionRuleItem {
 }
 
 abstract final class DeductionRuleCatalog {
+  /// 服务端规定赛扣分项编码到平板控件键的映射。
+  /// 名称文案存在“运动员的”“每人”等差异，提交与草稿恢复必须按编码匹配。
+  static const prescribedServerItemAliases = <String, String>{
+    'T_DED_ROPE_SALUTE': '赛前或赛后未行绳礼（每队）',
+    'T_DED_APPEARANCE': '头发、着装、仪容不符合规定，佩戴饰物或饰物掉落（每人）',
+    'T_DED_CHANGE_1X8': '更改1×8拍规定元素内容',
+    'T_DED_INTERRUPT': '套路中断4秒以上',
+    'T_DED_AREA_FOUL': '场地犯规（踩线/出界，仅个人花样规定套路）',
+    // 兼容旧版内置规则编码。
+    'T_NO_ROPE_SALUTE': '赛前或赛后未行绳礼（每队）',
+    'T_APPEARANCE': '头发、着装、仪容不符合规定，佩戴饰物或饰物掉落（每人）',
+    'T_CHANGE_1X8': '更改1×8拍规定元素内容',
+    'T_INTERRUPT_4S': '套路中断4秒以上',
+    'T_VENUE_FOUL': '场地犯规（踩线/出界，仅个人花样规定套路）',
+  };
+
   static const _mistake = DeductionRuleItem(
     key: '失误',
     label: '失误',

lib/core/models/prescribed_execution_rule.dart

@@ -20,6 +20,14 @@ class ExecutionScoreCriterion {
 }
 
 abstract final class PrescribedExecutionRuleCatalog {
+  static const displayLabels = <String, String>{
+    '动作准确性': '动作的准确性(个人30分/集体20分)',
+    '动作熟练性': '动作的熟练性(个人20分/集体15分)',
+    '动作合拍性': '动作的合拍性(个人30分/集体15分)',
+    '运动能力一致性': '运动能力一致性(集体15分)',
+    '表演技巧一致性': '表演技巧一致性(集体15分)',
+  };
+
   /// 服务端规定赛评分项编码到平板控件键的映射。
   /// 按编码匹配可避免“动作的准确性”与“动作准确性”等文案差异丢分。
   static const serverItemAliases = <String, String>{
@@ -83,4 +91,6 @@ abstract final class PrescribedExecutionRuleCatalog {
         PrescribedEntryType.individual => individual,
         PrescribedEntryType.collective => collective,
       };
+
+  static String displayLabelFor(String item) => displayLabels[item] ?? item;
 }

lib/core/network/remote_scoring_adapter.dart

@@ -66,6 +66,19 @@ abstract final class RemoteScoringAdapter {
       sheet.header.judgeRole.trim().toUpperCase() ==
           session.judgeRole.trim().toUpperCase();
 
+  /// Returns the business session number shown on the judge task card.
+  ///
+  /// [JudgeEntry.playOrder] is the entry order inside an EventSession. The
+  /// arrangement order identifies the first business session represented by
+  /// that EventSession, so both values are needed for a stable display number.
+  static int sessionDisplayOrder(JudgeSession session, JudgeEntry entry) {
+    final playOrder = entry.playOrder > 0 ? entry.playOrder : 1;
+    final arrangementOrder = session.arrangementOrder;
+    return arrangementOrder > 0 && arrangementOrder < 0x7fffffff
+        ? arrangementOrder + playOrder - 1
+        : playOrder;
+  }
+
   static JudgeAccount accountForSession(
     JudgeSession session, {
     required String userId,

lib/modules/home/views/home_page.dart

@@ -44,7 +44,6 @@ class _HomePageState extends State<HomePage> {
   late final Worker _syncStatusWorker;
   Timer? _messageTimer;
   int _unreadMessages = 0;
-  int _correctionTaskCount = 0;
 
   @override
   void initState() {
@@ -56,9 +55,6 @@ class _HomePageState extends State<HomePage> {
     _loadUnreadMessages();
     _messageTimer = Timer.periodic(const Duration(seconds: 30), (_) {
       _loadUnreadMessages();
-      if (_allSessions.isNotEmpty) {
-        _loadCorrectionTaskCount(_allSessions);
-      }
     });
   }
 
@@ -122,7 +118,6 @@ class _HomePageState extends State<HomePage> {
             sessionsResult.fromCache || batches.any((item) => item.fromCache);
         _loading = false;
       });
-      unawaited(_loadCorrectionTaskCount(sessionsResult.data));
     } on ApiException catch (error) {
       if (!mounted) return;
       setState(() {
@@ -172,9 +167,7 @@ class _HomePageState extends State<HomePage> {
               userName: userName,
               roleSummary: roleSummary,
               unreadMessages: _unreadMessages,
-              correctionTaskCount: _correctionTaskCount,
               onMessages: _openMessages,
-              onCorrections: _openCorrections,
               onResults: chiefSessions.isNotEmpty ? _openResults : null,
               onLogout: _logout,
             ),
@@ -209,6 +202,11 @@ class _HomePageState extends State<HomePage> {
                               padding: const EdgeInsets.only(bottom: 16),
                               child: _TaskCard(
                                 task: entry.$2,
+                                sessionDisplayOrder: RemoteScoringAdapter
+                                    .sessionDisplayOrder(
+                                      _remoteTasks[entry.$1].session,
+                                      _remoteTasks[entry.$1].entry,
+                                    ),
                                 roleLabel:
                                     RemoteScoringAdapter.roleLabelForSession(
                                       _remoteTasks[entry.$1].session,
@@ -332,41 +330,6 @@ class _HomePageState extends State<HomePage> {
     if (mounted) setState(() {});
   }
 
-  Future<void> _openCorrections() async {
-    final entryId = await Get.toNamed(
-      AppRoutes.corrections,
-      arguments: _sessions,
-    );
-    if (!mounted) return;
-    await _loadTasks();
-    if (!mounted || entryId is! String) return;
-    final index = _remoteTasks.indexWhere(
-      (item) => item.entry.sessionEntryId == entryId,
-    );
-    if (index >= 0) {
-      await _openTask(index, _remoteTasks[index], correction: true);
-    } else {
-      await _openCorrectionTask(entryId);
-    }
-  }
-
-  Future<void> _loadCorrectionTaskCount(List<JudgeSession> sessions) async {
-    try {
-      final batches = await Future.wait(
-        sessions.map(
-          (session) => _api.loadCorrectionCandidates(session.sessionId),
-        ),
-      );
-      final count = batches
-          .expand((items) => items)
-          .where((item) => item.isAssignedTask)
-          .length;
-      if (mounted) setState(() => _correctionTaskCount = count);
-    } on ApiException {
-      // Badge refresh failure must not block the scoring task list.
-    }
-  }
-
   Future<void> _openResults() async {
     await Get.toNamed(AppRoutes.results, arguments: _chiefSessions);
   }
@@ -696,9 +659,7 @@ class _TopBar extends StatelessWidget {
     required this.userName,
     required this.roleSummary,
     required this.unreadMessages,
-    required this.correctionTaskCount,
     required this.onMessages,
-    required this.onCorrections,
     required this.onResults,
     required this.onLogout,
   });
@@ -707,9 +668,7 @@ class _TopBar extends StatelessWidget {
   final String userName;
   final String roleSummary;
   final int unreadMessages;
-  final int correctionTaskCount;
   final VoidCallback onMessages;
-  final VoidCallback onCorrections;
   final VoidCallback? onResults;
   final VoidCallback onLogout;
 
@@ -762,19 +721,7 @@ class _TopBar extends StatelessWidget {
           ),
         ),
         const SizedBox(width: 18),
-        Badge(
-          isLabelVisible: correctionTaskCount > 0,
-          label: Text(
-            correctionTaskCount > 99 ? '99+' : '$correctionTaskCount',
-          ),
-          child: IconButton.outlined(
-            onPressed: onCorrections,
-            tooltip: '成绩修正任务',
-            icon: const Icon(Icons.edit_note_rounded, size: 21),
-          ),
-        ),
         if (onResults != null) ...[
-          const SizedBox(width: 8),
           IconButton.outlined(
             onPressed: onResults,
             tooltip: '场次成绩',
@@ -944,6 +891,7 @@ class _PageHeading extends StatelessWidget {
 class _TaskCard extends StatelessWidget {
   const _TaskCard({
     required this.task,
+    required this.sessionDisplayOrder,
     required this.roleLabel,
     required this.status,
     required this.isCurrent,
@@ -951,6 +899,7 @@ class _TaskCard extends StatelessWidget {
     required this.onTap,
   });
   final ScoringTask task;
+  final int sessionDisplayOrder;
   final String roleLabel;
   final String status;
   final bool isCurrent;
@@ -1050,7 +999,7 @@ class _TaskCard extends StatelessWidget {
                     ),
                     const SizedBox(height: 3),
                     Text(
-                      '#${task.displayOrder}',
+                      '#${sessionDisplayOrder.toString().padLeft(2, '0')}',
                       style: TextStyle(
                         color: color,
                         fontSize: 14,

lib/modules/scoring/controllers/scoring_controller.dart

@@ -437,6 +437,9 @@ class ScoringController extends GetxController {
         final key = _matchingKey(
           deductionCounts.keys,
           '${item.name}${item.code}',
+          aliases: profile.competition == CompetitionKind.prescribed
+              ? DeductionRuleCatalog.prescribedServerItemAliases
+              : const {},
         );
         if (key != null) {
           deductionCounts[key] = count;
@@ -879,6 +882,13 @@ class ScoringController extends GetxController {
         .description;
   }
 
+  String performanceItemDisplayLabel(String item) {
+    if (profile.role == ScoreRole.execution) {
+      return PrescribedExecutionRuleCatalog.displayLabelFor(item);
+    }
+    return '$item(${performanceItemMaximum(item).round()})';
+  }
+
   void setPerformance(String item, double value) {
     performanceItems[item] = value.clamp(0, performanceItemMaximum(item));
     recalculate();

lib/modules/scoring/views/scoring_page.dart

@@ -1296,7 +1296,7 @@ class _PerformancePanel extends StatelessWidget {
                 mainAxisSize: MainAxisSize.min,
                 children: [
                   Text(
-                    '${entry.key}($itemMaximum)',
+                    controller.performanceItemDisplayLabel(entry.key),
                     style: const TextStyle(fontWeight: FontWeight.w700),
                   ),
                   if (description != null) ...[

test/prescribed_execution_rule_test.dart

@@ -30,6 +30,29 @@ void main() {
     expect(rules.fold<double>(0, (sum, item) => sum + item.maximum), 80);
   });
 
+  test('完成质量评分项同时标明个人与集体分值', () {
+    expect(
+      PrescribedExecutionRuleCatalog.displayLabelFor('动作准确性'),
+      '动作的准确性(个人30分/集体20分)',
+    );
+    expect(
+      PrescribedExecutionRuleCatalog.displayLabelFor('动作熟练性'),
+      '动作的熟练性(个人20分/集体15分)',
+    );
+    expect(
+      PrescribedExecutionRuleCatalog.displayLabelFor('动作合拍性'),
+      '动作的合拍性(个人30分/集体15分)',
+    );
+    expect(
+      PrescribedExecutionRuleCatalog.displayLabelFor('运动能力一致性'),
+      '运动能力一致性(集体15分)',
+    );
+    expect(
+      PrescribedExecutionRuleCatalog.displayLabelFor('表演技巧一致性'),
+      '表演技巧一致性(集体15分)',
+    );
+  });
+
   test('个人与集体规定赛使用不同任务状态键', () {
     final profile = JudgeAccounts.find('GS-E1')!;
 

test/remote_scoring_adapter_test.dart

@@ -220,6 +220,63 @@ void main() {
     expect(task.session, isNot(contains(task.project)));
     expect(task.session, isNot(contains(task.groupName)));
   });
+
+  test('任务卡场次号由编排起始场次和出场顺序计算', () {
+    final firstSession = _session(
+      id: 'session-1',
+      role: 'DJ1',
+      roleType: 'DJ',
+      arrangementOrder: 1,
+    );
+    final secondSession = _session(
+      id: 'session-2',
+      role: 'DJ1',
+      roleType: 'DJ',
+      arrangementOrder: 2,
+    );
+    const firstEntry = JudgeEntry(
+      sessionEntryId: 'entry-1',
+      entryNo: '01',
+      playOrder: 1,
+      participantName: '测试队',
+      groupName: '青年组',
+      entryStatus: 0,
+      isRematch: false,
+      scoreStatus: 0,
+      scoreStatusName: '待评分',
+      isDisqualified: false,
+      scoreSheetId: '',
+    );
+    const secondEntryInSameSession = JudgeEntry(
+      sessionEntryId: 'entry-2',
+      entryNo: '02',
+      playOrder: 2,
+      participantName: '测试队',
+      groupName: '青年组',
+      entryStatus: 0,
+      isRematch: false,
+      scoreStatus: 0,
+      scoreStatusName: '待评分',
+      isDisqualified: false,
+      scoreSheetId: '',
+    );
+
+    expect(
+      RemoteScoringAdapter.sessionDisplayOrder(firstSession, firstEntry),
+      1,
+    );
+    expect(
+      RemoteScoringAdapter.sessionDisplayOrder(secondSession, firstEntry),
+      2,
+    );
+    expect(
+      RemoteScoringAdapter.sessionDisplayOrder(
+        firstSession,
+        secondEntryInSameSession,
+      ),
+      2,
+    );
+  });
 }
 
 JudgeSession _session({
@@ -227,6 +284,7 @@ JudgeSession _session({
   required String role,
   required String roleType,
   String roleName = '',
+  int arrangementOrder = 0,
 }) => JudgeSession(
   sessionId: id,
   eventId: 'event-1',
@@ -244,6 +302,7 @@ JudgeSession _session({
   judgeRoleName: roleName,
   entryCount: 2,
   scoredCount: 0,
+  arrangementOrder: arrangementOrder,
 );
 
 JudgeScoreSheet _sheet({

test/score_item_key_matcher_test.dart

@@ -35,7 +35,13 @@ void main() {
   });
 
   test('规定赛完成质量项按稳定编码匹配平板控件', () {
-    const keys = ['动作准确性', '动作熟练性', '动作合拍性'];
+    const keys = [
+      '动作准确性',
+      '动作熟练性',
+      '动作合拍性',
+      '运动能力一致性',
+      '表演技巧一致性',
+    ];
     const aliases = PrescribedExecutionRuleCatalog.serverItemAliases;
 
     expect(
@@ -54,6 +60,48 @@ void main() {
       ScoreItemKeyMatcher.match(keys, 'CQ_SYNCHRONY 动作的合拍性', aliases: aliases),
       '动作合拍性',
     );
+    expect(
+      ScoreItemKeyMatcher.match(
+        keys,
+        'CQ_ABILITY_CONSISTENCY 运动能力一致性',
+        aliases: aliases,
+      ),
+      '运动能力一致性',
+    );
+    expect(
+      ScoreItemKeyMatcher.match(
+        keys,
+        'CQ_SKILL_CONSISTENCY 表演技巧一致性',
+        aliases: aliases,
+      ),
+      '表演技巧一致性',
+    );
+  });
+
+  test('规定赛主裁扣分项按稳定编码匹配平板控件', () {
+    final keys = DeductionRuleCatalog.forCompetition(
+      CompetitionKind.prescribed,
+    ).map((item) => item.key).toList();
+    const aliases = DeductionRuleCatalog.prescribedServerItemAliases;
+    const serverItems = {
+      'T_DED_ROPE_SALUTE': '赛前或赛后未行绳礼（每队）',
+      'T_DED_APPEARANCE': '头发、着装、仪容不符合规定，佩戴饰物或饰物掉落（每人）',
+      'T_DED_CHANGE_1X8': '更改1×8拍规定元素内容',
+      'T_DED_INTERRUPT': '套路中断4秒以上',
+      'T_DED_AREA_FOUL': '场地犯规（踩线/出界，仅个人花样规定套路）',
+    };
+
+    expect(
+      {
+        for (final item in serverItems.entries)
+          item.key: ScoreItemKeyMatcher.match(
+            keys,
+            item.key,
+            aliases: aliases,
+          ),
+      },
+      serverItems,
+    );
   });
 
   final keys = DeductionRuleCatalog.forCompetition(