diff --git a/src/pages/competition/matching.vue b/src/pages/competition/matching.vue index a4f29369..d367d5af 100644 --- a/src/pages/competition/matching.vue +++ b/src/pages/competition/matching.vue @@ -287,7 +287,7 @@ popupRef.value.open('bottom'); } else if (type === 3) { // 去排行榜 - common.navigateTo(`/pages/competition/ranking?papersId=${data_info.papersId}&orgId=${data_info.orgId}`); + common.navigateTo(`/pages/competition/ranking?comId=${data_info.comId}&orgId=${data_info.orgId}`); } }; // 统一重置状态的函数 diff --git a/src/pages/competition/pk.vue b/src/pages/competition/pk.vue index 6de63b1a..d7807f7e 100644 --- a/src/pages/competition/pk.vue +++ b/src/pages/competition/pk.vue @@ -261,7 +261,7 @@ common.setPageCache('competition_pk_to_resulf', pkData); nextTick(() => { common.redirectTo( - `/pages/competition/result?mode=${mode}&execId=${pkData.execId}&orgId=${pkData.orgId}&papersId=${pkData.papersId}` + `/pages/competition/result?mode=${mode}&execId=${pkData.execId}&orgId=${pkData.orgId}&papersId=${pkData.papersId}&comId=${pkData.comId}` ); }); } else { diff --git a/src/pages/competition/ranking.vue b/src/pages/competition/ranking.vue index 64199eb0..c439531f 100644 --- a/src/pages/competition/ranking.vue +++ b/src/pages/competition/ranking.vue @@ -91,18 +91,18 @@ import { ref } from 'vue'; import { formatName } from '@/common/common'; import { defaultAnonymousAvatar, defaultAvatar } from '@/enum'; - const papersId = ref(''); + const comId = ref(''); const orgId = ref(''); const userList = ref([]); const userRankObj = ref({}); onLoad((e) => { - papersId.value = e.papersId; + comId.value = e.comId; orgId.value = e.orgId; getList(); }); const getList = () => { queryTraCompetitionRankingList({ - papersId: papersId.value, + comId: comId.value, orgId: orgId.value }).then((res) => { userList.value = res.body.rankingListVos || []; diff --git a/src/pages/competition/result.vue b/src/pages/competition/result.vue index 21f2d3c7..d6077194 100644 --- a/src/pages/competition/result.vue +++ b/src/pages/competition/result.vue @@ -125,6 +125,7 @@ // 公共的 execId: '', papersId: '', + comId: '', orgId: '', answerResult: '', // 答题结果 Y代表我赢,N代表我输 timeDifference: 30, // 时差 int 单位 s @@ -154,7 +155,7 @@ } else if (type === 'continue') { common.navigateBack(); } else if (type === 'toRanking' && mode.value === 'pk_in') { - common.navigateTo(`/pages/competition/ranking?papersId=${pkData.papersId}&orgId=${pkData.orgId}`); + common.navigateTo(`/pages/competition/ranking?comId=${pkData.comId}&orgId=${pkData.orgId}`); } }; @@ -162,6 +163,7 @@ pkData.execId = e.execId || ''; pkData.papersId = e.papersId || ''; pkData.orgId = e.orgId || ''; + pkData.comId = e.comId || ''; mode.value = e.mode || 'pk_result'; autoSub.value = e.autoSub || '00'; const pkDataInit = common.getPageCache('competition_pk_to_resulf'); @@ -175,6 +177,7 @@ userNamePk: pkDataInit.pkUserName ?? '', imgPk: pkDataInit.pkImgAddr ?? '' }); + console.log('pkData.comId', pkData.comId); }); onMounted(() => { action.value = 'loading';