From 40fb55c8cf5462a40a499ddcc69cb5313e559f84 Mon Sep 17 00:00:00 2001 From: harukin-DeskMini Date: Sun, 29 Jan 2023 22:08:56 +0900 Subject: [PATCH] =?UTF-8?q?=E3=81=84=E3=81=97=E3=81=A5=E3=81=A1=E3=81=A8?= =?UTF-8?q?=E5=8D=97=E9=A2=A8=E3=81=AEjson=E8=A7=A3=E6=9E=90=E3=81=AB?= =?UTF-8?q?=E4=B8=8D=E5=AE=8C=E5=85=A8=E3=81=8C=E3=81=82=E3=81=A3=E3=81=9F?= =?UTF-8?q?=E3=81=AE=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/発車時刻表/LED_vidion.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/components/発車時刻表/LED_vidion.js b/components/発車時刻表/LED_vidion.js index 4458f22..a2a876e 100644 --- a/components/発車時刻表/LED_vidion.js +++ b/components/発車時刻表/LED_vidion.js @@ -448,10 +448,18 @@ const DependTime = ({ d }) => { ); }; +const checkDuplicateTrainData = (currentTrainArray) => { + const notNyujoData = currentTrainArray.filter((d) => d.delay !== "入線"); + if (currentTrainArray.length == 1) return currentTrainArray[0]; + if (notNyujoData.length == 0) return currentTrainArray[0]; + else return notNyujoData[0]; +}; const StatusAndDelay = ({ currentTrain, d, props, trainDescriptionSwitch }) => { const [status, setStatus] = useState(""); useEffect(() => { - const current = currentTrain.filter((a) => a.num == d.train)[0]; + const array = currentTrain.filter((a) => a.num == d.train); + const current = checkDuplicateTrainData(array); + // 土讃線複数存在対策 if (!current) return () => {}; const delay = current.delay; switch (true) {