diff --git a/hwe/ts/PageBattleCenter.vue b/hwe/ts/PageBattleCenter.vue index 8e462e67..527636be 100644 --- a/hwe/ts/PageBattleCenter.vue +++ b/hwe/ts/PageBattleCenter.vue @@ -130,12 +130,12 @@ const targetGeneralLogs = ref(); const nationInfo = ref(); -watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) => { - if (targetGeneralID === undefined) { +watch([generalList, targetGeneralID], async ([generalList, generalID]) => { + if (!generalID) { targetGeneral.value = undefined; return; } - targetGeneral.value = generalList.get(targetGeneralID); + targetGeneral.value = generalList.get(generalID); const logs: GeneralLogs = { generalHistory: new Map(), @@ -148,8 +148,12 @@ watch([generalList, targetGeneralID], async ([generalList, targetGeneralID]) => for (const reqType of ["generalHistory", "battleResult", "battleDetail", "generalAction"] as const) { waiter.push( - SammoAPI.Nation.GetGeneralLog({ generalID: targetGeneralID, reqType }).then( + SammoAPI.Nation.GetGeneralLog({ generalID: generalID, reqType }).then( (res) => { + if(res.generalID !== targetGeneralID.value){ + return; + } + const rawLogs: [number, string][] = Object.entries(res.log).map(([key, value]) => [ Number(key), formatLog(value),