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