From a1609142e4f59a1e731ab6472792d3cfe6014f40 Mon Sep 17 00:00:00 2001 From: Vitalii Lysak Date: Mon, 4 Jul 2022 10:49:11 +0300 Subject: fixs for sensors --- src/locales/ru-RU.json | 12 ++++++------ src/views/Fans/StaticInformation/FansStaticPage.vue | 19 +++++++++++++++++-- 2 files changed, 23 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 75ff4c1b..6a9f7d50 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -41,9 +41,9 @@ }, "date": { "lastHour": "Последний час", - "lastDay": "Последние сутки", + "lastDay": "Последние сутки", "lastWeek": "Последняя неделя", - "lastMounth": "Последний месяц", + "lastMounth": "Последний месяц", "lastYear": "Последний год", "selectDate": "Выбрать период" }, @@ -179,7 +179,7 @@ "ethernetAdapters": "Ethetnet-адаптеры", "fcHbaAdapters": "FC-HBA-адаптеры", "pciDevices": "PCI-устройства", - + "resourceManagement": "Управление ресурсами", "securityAndAccess": "Безопасность и доступ", "sessions": "@:appPageTitle.sessions", @@ -210,7 +210,7 @@ "description": { "configuration": "Конфигурация" } - }, + }, "appPageTitle": { "changePassword": "Изменить пароль", @@ -593,7 +593,6 @@ "upload": "Начать загрузку", "urlAdress": "URL-адрес сервера", "connectionType": "Тип подключения" - }, "pageLdap": { "pageDescription": "Настройка параметров LDAP и управление группами", @@ -1140,7 +1139,8 @@ "outputPower": "Выходная мощность", "voltageWarning": "Пороговое значение предупреждения, B", "voltageShutdown": "Пороговое значениe отказа, B", - "amperage": "Сила тока" + "cpu": "Процессор", + "system": "Системная плата" }, "RAID": { "cache": "Cache RAID-контроллеров", diff --git a/src/views/Fans/StaticInformation/FansStaticPage.vue b/src/views/Fans/StaticInformation/FansStaticPage.vue index ba312384..56a5c183 100644 --- a/src/views/Fans/StaticInformation/FansStaticPage.vue +++ b/src/views/Fans/StaticInformation/FansStaticPage.vue @@ -30,7 +30,7 @@ @@ -115,7 +115,22 @@ export default { computed: { allSensors() { - return this.$store.getters['sensors/sensors']; + let sensors = this.$store.getters['sensors/sensors']; + if (this.isSensorsExist) { + sensors.forEach((sensor) => { + sensor.type = sensor.name.toLowerCase().includes('cpu') + ? this.$t('tablesDescription.cpu') + : this.$t('tablesDescription.system'); + }); + } + return sensors; + }, + + isSensorsExist() { + return ( + this.$store.getters['sensors/sensors'] && + this.$store.getters['sensors/sensors'].length > 0 + ); }, filteredSensors() { -- cgit v1.2.3