diff options
-rw-r--r-- | src/assets/styles/bmc/_sila/_forms.scss | 4 | ||||
-rw-r--r-- | src/assets/styles/bmc/_sila/_section-divider.scss | 3 | ||||
-rw-r--r-- | src/components/_sila/AppNavigation/AppNavigation.vue | 2 | ||||
-rw-r--r-- | src/locales/en-US.json | 18 | ||||
-rw-r--r-- | src/locales/ru-RU.json | 21 | ||||
-rw-r--r-- | src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue | 48 |
6 files changed, 68 insertions, 28 deletions
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 { 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/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; } } 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 44e5e18b..54f8e284 100644 --- a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue +++ b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue @@ -1,29 +1,33 @@ <template> <b-container fluid="xl"> <page-title :description="$t('appPageTitle.dynamicInformation')" /> - <collapse id="collapse_1" title="Температра" style="margin-top: -2rem"> + <collapse + id="collapse_1" + :title="$t('pageProcessors.temperature')" + style="margin-top: -2rem" + > <template #image> <img src="@/assets/images/_sila/collapsed/temperature.svg" /> </template> <page-section> <b-row class="align-items-end pt-2"> - <b-col sm="12" md="6" lg="3"> - <b-form-group label="Не штатный режим"> + <b-col xs="12" md="6" lg="3" class="pt-2"> + <b-form-group :label="$t('pageProcessors.labels.notNormal')"> <b-form-input> </b-form-input> </b-form-group> </b-col> - <b-col sm="12" md="6" lg="3"> - <b-form-group label="Критический режим"> + <b-col xs="12" md="6" lg="3" class="pt-2"> + <b-form-group :label="$t('pageProcessors.labels.critical')"> <b-form-input> </b-form-input> </b-form-group> </b-col> - <b-col sm="12" md="6" lg="3"> - <b-form-group label="Значение предупреждения"> - <b-form-input> </b-form-input> + <b-col xs="12" md="6" lg="3" class="pt-2"> + <b-form-group :label="$t('pageProcessors.labels.warning')"> + <b-form-input style=""> </b-form-input> </b-form-group> </b-col> - <b-col sm="12" md="6" lg="3"> - <b-button variant="primary"> + <b-col xs="12" md="6" lg="3" class="pt-2"> + <b-button variant="primary" style="height: 35px"> {{ 'Сохранить' }} </b-button> </b-col> @@ -52,18 +56,18 @@ {{ value }} </template> <template #cell(minDate)="{ value }"> - <span class="regular-12px"> + <span style="color: rgb(12, 28, 41)"> {{ value.time }} </span> - <span class="regular-12px tretiatry"> + <span> {{ value.date }} </span> </template> <template #cell(maxDate)="{ value }"> - <span class="regular-12px"> + <span style="color: rgb(12, 28, 41)"> {{ value.time }} </span> - <span class="regular-12px tretiatry"> + <span> {{ value.date }} </span> </template> @@ -96,31 +100,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: [ @@ -193,7 +197,7 @@ export default { }, colors() { return this.$randomColor({ - count: this.allSensors?.length, + count: this.items?.length, hue: 'random', luminosity: 'random', }); |