|
@@ -36,7 +36,7 @@
|
|
>
|
|
>
|
|
<div class="scoreBox">
|
|
<div class="scoreBox">
|
|
<div class="score" v-if="currentResultObj?.count && currentResultObj.count>=0">{{ currentResultObj.count }}</div>
|
|
<div class="score" v-if="currentResultObj?.count && currentResultObj.count>=0">{{ currentResultObj.count }}</div>
|
|
- <div class="prompt" v-else>请开始测试</div>
|
|
|
|
|
|
+ <div class="prompt" v-if="currentResultObj?.count && currentResultObj.count==0 && examState == 42">请开始测试</div>
|
|
<div class="unit" v-if="!['basketballv1', 'footballv1'].includes(parameter.project) && currentResultObj.count && !needStart">
|
|
<div class="unit" v-if="!['basketballv1', 'footballv1'].includes(parameter.project) && currentResultObj.count && !needStart">
|
|
{{ unit }}
|
|
{{ unit }}
|
|
</div>
|
|
</div>
|
|
@@ -116,8 +116,9 @@
|
|
</div>
|
|
</div>
|
|
<FaceWindow ref="faceWindowRef" :faceCheckStu="faceCheckStu" :gesture="parameter.gesture" />
|
|
<FaceWindow ref="faceWindowRef" :faceCheckStu="faceCheckStu" :gesture="parameter.gesture" />
|
|
<ChooseStudent ref="chooseStudentRef" @returnData="returnStudent" />
|
|
<ChooseStudent ref="chooseStudentRef" @returnData="returnStudent" />
|
|
|
|
+ <JumpRopeGame ref="gameContainer" v-if="!readyState || [42].includes(examState)" />
|
|
|
|
+ <div class="close" @click="confirmExit"></div>
|
|
</div>
|
|
</div>
|
|
- <div class="close" @click="confirmExit"></div>
|
|
|
|
</template>
|
|
</template>
|
|
|
|
|
|
<script setup name="TrainTest" lang="ts">
|
|
<script setup name="TrainTest" lang="ts">
|
|
@@ -147,6 +148,7 @@ const route = useRoute();
|
|
const faceWindowRef = ref();
|
|
const faceWindowRef = ref();
|
|
const chooseStudentRef = ref();
|
|
const chooseStudentRef = ref();
|
|
const reportListRef = ref();
|
|
const reportListRef = ref();
|
|
|
|
+const gameContainer = ref();
|
|
const myInfo: any = localStorage.getItem('userInfo');
|
|
const myInfo: any = localStorage.getItem('userInfo');
|
|
const dic: any = dataDictionary;
|
|
const dic: any = dataDictionary;
|
|
const data = reactive<any>({
|
|
const data = reactive<any>({
|
|
@@ -1007,6 +1009,20 @@ watch(
|
|
{ immediate: true }
|
|
{ immediate: true }
|
|
);
|
|
);
|
|
|
|
|
|
|
|
+/**
|
|
|
|
+ * 播报时间
|
|
|
|
+ */
|
|
|
|
+watch(
|
|
|
|
+ () => currentResultObj.value.count,
|
|
|
|
+ (newData) => {
|
|
|
|
+ if (newData > 0) {
|
|
|
|
+ let frameRate = (newData / time.value.countdownNum) * 10;
|
|
|
|
+ gameContainer.value.sports(frameRate);
|
|
|
|
+ }
|
|
|
|
+ },
|
|
|
|
+ { immediate: true }
|
|
|
|
+);
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* 时间转换
|
|
* 时间转换
|
|
*/
|
|
*/
|
|
@@ -1507,11 +1523,11 @@ $waiPadding: 6.51rem;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
.close {
|
|
.close {
|
|
- position: absolute;
|
|
|
|
- // right: calc($waiPadding - 3.2rem);
|
|
|
|
- left: auto;
|
|
|
|
- right: calc($topPadding / 2 - 3.2rem / 4);
|
|
|
|
- top: auto;
|
|
|
|
- bottom: calc($topPadding / 2 - 3.2rem / 4);
|
|
|
|
- }
|
|
|
|
|
|
+ position: absolute;
|
|
|
|
+ // right: calc($waiPadding - 3.2rem);
|
|
|
|
+ left: auto;
|
|
|
|
+ right: calc($topPadding / 2 - 3.2rem / 4);
|
|
|
|
+ top: auto;
|
|
|
|
+ bottom: calc($topPadding / 2 - 3.2rem / 4);
|
|
|
|
+}
|
|
</style>
|
|
</style>
|