This commit is contained in:
2021-09-15 22:40:31 +02:00
parent 0065f1503c
commit ee4ddb3caf
5 changed files with 29 additions and 31 deletions
+1 -1
View File
@@ -242,7 +242,7 @@ export default defineComponent({
navigateToTrain(trainNo: number) {
this.$router.push({
name: "TrainsView",
params: { queryTrain: trainNo.toString() },
params: { train: trainNo.toString() },
});
},
},
+17 -23
View File
@@ -29,10 +29,7 @@
></select-box>
</div>
<span
class="timetable-item loading"
v-if="dataStatus == 0"
>{{
<span class="timetable-item loading" v-if="dataStatus == 0">{{
$t("app.loading")
}}</span>
@@ -51,12 +48,14 @@
>
<span class="timetable-general">
<span class="general-info">
<router-link :to="{
<router-link
:to="{
name: 'TrainsView',
params: {
queryTrain: scheduledTrain.trainNo.toString(),
train: scheduledTrain.trainNo.toString(),
},
}">
}"
>
<span>
<strong>{{ scheduledTrain.category }}</strong>
{{ scheduledTrain.trainNo }}
@@ -69,17 +68,21 @@
'https://td2.info.pl/profile/?u=' + scheduledTrain.driverId
"
target="_blank"
>{{ scheduledTrain.driverName }}</a>
>{{ scheduledTrain.driverName }}</a
>
</span>
<div class="info-route">
<strong>{{ scheduledTrain.beginsAt }} -
{{ scheduledTrain.terminatesAt }}</strong>
<strong
>{{ scheduledTrain.beginsAt }} -
{{ scheduledTrain.terminatesAt }}</strong
>
</div>
</span>
<span class="general-status">
<span :class="scheduledTrain.stopStatus">{{ $t(`timetables.${scheduledTrain.stopStatus}`) }}
<span :class="scheduledTrain.stopStatus"
>{{ $t(`timetables.${scheduledTrain.stopStatus}`) }}
</span>
</span>
</span>
@@ -92,10 +95,7 @@
v-html="$t('timetables.begins')"
>
</span>
<span
class="arrival-time"
v-else
>
<span class="arrival-time" v-else>
{{ scheduledTrain.stopInfo.arrivalTimeString }} ({{
scheduledTrain.stopInfo.arrivalDelay
}})
@@ -103,10 +103,7 @@
</span>
<span class="schedule-stop">
<span
class="stop-time"
v-if="scheduledTrain.stopInfo.stopTime"
>
<span class="stop-time" v-if="scheduledTrain.stopInfo.stopTime">
{{ scheduledTrain.stopInfo.stopTime }}
{{ scheduledTrain.stopInfo.stopType }}
</span>
@@ -119,10 +116,7 @@
v-html="$t('timetables.terminates')"
>
</span>
<span
class="departure-time"
v-else
>
<span class="departure-time" v-else>
{{ scheduledTrain.stopInfo.departureTimeString }} ({{
scheduledTrain.stopInfo.departureDelay
}})
+6 -3
View File
@@ -112,12 +112,14 @@ export default defineComponent({
const speedStats = computed(() => {
if (props.trains.length == 0) return { avg: "0", min: "0", max: "0" };
const trainList = props.trains.filter((train) => train.timetableData);
const avg = (
props.trains.reduce((acc, train) => acc + train.speed, 0) /
props.trains.length
trainList.reduce((acc, train) => acc + train.speed, 0) /
trainList.length
).toFixed(2);
const minMaxSpeed = props.trains.reduce((acc, train) => {
const minMaxSpeed = trainList.reduce((acc, train) => {
if (!train.timetableData) return acc;
acc[0] = !acc[0] || train.speed < acc[0] ? train.speed : acc[0];
@@ -206,6 +208,7 @@ export default defineComponent({
const twrList = props.trains.filter(
(train) => train.timetableData && train.timetableData.TWR
);
const skrList = props.trains.filter(
(train) => train.timetableData && train.timetableData.SKR
);
+1 -1
View File
@@ -257,7 +257,7 @@ export default defineComponent({
this.$router.push({
name: "TrainsView",
params: { queryTrain: trainNo.toString() },
params: { train: trainNo.toString() },
});
},
+4 -3
View File
@@ -5,14 +5,14 @@
<TrainStats :trains="trainList" :trainStatsOpen="trainStatsOpen" />
<TrainOptions
:queryTrain="queryTrain"
:queryTrain="train"
@changeSorter="changeSorter"
@changeSearchedTrain="changeSearchedTrain"
@changeSearchedDriver="changeSearchedDriver"
/>
</div>
<TrainTable :computedTrains="computedTrains" :queryTrain="queryTrain" />
<TrainTable :computedTrains="computedTrains" :queryTrain="train" />
</div>
</section>
</template>
@@ -91,11 +91,12 @@ export default defineComponent({
TrainOptions,
},
props: ["queryTrain"],
props: ["train"],
data: () => ({
statsIcon: require("@/assets/icon-stats.svg"),
trainStatsOpen: false,
queryTrain: "",
}),
setup() {