2 files changed, 38 insertions, 10 deletions
diff --git a/src/store/modules/HardwareStatus/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js
index fc3e4309..358ca725 100644
--- a/src/store/modules/HardwareStatus/MemoryStore.js
+++ b/src/store/modules/HardwareStatus/MemoryStore.js
@@ -5,9 +5,11 @@ const MemoryStore = {
   namespaced: true,
   state: {
     dimms: [],
+    dimmsLastHour: [],
   },
   getters: {
     dimms: (state) => state.dimms,
+    dimmsLastHour: (state) => state.dimmsLastHour,
   },
   mutations: {
     setMemoryInfo: (state, data) => {
@@ -56,6 +58,10 @@ const MemoryStore = {
     setMemoryDynamic: (state, data) => {
       state.dimms = data;
     },
+
+    setMemoryDynamicLastHour: (state, data) => {
+      state.dimmsLastHour = data;
+    },
   },
   actions: {
     async getMemoryDynamic({ commit }, { lastHour }) {
@@ -69,9 +75,13 @@ const MemoryStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setMemoryDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setMemoryDynamicLastHour', MetricValues);
+          } else {
+            commit('setMemoryDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
     async getDimms({ commit }) {
diff --git a/src/store/modules/HardwareStatus/ProcessorStore.js b/src/store/modules/HardwareStatus/ProcessorStore.js
index ddf9db4a..5466b85e 100644
--- a/src/store/modules/HardwareStatus/ProcessorStore.js
+++ b/src/store/modules/HardwareStatus/ProcessorStore.js
@@ -6,10 +6,14 @@ const ProcessorStore = {
   state: {
     cpuTemp: [],
     cpuPower: [],
+    cpuTempLastHour: [],
+    cpuPowerLastHour: [],
   },
   getters: {
     cpuTemp: (state) => state.cpuTemp,
     cpuPower: (state) => state.cpuPower,
+    cpuTempLastHour: (state) => state.cpuTempLastHour,
+    cpuPowerLastHour: (state) => state.cpuPowerLastHour,
   },
   mutations: {
     setProcessorsInfo: (state, data) => {
@@ -62,12 +66,18 @@ const ProcessorStore = {
       });
     },
 
-    setProcessorsDynamic: (state, data) => {
+    setCpuTempDynamic: (state, data) => {
       state.cpuTemp = data;
     },
     setCpuPowerDynamic: (state, data) => {
       state.cpuPower = data;
     },
+    setCpuTempDynamicLastHour: (state, data) => {
+      state.cpuTempLastHour = data;
+    },
+    setCpuPowerDynamicLastHour: (state, data) => {
+      state.cpuPowerLastHour = data;
+    },
   },
   actions: {
     async getCpuPowerDynamic({ commit }, { lastHour }) {
@@ -80,9 +90,13 @@ const ProcessorStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setCpuPowerDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setCpuPowerDynamicLastHour', MetricValues);
+          } else {
+            commit('setCpuPowerDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
     async getCpuTempDynamic({ commit }, { lastHour }) {
@@ -96,9 +110,13 @@ const ProcessorStore = {
       }
       return await api
         .get(url)
-        .then(({ data: { MetricValues = [] } }) =>
-          commit('setProcessorsDynamic', MetricValues)
-        )
+        .then(({ data: { MetricValues = [] } }) => {
+          if (lastHour) {
+            commit('setCpuTempDynamicLastHour', MetricValues);
+          } else {
+            commit('setCpuTempDynamic', MetricValues);
+          }
+        })
         .catch((error) => console.log(error));
     },
     async getProcessorsInfo({ commit }) {