|
@@ -34,12 +34,10 @@
|
|
|
:class="{ 'complete2': needStart && [42].includes(examState) }"
|
|
|
v-if="faceCheckStu.student_id && time.ready <= 0 && examState != 43 && examState != 41"
|
|
|
>
|
|
|
- <div class="scoreBox" v-if="['basketballv1', 'footballv1'].includes(parameter.project)">
|
|
|
- <div class="score">{{ currentResultObj.count || 0 }}</div>
|
|
|
- </div>
|
|
|
- <div class="scoreBox" v-else>
|
|
|
- <div class="score">{{ currentResultObj.count || 0 }}</div>
|
|
|
- <div class="unit" v-if="currentResultObj.count && !needStart">{{ unit }}</div>
|
|
|
+ <div class="scoreBox">
|
|
|
+ <div class="score" v-if="currentResultObj?.count && currentResultObj.count>=0">{{ currentResultObj.count }}</div>
|
|
|
+ <div class="prompt" v-else>请开始测试</div>
|
|
|
+ <div class="unit" v-if="!['basketballv1', 'footballv1'].includes(parameter.project) && currentResultObj.count && !needStart">{{ unit }}</div>
|
|
|
</div>
|
|
|
<div class="fractionViolation">
|
|
|
<div class="fraction">
|
|
@@ -622,7 +620,7 @@ const getAchievement = (data: any) => {
|
|
|
} else {
|
|
|
count = result;
|
|
|
}
|
|
|
- data.count = count || '0';
|
|
|
+ data.count = count || 0;
|
|
|
data.score = data.score || '0';
|
|
|
currentResultObj.value = data;
|
|
|
//违规处理
|
|
@@ -1205,6 +1203,11 @@ $waiPadding: 6.51rem;
|
|
|
font-family: 'Saira-BlackItalic';
|
|
|
}
|
|
|
|
|
|
+ .prompt {
|
|
|
+ font-size: 3.5rem;
|
|
|
+ line-height: 3.5rem;
|
|
|
+ }
|
|
|
+
|
|
|
.unit {
|
|
|
font-size: 2rem;
|
|
|
margin-left: 10px;
|