1 files changed, 12 insertions, 1 deletions
diff --git a/src/views/_sila/Power/Dynamic/CurrentOutput.vue b/src/views/_sila/Power/Dynamic/CurrentOutput.vue
index d796b3e7..a51c1fe6 100644
--- a/src/views/_sila/Power/Dynamic/CurrentOutput.vue
+++ b/src/views/_sila/Power/Dynamic/CurrentOutput.vue
@@ -108,6 +108,7 @@ export default {
       warning: Infinity,
       shutdown: Infinity,
       isBusy: true,
+      opened: false,
       fields: [
         {
           key: 'name',
@@ -162,6 +163,13 @@ export default {
     },
   },
   watch: {
+    timeScale() {
+      if (!this.opened) {
+        return;
+      }
+
+      this.loadData();
+    },
     items() {
       this.items.length ? (this.isBusy = false) : (this.isBusy = true);
     },
@@ -171,15 +179,18 @@ export default {
       if (state) {
         this.loadData();
       }
+      this.opened = state;
     },
     loadData() {
       let payload = { metricsName: 'psu_current', lastHour: false };
       if (this.timeScale === 'hour') {
         payload.lastHour = true;
       }
+
+      this.$root.$emit('psu-current-output', true);
       this.startLoader();
       this.$store.dispatch('powerSupply/getPsu', payload).finally(() => {
-        this.$root.$emit('psu-current');
+        this.$root.$emit('psu-current-output', false);
         this.isBusy = false;
         this.endLoader();
       });