diff --git a/src/views/scoring/screen/index.vue b/src/views/scoring/screen/index.vue
index 4fc62b3..ef84738 100644
--- a/src/views/scoring/screen/index.vue
+++ b/src/views/scoring/screen/index.vue
@@ -60,7 +60,7 @@ const scoreCards=computed(()=>{
const scoreRuleCode=effectiveCast.value?.scoreRuleCode;
const prescribed=String(scoreRuleCode||'').toUpperCase().includes('PRESCRIBED');
const wire=isWireRule(scoreRuleCode);
- return [{key:'difficulty',label:'难度',en:'DIFFICULTY',field:'difficultyScore'},{key:'performance',label:'表现',en:'PERFORMANCE',field:'performanceScore'},{key:'required',label:'规定',en:'REQUIRED',field:'requiredScore'},{key:'deduction',label:payload.value.deductionFactor!=null?'得分系数 M':'扣分',en:'DEDUCTION',field:payload.value.deductionFactor!=null?'deductionFactor':'deductionScore'}]
+ return [{key:'difficulty',label:'难度',en:'DIFFICULTY',field:'difficultyScore'},{key:'performance',label:'表现',en:'PERFORMANCE',field:'performanceScore'},{key:'required',label:'规定',en:'REQUIRED',field:'requiredScore'},{key:'deduction',label:payload.value.deductionFactor!=null?'扣分 M':'扣分',en:'DEDUCTION',field:payload.value.deductionFactor!=null?'deductionFactor':'deductionScore'}]
.filter(item=>(item.key!=='difficulty'||!prescribed)&&(item.key!=='required'||!wire));
});
const rankingAll=computed(()=>Array.isArray(payload.value)?payload.value:[]),rankingTotal=computed(()=>rankingAll.value.length),rankingPageCount=computed(()=>Math.max(1,Math.ceil(rankingTotal.value/6))),rankingPageIndex=computed(()=>rankPage.value%rankingPageCount.value),rankingRows=computed(()=>rankingAll.value.slice(rankingPageIndex.value*6,rankingPageIndex.value*6+6)),maxRankScore=computed(()=>Math.max(...rankingAll.value.map(row=>Number(row.totalScore??row.score)||0),1));
diff --git a/src/views/scoring/workbench/index.vue b/src/views/scoring/workbench/index.vue
index 4701550..4df3030 100644
--- a/src/views/scoring/workbench/index.vue
+++ b/src/views/scoring/workbench/index.vue
@@ -57,7 +57,7 @@
{{ score(row.result?.difficultyScore) }}
{{ score(row.result?.performanceScore) }}
{{ score(row.result?.requiredScore) }}
- {{ deductionScoreText(row.result, row._session?.scoreRuleCode) }}
+ {{ deductionScoreText(row.result, row._session?.scoreRuleCode) }}
{{ row.result?.isDisqualified ? 'DQ' : score(row.result?.totalScore ?? row.result?.scoreText) }}
{{ row.result.resultStatusName }}计算中
@@ -197,7 +197,7 @@ const detailJudgeGroups=computed(()=>{
{key:'difficulty',label:'难度分(得分)',summaryLabel:'得分'},
{key:'performance',label:prescribed?'创意编排分':'表现分(系数)',summaryLabel:'得分'},
{key:'required',label:prescribed?'完成质量分':'规定(系数)',summaryLabel:'得分'},
- {key:'deduction',label:prescribed?'扣分':'扣分明细',summaryLabel:factor?'得分系数 M':'合计'},
+ {key:'deduction',label:prescribed?'扣分':'扣分明细',summaryLabel:factor?'扣分 M':'合计'},
];
const result=groups.filter(group=>(group.key!=='difficulty'||!prescribed)&&(group.key!=='required'||!wire)).map(group=>({...group,judges:sheets.filter(sheet=>judgeGroupKey(sheet)===group.key)}));
const others=sheets.filter(sheet=>judgeGroupKey(sheet)==='other');