Spythere/stacjownik
1
0
Fork 0
mirror of https://github.com/Spythere/stacjownik.git synced 2026-05-03 13:28:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Optymalizacja kodu i assetów; poprawki w działaniu

Browse Source
This commit is contained in:
Spythere
2022-05-27 17:30:55 +02:00
parent a5a62435d5
commit 0bb1091747
18 changed files with 176 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/JournalView/JournalDispatchers.vue
+7 -8
View File
@@ -17,7 +17,7 @@
<transition name="warning" mode="out-in">
<div :key="historyDataStatus.status">
<div class="journal_warning loading" v-if="isDataLoading || isDataInit">
{{ $t('app.loading') }}
{{ $t('app.loading') }}
</div>
<div v-else-if="isDataError" class="journal_warning error">
@@ -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();
},
src/components/JournalView/JournalTimetables.vue
+2 -2
View File
@@ -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();
},
src/components/SceneryView/SceneryInfo/SceneryInfoIcons.vue
+40 -17
View File
@@ -1,43 +1,55 @@
<template>
<section class="info-icons">
<img
v-if="station.generalInfo?.controlType"
:src="require(`@/assets/icon-${station.generalInfo.controlType}.svg`)"
:alt="station.generalInfo.controlType"
<section class="info-icons" v-if="station.generalInfo">
<span
class="scenery-icon icon-info"
:class="station.generalInfo.controlType.replace('+', '-')"
:title="$t('desc.control-type') + $t(`controls.${station.generalInfo.controlType}`)"
/>
v-html="getControlTypeAbbrev(station.generalInfo.controlType)"
>
</span>
<img
v-if="station.generalInfo?.SUP"
class="icon-info"
v-if="station.generalInfo.SUP"
:src="require(`@/assets/icon-SUP.svg`)"
alt="SUP (RASP-UZK)"
:title="$t('desc.SUP')"
/>
<img
v-if="station.generalInfo?.signalType"
class="icon-info"
v-if="station.generalInfo.signalType"
:src="require(`@/assets/icon-${station.generalInfo.signalType}.svg`)"
:alt="station.generalInfo.signalType"
:title="$t('desc.signals-type') + $t(`signals.${station.generalInfo.signalType}`)"
/>
<img v-if="station.generalInfo?.default" :src="icons.td2" alt="default scenery" :title="$t('desc.default')" />
<img
v-if="station.generalInfo.default"
class="icon-info"
:src="icons.td2"
alt="default scenery"
:title="$t('desc.default')"
/>
<img
v-if="station.generalInfo?.nonPublic"
class="icon-info"
v-if="station.generalInfo.nonPublic"
:src="icons.lock"
alt="non public scenery"
:title="$t('desc.non-public')"
/>
<img
v-if="station.generalInfo?.unavailable"
class="icon-info"
v-if="station.generalInfo.unavailable"
:src="icons.unavailable"
alt="icon unavailable"
:title="$t('desc.unavailable')"
/>
<img
class="icon-info"
v-if="station.generalInfo && station.generalInfo.lines != ''"
:src="icons.real"
alt="real scenery"
@@ -50,10 +62,12 @@
<script lang="ts">
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({
</script>
<style lang="scss" scoped>
@import "../../../styles/icons.scss";
.info-icons {
img {
width: 3.5em;
margin: 1em 0.5em;
display: flex;
justify-content: center;
}
.icon-info {
display: flex;
justify-content: center;
align-items: center;
border: 2px solid #4e4e4e;
border-radius: 0.5em;
}
width: 3em;
font-size: 1.2em;
margin: 1em 0.5em;
border: 2px solid #4e4e4e;
border-radius: 0.5em;
}
</style>
src/components/StationsView/StationTable.vue
+59 -49
View File
@@ -53,7 +53,7 @@
unavailable: station.generalInfo?.unavailable,
}"
>
<b v-if="station.generalInfo?.project" style="color: salmon;">{{ station.generalInfo.project }}</b>
<b v-if="station.generalInfo?.project" style="color: salmon">{{ station.generalInfo.project }}</b>
{{ station.name }}
</td>
@@ -62,8 +62,8 @@
<span
v-if="
station.generalInfo.reqLevel > -1 &&
!station.generalInfo.nonPublic &&
!station.generalInfo.unavailable
!station.generalInfo.nonPublic &&
!station.generalInfo.unavailable
"
:style="calculateExpStyle(station.generalInfo.reqLevel)"
>
@@ -83,9 +83,7 @@
</span>
</span>
<span v-else>
?
</span>
<span v-else> ? </span>
</td>
<td class="station_status">
@@ -115,9 +113,7 @@
<span
v-if="station.generalInfo && station.generalInfo.routes.twoWayCatenaryRouteNames.length > 0"
class="track catenary"
:title="
`Liczba zelektryfikowanych szlaków dwutorowych: ${station.generalInfo.routes.twoWayCatenaryRouteNames.length}`
"
:title="`Liczba zelektryfikowanych szlaków dwutorowych: ${station.generalInfo.routes.twoWayCatenaryRouteNames.length}`"
>
{{ station.generalInfo.routes.twoWayCatenaryRouteNames.length }}
</span>
@@ -125,9 +121,7 @@
<span
v-if="station.generalInfo && station.generalInfo.routes.twoWayNoCatenaryRouteNames.length > 0"
class="track no-catenary"
:title="
`Liczba niezelektryfikowanych szlaków dwutorowych: ${station.generalInfo.routes.twoWayNoCatenaryRouteNames.length}`
"
:title="`Liczba niezelektryfikowanych szlaków dwutorowych: ${station.generalInfo.routes.twoWayNoCatenaryRouteNames.length}`"
>
{{ station.generalInfo.routes.twoWayNoCatenaryRouteNames.length }}
</span>
@@ -137,9 +131,7 @@
<span
v-if="station.generalInfo && station.generalInfo.routes.oneWayCatenaryRouteNames.length > 0"
class="track catenary"
:title="
`Liczba zelektryfikowanych szlaków jednotorowych: ${station.generalInfo.routes.oneWayCatenaryRouteNames.length}`
"
:title="`Liczba zelektryfikowanych szlaków jednotorowych: ${station.generalInfo.routes.oneWayCatenaryRouteNames.length}`"
>
{{ station.generalInfo.routes.oneWayCatenaryRouteNames.length }}
</span>
@@ -147,47 +139,54 @@
<span
v-if="station.generalInfo && station.generalInfo.routes.oneWayNoCatenaryRouteNames.length > 0"
class="track no-catenary"
:title="
`Liczba niezelektryfikowanych szlaków jednotorowych: ${station.generalInfo.routes.oneWayNoCatenaryRouteNames.length}`
"
:title="`Liczba niezelektryfikowanych szlaków jednotorowych: ${station.generalInfo.routes.oneWayNoCatenaryRouteNames.length}`"
>
{{ station.generalInfo.routes.oneWayNoCatenaryRouteNames.length }}
</span>
</td>
<td class="station_info">
<img
<span v-if="station.generalInfo">
<span
class="scenery-icon icon-info"
:class="station.generalInfo.controlType.replace('+', '-')"
:title="$t('desc.control-type') + $t(`controls.${station.generalInfo.controlType}`)"
v-html="getControlTypeAbbrev(station.generalInfo.controlType)"
>
</span>
<!-- <img
class="icon-info"
v-if="station.generalInfo?.controlType"
:src="require(`@/assets/icon-${station.generalInfo.controlType}.svg`)"
:alt="station.generalInfo.controlType"
:title="$t('desc.control-type') + $t(`controls.${station.generalInfo.controlType}`)"
/>
/> -->
<img
class="icon-info"
v-if="station.generalInfo.SUP"
:src="require(`@/assets/icon-SUP.svg`)"
alt="SUP (RASP-UZK)"
:title="$t('desc.SUP')"
/>
<img
class="icon-info"
v-if="station.generalInfo?.SUP"
:src="require(`@/assets/icon-SUP.svg`)"
alt="SUP (RASP-UZK)"
:title="$t('desc.SUP')"
/>
<img
class="icon-info"
v-if="station.generalInfo.signalType"
:src="require(`@/assets/icon-${station.generalInfo.signalType}.svg`)"
:alt="station.generalInfo.signalType"
:title="$t('desc.signals-type') + $t(`signals.${station.generalInfo.signalType}`)"
/>
<img
class="icon-info"
v-if="station.generalInfo?.signalType"
:src="require(`@/assets/icon-${station.generalInfo.signalType}.svg`)"
:alt="station.generalInfo.signalType"
:title="$t('desc.signals-type') + $t(`signals.${station.generalInfo.signalType}`)"
/>
<img
class="icon-info"
v-if="station.generalInfo && station.generalInfo.routes.sblRouteNames.length > 0"
:src="SBLIcon"
alt="SBL"
:title="$t('desc.SBL') + `${station.generalInfo.routes.sblRouteNames.join(',')}`"
/>
</span>
<img
v-if="station.generalInfo && station.generalInfo.routes.sblRouteNames.length > 0"
:src="SBLIcon"
alt="SBL"
:title="$t('desc.SBL') + `${station.generalInfo.routes.sblRouteNames.join(',')}`"
/>
<img v-if="!station.generalInfo" :src="unknownIcon" alt="icon-unknown" :title="$t('desc.unknown')" />
<img v-else class="icon-info" :src="unknownIcon" alt="icon-unknown" :title="$t('desc.unknown')" />
</td>
<td class="station_users" :class="{ inactive: !station.onlineInfo }">
@@ -230,6 +229,8 @@
<script lang="ts">
import styleMixin from '@/mixins/styleMixin';
import dateMixin from '@/mixins/dateMixin';
import stationInfoMixin from '@/mixins/stationInfoMixin';
import { DataStatus } from '@/scripts/enums/DataStatus';
import { computed, ComputedRef, defineComponent } from '@vue/runtime-core';
@@ -237,7 +238,6 @@ import { useStore } from '@/store';
import { GETTERS } from '@/constants/storeConstants';
import Station from '@/scripts/interfaces/Station';
import { StoreData } from '@/scripts/interfaces/StoreData';
import dateMixin from '@/mixins/dateMixin';
export default defineComponent({
props: {
@@ -255,7 +255,7 @@ export default defineComponent({
changeSorter: { type: Function, required: true },
},
mixins: [styleMixin, dateMixin],
mixins: [styleMixin, dateMixin, stationInfoMixin],
data: () => ({
likeIcon: require('@/assets/icon-like.svg'),
@@ -270,7 +270,6 @@ export default defineComponent({
unknownIcon: require('@/assets/icon-unknown.svg'),
abandonedIcon: require('@/assets/icon-abandoned.svg'),
ascIcon: require('@/assets/icon-arrow-asc.svg'),
descIcon: require('@/assets/icon-arrow-desc.svg'),
@@ -322,6 +321,7 @@ export default defineComponent({
<style lang="scss" scoped>
@import '../../styles/responsive.scss';
@import '../../styles/variables.scss';
@import '../../styles/icons.scss';
$rowCol: #4b4b4b;
@@ -461,12 +461,22 @@ td.station {
}
}
&_info,
&_tracks {
img {
width: 2.2em;
&_info {
display: flex;
justify-content: center;
.icon-info {
font-size: 0.8rem;
width: 2rem;
height: 2rem;
line-height: 2rem;
margin: 0 0.2em;
vertical-align: middle;
outline: 2px solid #444;
border-radius: 0.5em;
}
}