Merge commit 'e93fe7095ef717bd0ddebeb18f28038a374d83f6'

This commit is contained in:
harukin-DeskMini 2023-02-01 17:16:10 +09:00
commit 2c50e5af67

View File

@ -91,7 +91,7 @@ export default function LED_vision(props) {
}
let returnData = {};
Object.keys(trainDiagram).forEach((key) => {
if (trainDiagram[key].match(props.station.Station_JP)) {
if (trainDiagram[key].match(props.station.Station_JP + ",")) {
returnData[key] = trainDiagram[key];
}
});
@ -124,7 +124,6 @@ export default function LED_vision(props) {
const returnData = Object.keys(stationDiagram).map((d) => {
let a = {};
stationDiagram[d].split("#").forEach((data) => {
console.log(data);
if (data.match("着")) {
a.lastStation = data.split(",着,")[0];
}
@ -139,6 +138,7 @@ export default function LED_vision(props) {
});
return { train: d, time: a.time, lastStation: a.lastStation };
});
console.log(returnData);
return returnData.sort((a, b) => {
switch (true) {
case parseInt(a.time.split(":")[0]) < parseInt(b.time.split(":")[0]):