- {{ $t('app.loading') }}
+ {{ $t('app.loading') }}
@@ -145,7 +145,6 @@ export default defineComponent({
data: () => ({
icons: {
- loading: require('@/assets/icon-loading.svg'),
arrow: require('@/assets/icon-arrow-asc.svg'),
},
@@ -208,13 +207,12 @@ export default defineComponent({
mounted() {
const query = this.$route.query;
- console.log("Mounted");
-
+ console.log('Mounted');
if (query.sceneryName || query.dispatcherName) {
- this.searchersValues[1].value = query.sceneryName?.toString() || "";
- this.searchersValues[0].value = query.dispatcherName?.toString() || "";
-
+ this.searchersValues[1].value = query.sceneryName?.toString() || '';
+ this.searchersValues[0].value = query.dispatcherName?.toString() || '';
+
this.search();
return;
@@ -265,7 +263,8 @@ export default defineComponent({
if (
element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
this.scrollDataLoaded &&
- !this.scrollNoMoreData
+ !this.scrollNoMoreData &&
+ window.scrollY > window.innerHeight
)
this.addHistoryData();
},
diff --git a/src/components/JournalView/JournalTimetables.vue b/src/components/JournalView/JournalTimetables.vue
index 0ff9f49..c2a8ede 100644
--- a/src/components/JournalView/JournalTimetables.vue
+++ b/src/components/JournalView/JournalTimetables.vue
@@ -209,7 +209,6 @@ export default defineComponent({
data: () => ({
icons: {
- loading: require('@/assets/icon-loading.svg'),
arrow: require('@/assets/icon-arrow-asc.svg'),
},
@@ -297,7 +296,8 @@ export default defineComponent({
if (
element.getBoundingClientRect().bottom * 0.85 < window.innerHeight &&
this.scrollDataLoaded &&
- !this.scrollNoMoreData
+ !this.scrollNoMoreData &&
+ window.scrollY > window.innerHeight
)
this.addHistoryData();
},
diff --git a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
index ff8c30a..b67ba96 100644
--- a/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
+++ b/src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
@@ -1,43 +1,55 @@
-
-
+
+ v-html="getControlTypeAbbrev(station.generalInfo.controlType)"
+ >
+
-
+
import { defineComponent } from 'vue';
+import stationInfoMixin from '@/mixins/stationInfoMixin';
import Station from '@/scripts/interfaces/Station';
export default defineComponent({
+ mixins: [stationInfoMixin],
props: {
station: {
type: Object as () => Station,
@@ -75,13 +89,22 @@ export default defineComponent({
diff --git a/src/components/StationsView/StationTable.vue b/src/components/StationsView/StationTable.vue
index 78569c3..aacd6ea 100644
--- a/src/components/StationsView/StationTable.vue
+++ b/src/components/StationsView/StationTable.vue
@@ -53,7 +53,7 @@
unavailable: station.generalInfo?.unavailable,
}"
>
- {{ station.generalInfo.project }}
+ {{ station.generalInfo.project }}
{{ station.name }}
@@ -62,8 +62,8 @@
@@ -83,9 +83,7 @@
-
- ?
-
+ ?
@@ -115,9 +113,7 @@
{{ station.generalInfo.routes.twoWayCatenaryRouteNames.length }}
@@ -125,9 +121,7 @@
{{ station.generalInfo.routes.twoWayNoCatenaryRouteNames.length }}
@@ -137,9 +131,7 @@
{{ station.generalInfo.routes.oneWayCatenaryRouteNames.length }}
@@ -147,47 +139,54 @@
{{ station.generalInfo.routes.oneWayNoCatenaryRouteNames.length }}
|
-
+
+
+
+
-
+
-
+
+
-
-
-
+
|
@@ -230,6 +229,8 @@
|