From 7d4e34bc1e02747d6d61b0ce9ddfdc340684990b Mon Sep 17 00:00:00 2001 From: Anna Tsyganova Date: Fri, 22 Jul 2022 17:39:53 +0300 Subject: SILABMC-191: Fix padding in left menu --- src/components/_sila/AppNavigation/AppNavigation.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/components/_sila/AppNavigation/AppNavigation.vue b/src/components/_sila/AppNavigation/AppNavigation.vue index 99d1195d..fc927c6e 100644 --- a/src/components/_sila/AppNavigation/AppNavigation.vue +++ b/src/components/_sila/AppNavigation/AppNavigation.vue @@ -116,7 +116,7 @@ svg { & > a { border-bottom: 1px solid $gray-20; padding-top: 0.7rem; - padding-bottom: 0.7rem; + padding-left: 2.4rem; } } -- cgit v1.2.3 From 4b34f749a48350e527496c599cf31aca7eb90288 Mon Sep 17 00:00:00 2001 From: Anna Tsyganova Date: Fri, 22 Jul 2022 17:43:53 +0300 Subject: SILABMC-191: Fix lable of custom control --- src/assets/styles/bmc/_sila/_forms.scss | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src') diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss index b883c32e..82f7b710 100644 --- a/src/assets/styles/bmc/_sila/_forms.scss +++ b/src/assets/styles/bmc/_sila/_forms.scss @@ -111,6 +111,10 @@ border-radius: 3px; } +.custom-control-label > span { + vertical-align: sub; +} + .custom-checkbox .custom-control-input:checked ~ .custom-control-label::after, .custom-checkbox .custom-control-input:indeterminate ~ .custom-control-label::before, .custom-control-input:checked ~ .custom-control-label::before { -- cgit v1.2.3 From 7025d0b7049a291cfe490a10edaf8771797eda57 Mon Sep 17 00:00:00 2001 From: Maksim Zakharov Date: Fri, 22 Jul 2022 17:47:48 +0300 Subject: add localization for processors, fix page processors and collapse --- src/assets/styles/bmc/_sila/_section-divider.scss | 3 ++ src/locales/en-US.json | 18 +++++++- src/locales/ru-RU.json | 21 ++++++++-- .../Processors/Dynamic/ProcessorsDynamicPage.vue | 48 ++++++++++++---------- 4 files changed, 63 insertions(+), 27 deletions(-) (limited to 'src') diff --git a/src/assets/styles/bmc/_sila/_section-divider.scss b/src/assets/styles/bmc/_sila/_section-divider.scss index 3c5ce71f..23000e5c 100644 --- a/src/assets/styles/bmc/_sila/_section-divider.scss +++ b/src/assets/styles/bmc/_sila/_section-divider.scss @@ -16,5 +16,8 @@ } .form-group { margin-bottom: 0; + .col-form-label { + white-space: nowrap; + } } } diff --git a/src/locales/en-US.json b/src/locales/en-US.json index c8fa9ed9..5fdd803e 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -134,7 +134,6 @@ "processors": "@:appPageTitle.processors", "dynamicInformation": "@:appPageTitle.dynamicInformation", "memory": "@:appPageTitle.memory", - "fans": "@:appPageTitle.fans", "motherboard": "@:appPageTitle.motherboard" }, "appPageTitle": { @@ -833,6 +832,23 @@ "currentValue": "Current Speed, rpm" } }, + "pageProcessors": { + "temperature": "Temperature Display", + "labels": { + "notNormal": "Not regular", + "critical": "Critical", + "warning": "Warning" + }, + "table": { + "name": "Name", + "currentTemperature": "Current, С°", + "middleTemperature": "Middle, С°", + "minTemperature": "Min, С°", + "minDate": "Min Date", + "maxTemperature": "Max, С°", + "maxDate": "Max Date" + } + }, "pageSerialOverLan": { "alert": { "disconnectedAlertMessage" : "System must be powered on to connect" diff --git a/src/locales/ru-RU.json b/src/locales/ru-RU.json index 950a7ce3..0b91f4f9 100644 --- a/src/locales/ru-RU.json +++ b/src/locales/ru-RU.json @@ -107,10 +107,6 @@ "sessions": "@:appPageTitle.sessions", "settings": "Настройки", "operations": "Управление", - "processors": "Процессоры", - "memory": "Модули памяти", - "fans": "Ветиляторы", - "motherboard": "Материнская плата", "dateTime": "@:appPageTitle.dateTime", "dumps": "@:appPageTitle.dumps", "eventLogs": "@:appPageTitle.eventLogs", @@ -840,6 +836,23 @@ "currentValue": "Текущая скорость, об/мин" } }, + "pageProcessors": { + "temperature": "Показатели температуры", + "labels": { + "notNormal": "Не штатный режим", + "critical": "Критический режим", + "warning": "Значение предупреждения" + }, + "table": { + "name": "Имя модуля", + "currentTemperature": "Текущее, С°", + "middleTemperature": "Среднее, С°", + "minTemperature": "Минимальное, С°", + "minDate": "Дата минимального", + "maxTemperature": "Максимальное, С°", + "maxDate": "Дата максимального" + } + }, "pageSerialOverLan": { "alert": { "disconnectedAlertMessage" : "Система должна быть включена для соединения" diff --git a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue index 6f30576a..647af39e 100644 --- a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue +++ b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue @@ -1,29 +1,33 @@ @@ -94,31 +98,31 @@ export default { fields: [ { key: 'name', - label: 'Имя модуля', + label: this.$t('pageProcessors.table.name'), }, { key: 'currentTemperature', - label: 'Текущее, С°', + label: this.$t('pageProcessors.table.currentTemperature'), }, { key: 'middleTemperature', - label: 'Среднее, С°', + label: this.$t('pageProcessors.table.middleTemperature'), }, { key: 'minTemperature', - label: 'Минимальное, С°', + label: this.$t('pageProcessors.table.minTemperature'), }, { key: 'minDate', - label: 'Дата минимального', + label: this.$t('pageProcessors.table.minDate'), }, { key: 'maxTemperature', - label: 'Максимальное, С°', + label: this.$t('pageProcessors.table.maxTemperature'), }, { key: 'maxDate', - label: 'Дата максимального', + label: this.$t('pageProcessors.table.maxDate'), }, ], items: [ @@ -191,7 +195,7 @@ export default { }, colors() { return this.$randomColor({ - count: this.allSensors?.length, + count: this.items?.length, hue: 'random', luminosity: 'random', }); -- cgit v1.2.3