diff --git a/src/pages/sparring/result.vue b/src/pages/sparring/result.vue index 5d1afe48..7227ae33 100644 --- a/src/pages/sparring/result.vue +++ b/src/pages/sparring/result.vue @@ -50,10 +50,21 @@ - 维度评价总览 + 维度评价总览 + + 得分 + / + 总分 + + - {{item.gradeDimensName}}: {{ item.traGrade }}/{{ item.totalGrade }} + {{item.gradeDimensName}}: + + {{ item.traGrade }} + / + {{ item.totalGrade }} + {{item.settDesc}} @@ -104,11 +115,15 @@ import { partnerChatReport } from "@/api/sparring.js" - import badge from '@/components/points-and-badge/badge'; + import badge from '@/components/points-and-badge/badge'; import points from '@/components/points-and-badge/points'; import usePointsAndBadge from '@/components/points-and-badge/usePointsAndBadge'; - - const { pointAndBadgesRun, badgeRef, pointsRef } = usePointsAndBadge(); + + const { + pointAndBadgesRun, + badgeRef, + pointsRef + } = usePointsAndBadge(); const traId = ref('') const execId = ref('') const talkingType = ref('') @@ -134,7 +149,7 @@ const showTalkList = computed(() => { return allTalkList.value.slice(0, 2) }) - const maxHeight = computed(()=>{ + const maxHeight = computed(() => { return allTalkList.value.length * 800 + 'rpx' }) const hideTalkList = computed(() => { @@ -200,21 +215,21 @@ partnerChatReport({ traId: traId.value, execId: execId.value, - talkingType: isPreview.value? 'preview' : 'practice' + talkingType: isPreview.value ? 'preview' : 'practice' // traId: 'PARTNERINFO02501812207220251103160409000007402', // execId: 'db2f275b-c04a-4572-83dd-74a95ff49d67' }).then(res => { - if (res.body.reportFlag){ + if (res.body.reportFlag) { traInfo.value = res.body.traPartnerInfo || {} roleInfo.value = res.body.traPartnerCharacterInfoVo || {} - traTm.value = res.body.traTmFmtHMS || '0' + traTm.value = res.body.traTmFmtHMS || '0' isPass.value = res.body.traPartnerExecuteHisVo?.traResult === 'P' totalScore.value = res.body.traPartnerExecuteHisVo?.traGrade || '0' positiveList.value = res.body.positiveList || [] negativeList.value = res.body.negativeList || [] hitBanWords.value = res.body.traPartnerExecuteHisVo?.hitBanWords || '' let _evalDimens = res.body.traPartnerSettlement || [] - evalDimens.value = _evalDimens.map((t,index) => { + evalDimens.value = _evalDimens.map((t, index) => { return { ...t, anlyGrade: t.traGrade, @@ -252,16 +267,16 @@ isLoading.value = false setTimeout(() => { showLoading.value = false - if(isPass.value && isOver.value && !isPreview.value){ - pointAndBadgesRun(talkingType.value === '01' ? '07': '08', '', ()=>{}) + if (isPass.value && isOver.value && !isPreview.value) { + pointAndBadgesRun(talkingType.value === '01' ? '07' : '08', '', () => {}) } }, 800) } else { - if(canLoad.value){ + if (canLoad.value) { setTimeout(getData, 2000) } - } - }).catch(()=>{ + } + }).catch(() => { isLoading.value = false }) } @@ -278,16 +293,16 @@ const isPreview = ref(false) const isOver = ref(false) const goBack = () => { - if(isOver.value){ + if (isOver.value) { console.log(3) common.navigateBack(3) - }else{ + } else { common.navigateBack() } } - const canLoad= ref(false) + const canLoad = ref(false) onLoad((params) => { - canLoad.value= true + canLoad.value = true traId.value = params.traId; execId.value = params.execId talkingType.value = params.type; @@ -296,8 +311,8 @@ isOver.value = params.isOver === '1' getData() }); - onUnload(()=>{ - canLoad.value= false + onUnload(() => { + canLoad.value = false }) onMounted(() => {}) onBackPress((res) => res.from === 'backbutton'); @@ -366,7 +381,8 @@ top: var(--status-bar-height); left: 0; z-index: 2; - .top-desc{ + + .top-desc { position: absolute; bottom: 0; font-size: 18rpx; @@ -374,6 +390,7 @@ left: 50%; transform: translateX(-50%); } + .top-title { height: 90rpx; // background-color: red; @@ -476,6 +493,7 @@ padding-top: 10rpx; position: relative; min-height: 100rpx; + .user-info { overflow: hidden; height: 92rpx; @@ -514,8 +532,8 @@ } } } - - .loading-box{ + + .loading-box { min-height: 180rpx; width: 100%; background: url(@/static/images/examination/getting_in.gif) no-repeat; @@ -523,7 +541,7 @@ background-size: auto 160rpx; margin-top: 100rpx; } - + .collepse-tab { position: absolute; width: 300rpx; @@ -603,7 +621,7 @@ line-height: 40rpx; position: relative; - padding: 0rpx 46rpx 0rpx 26rpx; + padding: 0rpx 6rpx 0rpx 26rpx; line-height: 42rpx; font-size: 29rpx; margin-bottom: 16rpx;