add loader

airalab · Dec 24, 2024 · bda2195 · bda2195
1 parent 46edc3e
commit bda2195
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/src/components/Map.vue b/src/components/Map.vue
@@ -5,6 +5,7 @@
     :canHistory="historyready"
     @history="historyhandler"
     :measuretype="measuretype"
+    :isLoad="isLoad"
   >
 
   <button
@@ -36,7 +37,7 @@ import { getTypeProvider } from "../utils/utils";
 
 export default {
   emits: ["city", "clickMarker", "close"],
-  props: ["measuretype", "historyready", "historyhandler"],
+  props: ["measuretype", "historyready", "historyhandler", "isLoad"],
   components: { Footer },
   data() {
     return {

diff --git a/src/components/footer/Footer.vue b/src/components/footer/Footer.vue
@@ -9,14 +9,10 @@
       </div>
       <button class="popovercontrol" :class="bookmarks && bookmarks.length > 0 ? 'active' : null" popovertarget="bookmarks"><font-awesome-icon icon="fa-solid fa-bookmark" /></button>
 
-      <input
-        type="date"
-        v-model="start"
-        :max="maxDate"
-        :disabled="currentProvider == 'realtime'"
-      />
+      <input type="date" v-model="start" :max="maxDate" :disabled="currentProvider == 'realtime'" />
 
       <Measures :current="measuretype.toLowerCase()" />
+      <div v-if="isLoad">{{ $t("isLoad") }}</div>
     </div>
 
     <div class="flexline">
@@ -58,7 +54,7 @@ import Bookmarks from "../../components/Bookmarks.vue";
 
 export default {
   emits: ["history"],
-  props: ["currentProvider", "canHistory", "measuretype"],
+  props: ["currentProvider", "canHistory", "measuretype", "isLoad"],
   components: { HistoryImport, Measures, Bookmarks },
 
   data() {

diff --git a/src/components/sensor/SensorPopup.vue b/src/components/sensor/SensorPopup.vue
@@ -42,7 +42,7 @@
       </section>
 
       <section>
-        <div v-if="isLoad">Load...</div>
+        <div v-if="isLoad">{{ $t("isLoad") }}</div>
         <Chart v-else :point="point" :log="log" />
       </section>
 

diff --git a/src/translate.js b/src/translate.js
@@ -212,6 +212,7 @@ export default {
     },
     showlocation: "Show my location",
     locationloading: "Trying to get your location",
+    isLoad: "Load...",
   },
   ru: {
     header: {
@@ -434,5 +435,6 @@ export default {
     },
     showlocation: "Показать моё местоположение",
     locationloading: "Пытаемся получить вашу геопозицию",
+    isLoad: "Загрузка ...",
   },
 };
diff --git a/src/views/Main.vue b/src/views/Main.vue
@@ -24,6 +24,7 @@
     :measuretype="type"
     :historyready="canHistory"
     :historyhandler="handlerHistory"
+    :isLoad="isLoad"
     @clickMarker="handlerClick"
   />
 
@@ -90,6 +91,7 @@ export default {
       },
       start: null,
       end: null,
+      isLoad: false,
     };
   },
   computed: {
@@ -119,6 +121,7 @@ export default {
   },
   methods: {
     async handlerHistory({ start, end }) {
+      this.isLoad = true;
       this.start = start;
       this.end = end;
       this.status = "history";
@@ -144,6 +147,7 @@ export default {
       for (const message in messages) {
         this.handlerNewPoint(messages[message]);
       }
+      this.isLoad = false;
     },
     async handlerNewPoint(point) {
       if (!point.model || !markers.isReadyLayers()) {