From 06097a99840b26715e4f663dde0182597e97c670 Mon Sep 17 00:00:00 2001 From: Vitalii Lysak Date: Mon, 29 Aug 2022 18:28:31 +0300 Subject: upd motherboard, dynamic --- .../Motherboard/Dynamic/MotherboardDynamicPage.vue | 22 ++++++++++++++++++++-- .../_sila/Motherboard/Dynamic/MotherboardTemp.vue | 21 ++++++++++++++++----- 2 files changed, 36 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue index c5562f2b..0f92b5cd 100644 --- a/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue +++ b/src/views/_sila/Motherboard/Dynamic/MotherboardDynamicPage.vue @@ -1,7 +1,11 @@ @@ -11,7 +15,9 @@ import PageTitle from '@/components/_sila/Global/PageTitle'; import TableDatePicker from '@/components/_sila/Global/TableDatePicker'; import DataFormatterMixin from '@/components/_sila/Mixins/DataFormatterMixin'; -import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin'; +import LoadingBarMixin, { + loading, +} from '@/components/_sila/Mixins/LoadingBarMixin'; import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin'; import MotherboardTemp from './MotherboardTemp'; @@ -21,10 +27,15 @@ export default { mixins: [DataFormatterMixin, LoadingBarMixin, TableFilterMixin], data() { return { + loading, timeScale: 'hour', }; }, + created() { + this.startProgress(); + }, + methods: { resetZoom() { const resetButton = document.querySelector('.highcharts-reset-zoom'); @@ -38,6 +49,13 @@ export default { this.timeScale = period; this.resetZoom(); }, + startProgress() { + this.startLoader(); + this.$root.$on('motherboard', (loading) => this.onLoading(loading)); + }, + onLoading(loading) { + loading ? this.startLoader() : this.endLoader(); + }, }, }; diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue index 6994082d..0a6d2c3e 100644 --- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue +++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue @@ -1,5 +1,5 @@