upd dynamic logic

4 files changed, 39 insertions, 166 deletions

diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js
index f3a6b6b9..d4c2f23d 100644
--- a/src/components/AppNavigation/AppNavigationMixin.js
+++ b/src/components/AppNavigation/AppNavigationMixin.js
@@ -111,8 +111,8 @@ export const AppNavigationMixin = {
               route: '/power-dynamic-info',
             },
           ],
-        },
-        {
+        },*/
+        /*{
           id: 'memory',
           label: this.$t('appNavigation.memoryModules'),
           icon: 'iconChevronUp',
diff --git a/src/store/modules/HardwareStatus/SensorsStore.js b/src/store/modules/HardwareStatus/SensorsStore.js
index 59872718..1e57158b 100644
--- a/src/store/modules/HardwareStatus/SensorsStore.js
+++ b/src/store/modules/HardwareStatus/SensorsStore.js
@@ -95,63 +95,47 @@ const SensorsStore = {
         })
       );
     },
-    async getOnlyTempSensors({ commit }, id) {
-      const sensors = await api
-        .get(`${id}/Sensors`)
-        .then((response) => response.data.Members)
-        .catch((error) => console.log(error));
-      const tempSensors = sensors.filter((sensor) => {
-        return sensor['@odata.id'].toLowerCase().includes('temp');
-      });
-      if (!tempSensors) return;
-      const promises = tempSensors.map((sensor) => {
-        return api.get(sensor['@odata.id']).catch((error) => {
-          console.log(error);
-          return error;
-        });
-      });
-      return await api.all(promises).then(
-        api.spread((...responses) => {
-          const sensorData = responses.map(({ data }) => {
-            return {
-              name: data.Name,
-              status: data.Status.Health,
-              currentValue: data.Reading,
-              units: data.ReadingUnits,
-            };
+    async getOnlyFanSensors({ commit }, id) {
+      return await api
+        .get(`${id}/Thermal`)
+        .then(({ data: { Fans = [] } }) => {
+          const sensorData = [];
+          Fans.forEach((sensor) => {
+            sensorData.push({
+              name: sensor.Name,
+              status: sensor.Status.Health,
+              currentValue: sensor.Reading,
+              lowerCaution: sensor.LowerThresholdNonCritical,
+              upperCaution: sensor.UpperThresholdNonCritical,
+              lowerCritical: sensor.LowerThresholdCritical,
+              upperCritical: sensor.UpperThresholdCritical,
+              units: sensor.ReadingUnits,
+            });
           });
-          commit('setTempSensors', sensorData);
+          commit('setFanSensors', sensorData);
         })
-      );
-    },
-    async getOnlyFanSensors({ commit }, id) {
-      const sensors = await api
-        .get(`${id}/Sensors`)
-        .then((response) => response.data.Members)
         .catch((error) => console.log(error));
-      const fanSensors = sensors.filter((sensor) => {
-        return sensor['@odata.id'].toLowerCase().includes('fan');
-      });
-      if (!fanSensors) return;
-      const promises = fanSensors.map((sensor) => {
-        return api.get(sensor['@odata.id']).catch((error) => {
-          console.log(error);
-          return error;
-        });
-      });
-      return await api.all(promises).then(
-        api.spread((...responses) => {
-          const sensorData = responses.map(({ data }) => {
-            return {
-              name: data.Name,
-              status: data.Status.Health,
-              currentValue: data.Reading,
-              units: data.ReadingUnits,
-            };
+    },
+    async getOnlyTempSensors({ commit }, id) {
+      return await api
+        .get(`${id}/Thermal`)
+        .then(({ data: { Temperatures = [] } }) => {
+          const sensorData = [];
+          Temperatures.forEach((sensor) => {
+            sensorData.push({
+              name: sensor.Name,
+              status: sensor.Status.Health,
+              currentValue: sensor.ReadingCelsius,
+              lowerCaution: sensor.LowerThresholdNonCritical,
+              upperCaution: sensor.UpperThresholdNonCritical,
+              lowerCritical: sensor.LowerThresholdCritical,
+              upperCritical: sensor.UpperThresholdCritical,
+              units: '℃',
+            });
           });
-          commit('setFanSensors', sensorData);
+          commit('setTempSensors', sensorData);
         })
-      );
+        .catch((error) => console.log(error));
     },
     async getThermalSensors({ commit }, id) {
       return await api
diff --git a/src/views/Fans/DynamicInformation/IndicatorsTable.vue b/src/views/Fans/DynamicInformation/IndicatorsTable.vue
index 22789bc3..933b47a3 100644
--- a/src/views/Fans/DynamicInformation/IndicatorsTable.vue
+++ b/src/views/Fans/DynamicInformation/IndicatorsTable.vue
@@ -104,62 +104,6 @@ export default {
           tdClass: 'bootstrap-fans-table__td light-12px',
         },
       ],
-      items: [
-        {
-          name: 'Вентилятор 1',
-          currentSpeed: 1900,
-          middleSpeed: 1200,
-          minSpeed: 950,
-          minSpeedDate: { time: '15:15', date: '11.11.2021' },
-          maxSpeed: 2100,
-          maxSpeedDate: { time: '10:26', date: '15.11.2021' },
-        },
-        {
-          name: 'Вентилятор 2',
-          currentSpeed: 1850,
-          middleSpeed: 1450,
-          minSpeed: 850,
-          minSpeedDate: { time: '15:45', date: '11.11.2021' },
-          maxSpeed: 2150,
-          maxSpeedDate: { time: '16:59', date: '16.11.2021' },
-        },
-        {
-          name: 'Вентилятор 3',
-          currentSpeed: 1870,
-          middleSpeed: 1450,
-          minSpeed: 1000,
-          minSpeedDate: { time: '15:23', date: '11.11.2021' },
-          maxSpeed: 2050,
-          maxSpeedDate: { time: '15:26', date: '15.11.2021' },
-        },
-        {
-          name: 'Вентилятор 4',
-          currentSpeed: 1790,
-          middleSpeed: 780,
-          minSpeed: 950,
-          minSpeedDate: { time: '16:45', date: '25.11.2021' },
-          maxSpeed: 1800,
-          maxSpeedDate: { time: '11:26', date: '16.11.2021' },
-        },
-        {
-          name: 'Вентилятор 5',
-          currentSpeed: 1950,
-          middleSpeed: 1260,
-          minSpeed: 880,
-          minSpeedDate: { time: '15:23', date: '11.11.2021' },
-          maxSpeed: 1950,
-          maxSpeedDate: { time: '15:26', date: '17.11.2021' },
-        },
-        {
-          name: 'Вентилятор 6',
-          currentSpeed: 1900,
-          middleSpeed: 1300,
-          minSpeed: 960,
-          minSpeedDate: { time: '16:45', date: '25.11.2021' },
-          maxSpeed: 2000,
-          maxSpeedDate: { time: '15:26', date: '15.11.2021' },
-        },
-      ],
     };
   },
 
diff --git a/src/views/Motherboard/DynamicInfo/helpers.js b/src/views/Motherboard/DynamicInfo/helpers.js
index 157c5ffe..3d36a1b3 100644
--- a/src/views/Motherboard/DynamicInfo/helpers.js
+++ b/src/views/Motherboard/DynamicInfo/helpers.js
@@ -467,61 +467,6 @@ export const AccessoryData = {
         tdClass: 'bootstrap-fans-table__td light-12px',
       },
     ],
-    items: [
-      {
-        name: 'Материнская плата 1',
-        currentTemperature: 19,
-        middleTemperature: 40,
-        minTemperature: 31,
-        minDate: { time: '15:15', date: '11.11.2021' },
-        maxTemperature: 88,
-        maxDate: { time: '10:26', date: '15.11.2021' },
-      },
-      {
-        name: 'Материнская плата 2',
-        currentTemperature: 29,
-        middleTemperature: 40,
-        minTemperature: 20,
-        minDate: { time: '15:45', date: '11.11.2021' },
-        maxTemperature: 76,
-        maxDate: { time: '16:59', date: '16.11.2021' },
-      },
-      {
-        name: 'Материнская плата 3',
-        currentTemperature: 48,
-        middleTemperature: 46,
-        minTemperature: 31,
-        minDate: { time: '15:23', date: '11.11.2021' },
-        maxTemperature: 69,
-        maxDate: { time: '15:26', date: '15.11.2021' },
-      },
-      {
-        name: 'Материнская плата 4',
-        currentTemperature: 48,
-        middleTemperature: 45,
-        minTemperature: 5,
-        minDate: { time: '16:45', date: '25.11.2021' },
-        maxTemperature: 75,
-        maxDate: { time: '11:26', date: '16.11.2021' },
-      },
-      {
-        name: 'Материнская плата 5',
-        currentTemperature: 39,
-        middleTemperature: 44,
-        minTemperature: 30,
-        minDate: { time: '15:23', date: '11.11.2021' },
-        maxTemperature: 80,
-        maxDate: { time: '15:26', date: '17.11.2021' },
-      },
-      {
-        name: 'Материнская плата 6',
-        currentTemperature: 39,
-        middleTemperature: 44,
-        minTemperature: 5,
-        minDate: { time: '16:45', date: '25.11.2021' },
-        maxTemperature: 80,
-        maxDate: { time: '15:26', date: '15.11.2021' },
-      },
-    ],
+    items: [],
   },
 };