From 2aa0a1a6e2f6399a51cad5b73a3611092697a59a Mon Sep 17 00:00:00 2001 From: Vitalii Lysak Date: Tue, 30 Aug 2022 08:14:18 +0300 Subject: upd memoru, dynamic --- .../_sila/Memory/Dynamic/MemoryDynamicPage.vue | 22 ++++++++++++++++++++-- src/views/_sila/Memory/Dynamic/MemoryTemp.vue | 21 ++++++++++++++++----- 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue index 10496829..16c8202f 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.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 MemoryTemp from './MemoryTemp'; @@ -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('memory', (loading) => this.onLoading(loading)); + }, + onLoading(loading) { + loading ? this.startLoader() : this.endLoader(); + }, }, }; diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue index 07798d6d..3fbf9da1 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue @@ -1,5 +1,5 @@