|
@@ -17,8 +17,10 @@
|
|
<strong>{{ details.score }}</strong><span>分</span>
|
|
<strong>{{ details.score }}</strong><span>分</span>
|
|
</div>
|
|
</div>
|
|
<div class="score">
|
|
<div class="score">
|
|
- <i>成绩</i><strong>{{ details.result }}</strong>
|
|
|
|
- <span>{{ details.unit }}</span>
|
|
|
|
|
|
+ <i>成绩</i>
|
|
|
|
+ <strong v-if="timeProjectList.includes(query.exam_name)">{{ proxy?.$utils.runTime(details.result, false, false) }}</strong>
|
|
|
|
+ <strong v-else>{{ details.result }}</strong>
|
|
|
|
+ <span v-if="!timeProjectList.includes(query.exam_name)">{{ details.unit }}</span>
|
|
</div>
|
|
</div>
|
|
<div class="ranking">
|
|
<div class="ranking">
|
|
<i>排名</i> <strong>{{ details.area_rank }}</strong><span>/{{ details.area_totals }}</span>
|
|
<i>排名</i> <strong>{{ details.area_rank }}</strong><span>/{{ details.area_totals }}</span>
|
|
@@ -29,7 +31,7 @@
|
|
<img v-if="query.exam_name == 'jump'" src="@/assets/images/analysis/jump.png" />
|
|
<img v-if="query.exam_name == 'jump'" src="@/assets/images/analysis/jump.png" />
|
|
<img v-if="['run800', 'runa800'].includes(query.exam_name)" src="@/assets/images/analysis/run800.png" />
|
|
<img v-if="['run800', 'runa800'].includes(query.exam_name)" src="@/assets/images/analysis/run800.png" />
|
|
<img
|
|
<img
|
|
- v-if="['run50', 'run60', 'run100', 'run200', 'run400', 'run1000', 'runa1000', 'run15x4', 'run50x8'].includes(query.exam_name)"
|
|
|
|
|
|
+ v-if="['run50', 'run60', 'run100', 'run200', 'run400', 'run1000', 'runa1000', 'run15x4', 'run50x8', 'run10x4'].includes(query.exam_name)"
|
|
src="@/assets/images/analysis/run1000.png" />
|
|
src="@/assets/images/analysis/run1000.png" />
|
|
<img v-if="query.exam_name == 'basketball' ||
|
|
<img v-if="query.exam_name == 'basketball' ||
|
|
query.exam_name == 'basketballv1'
|
|
query.exam_name == 'basketballv1'
|
|
@@ -104,16 +106,24 @@
|
|
<i class="branchA scoreType">成绩</i>
|
|
<i class="branchA scoreType">成绩</i>
|
|
<i class="branchB scoreType" :style="{
|
|
<i class="branchB scoreType" :style="{
|
|
left: (details.std.scores[0] / details.std.scores[3]) * 100 + '%',
|
|
left: (details.std.scores[0] / details.std.scores[3]) * 100 + '%',
|
|
- }">{{ details.std.values[0] }}</i>
|
|
|
|
|
|
+ }">
|
|
|
|
+ {{ timeProjectList.includes(query.exam_name)?proxy?.$utils.runTime(details.std.values[0], false, false):details.std.values[0] }}
|
|
|
|
+ </i>
|
|
<i class="branchC scoreType" :style="{
|
|
<i class="branchC scoreType" :style="{
|
|
left: (details.std.scores[1] / details.std.scores[3]) * 100 + '%',
|
|
left: (details.std.scores[1] / details.std.scores[3]) * 100 + '%',
|
|
- }">{{ details.std.values[1] }}</i>
|
|
|
|
|
|
+ }">
|
|
|
|
+ {{ timeProjectList.includes(query.exam_name)?proxy?.$utils.runTime(details.std.values[1], false, false):details.std.values[1] }}
|
|
|
|
+ </i>
|
|
<i class="branchD scoreType" :style="{
|
|
<i class="branchD scoreType" :style="{
|
|
left: (details.std.scores[2] / details.std.scores[3]) * 100 + '%',
|
|
left: (details.std.scores[2] / details.std.scores[3]) * 100 + '%',
|
|
- }">{{ details.std.values[2] }}</i>
|
|
|
|
|
|
+ }">
|
|
|
|
+ {{ timeProjectList.includes(query.exam_name)?proxy?.$utils.runTime(details.std.values[2], false, false):details.std.values[2] }}
|
|
|
|
+ </i>
|
|
<i class="branchE scoreType" :style="{
|
|
<i class="branchE scoreType" :style="{
|
|
left: (details.std.scores[3] / details.std.scores[3]) * 100 + '%',
|
|
left: (details.std.scores[3] / details.std.scores[3]) * 100 + '%',
|
|
- }">{{ details.std.values[3] }}</i>
|
|
|
|
|
|
+ }">
|
|
|
|
+ {{ timeProjectList.includes(query.exam_name)?proxy?.$utils.runTime(details.std.values[3], false, false):details.std.values[3] }}
|
|
|
|
+ </i>
|
|
</div>
|
|
</div>
|
|
<div v-if="JSON.stringify(details.std) != '{}' && details.std?.scores != undefined">
|
|
<div v-if="JSON.stringify(details.std) != '{}' && details.std?.scores != undefined">
|
|
<i class="branchA">分数</i>
|
|
<i class="branchA">分数</i>
|
|
@@ -146,7 +156,7 @@
|
|
'%',
|
|
'%',
|
|
}">
|
|
}">
|
|
<div class="chengji">
|
|
<div class="chengji">
|
|
- <span>{{ details.result }}</span>
|
|
|
|
|
|
+ <span>{{ timeProjectList.includes(query.exam_name)?proxy?.$utils.runTime(details.result, false, false):details.result }}</span>
|
|
</div>
|
|
</div>
|
|
<div class="fenshu">
|
|
<div class="fenshu">
|
|
<span>{{ details.score }}</span>
|
|
<span>{{ details.score }}</span>
|
|
@@ -168,7 +178,7 @@
|
|
" />
|
|
" />
|
|
<!--跑步-->
|
|
<!--跑步-->
|
|
<Run :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
|
|
<Run :detailsData="details" v-if="JSON.stringify(details) != '{}' &&
|
|
- ['run50', 'run60', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8'].includes(query.exam_name)
|
|
|
|
|
|
+ ['run50', 'run60', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4'].includes(query.exam_name)
|
|
" />
|
|
" />
|
|
<!--仰卧起坐-->
|
|
<!--仰卧起坐-->
|
|
<SitUp :detailsData="details" v-if="JSON.stringify(details) != '{}' && ['situp'].includes(query.exam_name)
|
|
<SitUp :detailsData="details" v-if="JSON.stringify(details) != '{}' && ['situp'].includes(query.exam_name)
|
|
@@ -237,6 +247,7 @@ const { proxy } = getCurrentInstance() as any;
|
|
const router = useRouter();
|
|
const router = useRouter();
|
|
const route = useRoute();
|
|
const route = useRoute();
|
|
const dic: any = dataDictionary;
|
|
const dic: any = dataDictionary;
|
|
|
|
+const timeProjectList = ['basketballv1','run50','run60','run70','run100','run200','run400','run800','run1000','runa800','runa1000','runwb800','runwb1000', 'run15x4', 'run50x8', 'run10x4'];
|
|
const data = reactive<any>({
|
|
const data = reactive<any>({
|
|
query: {},
|
|
query: {},
|
|
details: {},
|
|
details: {},
|
|
@@ -324,7 +335,7 @@ const getDetails = () => {
|
|
details.value.result :
|
|
details.value.result :
|
|
Number(details.value.result).toFixed(2);
|
|
Number(details.value.result).toFixed(2);
|
|
details.value.result = proxy?.runTime(myTime)
|
|
details.value.result = proxy?.runTime(myTime)
|
|
- } else if (['run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run15x4'].includes(query.value.exam_name)) {
|
|
|
|
|
|
+ } else if (['run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run15x4', 'run50x8', 'run10x4'].includes(query.value.exam_name)) {
|
|
details.value.result =
|
|
details.value.result =
|
|
String(details.value.result).indexOf(".") == -1 ?
|
|
String(details.value.result).indexOf(".") == -1 ?
|
|
details.value.result :
|
|
details.value.result :
|
|
@@ -339,7 +350,7 @@ const getDetails = () => {
|
|
}
|
|
}
|
|
|
|
|
|
if (
|
|
if (
|
|
- ['runa800', 'runa1000', 'run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4']
|
|
|
|
|
|
+ ['runa800', 'runa1000', 'run50', 'run60', 'run70', 'run100', 'run200', 'run400', 'run800', 'run1000', 'run15x4', 'run50x8', 'run10x4']
|
|
.includes(query.value.exam_name) &&
|
|
.includes(query.value.exam_name) &&
|
|
details.value.result == 0
|
|
details.value.result == 0
|
|
) {
|
|
) {
|