diff options
Diffstat (limited to 'src')
36 files changed, 2481 insertions, 2626 deletions
diff --git a/src/assets/styles/bmc/custom/_base.scss b/src/assets/styles/bmc/custom/_base.scss index 0e5554550..42e4a848f 100644 --- a/src/assets/styles/bmc/custom/_base.scss +++ b/src/assets/styles/bmc/custom/_base.scss @@ -2,9 +2,9 @@ body { overflow-y: hidden; } -.main-container { +.scroll-container { overflow-y: overlay; - height: calc(100vh - 167px); + height: calc(100vh - 95px); &::-webkit-scrollbar { margin-top: $header-height; position: absolute; diff --git a/src/assets/styles/bmc/custom/_buttons.scss b/src/assets/styles/bmc/custom/_buttons.scss index d9c929dbb..26a11dbdc 100644 --- a/src/assets/styles/bmc/custom/_buttons.scss +++ b/src/assets/styles/bmc/custom/_buttons.scss @@ -18,6 +18,11 @@ height: 36px; } +.btn-lg { + width: 270px; + height: 36px; +} + .btn-primary { background-color: $red-brand-primary; border-radius: 8px; diff --git a/src/assets/styles/bmc/custom/_index.scss b/src/assets/styles/bmc/custom/_index.scss index 43b4e1a38..40995ce95 100644 --- a/src/assets/styles/bmc/custom/_index.scss +++ b/src/assets/styles/bmc/custom/_index.scss @@ -16,4 +16,5 @@ @import "./sol"; @import "./tables"; @import "./toasts"; -@import "./popover";
\ No newline at end of file +@import "./popover"; +@import "./logs";
\ No newline at end of file diff --git a/src/assets/styles/bmc/custom/_logs.scss b/src/assets/styles/bmc/custom/_logs.scss new file mode 100644 index 000000000..ae0099e04 --- /dev/null +++ b/src/assets/styles/bmc/custom/_logs.scss @@ -0,0 +1,12 @@ +.logs-section .table.b-table > thead > tr > [aria-sort='ascending'] { + background-image: url('~@/assets/images/event-logs/sort-icon-rotate.svg'); +} + +.logs-section .table.b-table > thead > tr > [aria-sort='descending'], +.table.b-table > thead > tr > [aria-sort='none'] { + background-image: url('~@/assets/images/event-logs/sort-icon.svg'); +} + +.logs-section .b-table-sort-icon-left { + background-size: 15px !important; +} diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue index 939ec5af3..81287163b 100644 --- a/src/components/AppHeader/AppHeader.vue +++ b/src/components/AppHeader/AppHeader.vue @@ -112,7 +112,7 @@ <status-icon :status="serverStatusIcon" /> {{ $t('appHeader.power') }} </b-nav-item> - <div class="nav-item header-clock__icon"> + <div class="nav-item"> <b-button id="app-header-refresh" variant="link" diff --git a/src/components/Global/PageContainer.vue b/src/components/Global/PageContainer.vue index 71df8faed..40c17ac70 100644 --- a/src/components/Global/PageContainer.vue +++ b/src/components/Global/PageContainer.vue @@ -1,5 +1,5 @@ <template> - <main id="main-content" class="page-container"> + <main id="main-content" class="page-container scroll-container"> <slot /> </main> </template> @@ -19,7 +19,6 @@ export default { <style lang="scss" scoped> main { width: 100%; - height: 100%; &:focus-visible { box-shadow: inset 0 0 0 2px theme-color('primary'); diff --git a/src/views/BMC/Configuration/BMCConfiguration.vue b/src/views/BMC/Configuration/BMCConfiguration.vue index 8202f225f..b8b5174ab 100644 --- a/src/views/BMC/Configuration/BMCConfiguration.vue +++ b/src/views/BMC/Configuration/BMCConfiguration.vue @@ -5,42 +5,40 @@ > <page-title /> <!-- BMC table --> - <div class="main-container"> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_1 - variant="link" - class="collapse-button semi-bold-16px" - > - {{ $t('BMC.BmcTitle') }} - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_1" class="nav-item__nav"> - <span class="semi-bold-12px">{{ $t('BMC.BmcTable') }}</span> - <b-m-c-configuration-table /> - <span class="semi-bold-12px">{{ $t('BMC.Bios') }}</span> - <div> - <span class="regular-12px bmc-configuration__bios-version">{{ - $t('BMC.BiosV') - }}</span> - <span class="medium-12px">V 3.2.10.0</span> - </div> - </b-collapse> - </div> - <!-- Control --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_2 - variant="link" - class="collapse-button semi-bold-16px" - > - {{ $t('BMC.ControlTitle') }} - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_2" class="nav-item__nav"> - <b-m-c-configuration-control /> - </b-collapse> - </div> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_1 + variant="link" + class="collapse-button semi-bold-16px" + > + {{ $t('BMC.BmcTitle') }} + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_1" class="nav-item__nav"> + <span class="semi-bold-12px">{{ $t('BMC.BmcTable') }}</span> + <b-m-c-configuration-table /> + <span class="semi-bold-12px">{{ $t('BMC.Bios') }}</span> + <div> + <span class="regular-12px bmc-configuration__bios-version">{{ + $t('BMC.BiosV') + }}</span> + <span class="medium-12px">V 3.2.10.0</span> + </div> + </b-collapse> + </div> + <!-- Control --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_2 + variant="link" + class="collapse-button semi-bold-16px" + > + {{ $t('BMC.ControlTitle') }} + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_2" class="nav-item__nav"> + <b-m-c-configuration-control /> + </b-collapse> </div> </b-container> </template> diff --git a/src/views/BMC/Firmware/FirmwarePage.vue b/src/views/BMC/Firmware/FirmwarePage.vue index c9d2ab700..ff3d8af8f 100644 --- a/src/views/BMC/Firmware/FirmwarePage.vue +++ b/src/views/BMC/Firmware/FirmwarePage.vue @@ -5,42 +5,40 @@ > <page-title /> <!-- BMC table --> - <div class="main-container"> - <page-section class="bootstrap-table__section"> - <b-table - responsive="md" - sort-by="id" - class="bootstrap-fans-table bootstrap-fans-table__stripes" - sort-icon-left - no-sort-reset - :sort-desc="sortDesc" - :items="items" - :fields="fields" - > - <template #cell(name)="{ value }"> - <span class="regular-12px tretiatry"> - {{ value }} - </span> - </template> - <template #cell(minSpeedDate)="{ value }"> - <span class="regular-12px"> - {{ value.time }} - </span> - <span class="regular-12px tretiatry"> - {{ value.date }} - </span> - </template> - <template #cell(maxSpeedDate)="{ value }"> - <span class="regular-12px"> - {{ value.time }} - </span> - <span class="regular-12px tretiatry"> - {{ value.date }} - </span> - </template> - </b-table> - </page-section> - </div> + <page-section class="bootstrap-table__section"> + <b-table + responsive="md" + sort-by="id" + class="bootstrap-fans-table bootstrap-fans-table__stripes" + sort-icon-left + no-sort-reset + :sort-desc="sortDesc" + :items="items" + :fields="fields" + > + <template #cell(name)="{ value }"> + <span class="regular-12px tretiatry"> + {{ value }} + </span> + </template> + <template #cell(minSpeedDate)="{ value }"> + <span class="regular-12px"> + {{ value.time }} + </span> + <span class="regular-12px tretiatry"> + {{ value.date }} + </span> + </template> + <template #cell(maxSpeedDate)="{ value }"> + <span class="regular-12px"> + {{ value.time }} + </span> + <span class="regular-12px tretiatry"> + {{ value.date }} + </span> + </template> + </b-table> + </page-section> </b-container> </template> diff --git a/src/views/BMC/Settings/SettingsPage.vue b/src/views/BMC/Settings/SettingsPage.vue index a5b6cd762..65806564c 100644 --- a/src/views/BMC/Settings/SettingsPage.vue +++ b/src/views/BMC/Settings/SettingsPage.vue @@ -5,242 +5,232 @@ > <page-title /> <!-- BMC table --> - <div class="main-container"> - <div class="bmc-settings-section"> - <div class="smnp-settings-container"> - <span class="bold-12px__caps section-label">{{ - $t('BMC.smnp') - }}</span> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ $t('BMC.system') }}</label> - <b-form-input - v-model="system" - type="text" - class="form-control medium-16px" - > - </b-form-input> - <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> - </b-form-group> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ - $t('BMC.contacts') - }}</label> - <b-form-input - type="text" - class="form-control medium-16px" - placeholder="Введите значение" - > - </b-form-input> - </b-form-group> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ - $t('BMC.community') - }}</label> - <b-form-input - v-model="community" - type="text" - class="form-control medium-16px" - > - </b-form-input> - <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> - </b-form-group> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ - $t('global.status.status') - }}</label> - <b-form-select - v-model="smnpStatus" - :options="smnpStatuses" - class="select-connection medium-16px" - /> - </b-form-group> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ $t('BMC.smnpIp') }}</label> - <b-form-input - v-model="smnpIp" - type="text" - class="form-control medium-16px" - > - </b-form-input> - <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> - </b-form-group> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ - $t('BMC.smnpPort') - }}</label> - <b-form-input - v-model="smnpPort" - type="text" - class="form-control medium-16px" - > - </b-form-input> - <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> - </b-form-group> - <div class="accept-container"> - <b-button variant="primary" class="accept-button"> - {{ $t('global.action.acceptChanges') }} - </b-button> - </div> + <div class="bmc-settings-section"> + <div class="smnp-settings-container"> + <span class="bold-12px__caps section-label">{{ $t('BMC.smnp') }}</span> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ $t('BMC.system') }}</label> + <b-form-input + v-model="system" + type="text" + class="form-control medium-16px" + > + </b-form-input> + <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> + </b-form-group> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ $t('BMC.contacts') }}</label> + <b-form-input + type="text" + class="form-control medium-16px" + placeholder="Введите значение" + > + </b-form-input> + </b-form-group> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ + $t('BMC.community') + }}</label> + <b-form-input + v-model="community" + type="text" + class="form-control medium-16px" + > + </b-form-input> + <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> + </b-form-group> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ + $t('global.status.status') + }}</label> + <b-form-select + v-model="smnpStatus" + :options="smnpStatuses" + class="select-connection medium-16px" + /> + </b-form-group> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ $t('BMC.smnpIp') }}</label> + <b-form-input + v-model="smnpIp" + type="text" + class="form-control medium-16px" + > + </b-form-input> + <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> + </b-form-group> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ $t('BMC.smnpPort') }}</label> + <b-form-input + v-model="smnpPort" + type="text" + class="form-control medium-16px" + > + </b-form-input> + <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> + </b-form-group> + <div class="accept-container"> + <b-button variant="primary" class="accept-button"> + {{ $t('global.action.acceptChanges') }} + </b-button> </div> </div> - <div class="bmc-settings-section"> - <div class="smnp-settings-container"> - <span class="bold-12px__caps section-label">{{ - $t('BMC.smnpWarning') - }}</span> - <div class="table-section"> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - > - <template #cell(value)="{ index }"> - <b-row> - <b-col> - <span v-if="items[index].value"> - {{ $t('global.status.enabled') }} - </span> - <span v-else> - {{ $t('global.status.disabled') }} - </span> - </b-col> - <b-col> - <b-form-checkbox v-model="items[index].value" switch> - </b-form-checkbox> - </b-col> - </b-row> - </template> - </b-table> - </div> - <div class="accept-container"> - <b-button variant="secondary" class="test-message-button"> - {{ $t('BMC.testMessage') }} - </b-button> - <b-button variant="primary" class="accept-button"> - {{ $t('global.action.acceptChanges') }} - </b-button> - </div> + </div> + <div class="bmc-settings-section"> + <div class="smnp-settings-container"> + <span class="bold-12px__caps section-label">{{ + $t('BMC.smnpWarning') + }}</span> + <div class="table-section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + > + <template #cell(value)="{ index }"> + <b-row> + <b-col> + <span v-if="items[index].value"> + {{ $t('global.status.enabled') }} + </span> + <span v-else> + {{ $t('global.status.disabled') }} + </span> + </b-col> + <b-col> + <b-form-checkbox v-model="items[index].value" switch> + </b-form-checkbox> + </b-col> + </b-row> + </template> + </b-table> + </div> + <div class="accept-container"> + <b-button variant="secondary" class="test-message-button"> + {{ $t('BMC.testMessage') }} + </b-button> + <b-button variant="primary" class="accept-button"> + {{ $t('global.action.acceptChanges') }} + </b-button> </div> </div> + </div> - <div class="bmc-settings-section"> - <div class="smnp-settings-container"> - <span class="bold-12px__caps section-label">{{ - $t('BMC.smtpWarning') - }}</span> - <div class="table-section"> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items2" - :fields="fields2" - > - <template #cell(value)="data"> - <b-row v-if="data.index === 0"> - <b-col> - <span v-if="items2[data.index].value"> - {{ $t('global.status.enabled') }} - </span> - <span v-else> - {{ $t('global.status.disabled') }} - </span> - </b-col> - <b-col> - <b-form-checkbox v-model="items2[data.index].value" switch> - </b-form-checkbox> - </b-col> - </b-row> - <b-row v-else-if="data.index === 4"> - <b-col> - <span> - {{ data.value ? 'Да' : 'Нет' }} - </span> - </b-col> - <b-col> - <b-button - :id="`popover-choice-${data.index}`" - class="popover-option-ractive" - variant="toogle-popover" - > - <img :is="iconChevron" class="icon-chevron" /> - </b-button> - <two-chioce-popover - :id="data.index" - fitst-option="Да" - second-option="Нет" - :chosen-option="chosenOption" - :first-action="setYes" - :second-action="setNo" - placement="leftbottom" - /> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - <b-col> - <img - src="@/assets/images/icon-edit.svg" - class="icon-chevron icon-edit" - /> - </b-col> - </b-row> - </template> - </b-table> - </div> + <div class="bmc-settings-section"> + <div class="smnp-settings-container"> + <span class="bold-12px__caps section-label">{{ + $t('BMC.smtpWarning') + }}</span> + <div class="table-section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items2" + :fields="fields2" + > + <template #cell(value)="data"> + <b-row v-if="data.index === 0"> + <b-col> + <span v-if="items2[data.index].value"> + {{ $t('global.status.enabled') }} + </span> + <span v-else> + {{ $t('global.status.disabled') }} + </span> + </b-col> + <b-col> + <b-form-checkbox v-model="items2[data.index].value" switch> + </b-form-checkbox> + </b-col> + </b-row> + <b-row v-else-if="data.index === 4"> + <b-col> + <span> + {{ data.value ? 'Да' : 'Нет' }} + </span> + </b-col> + <b-col> + <b-button + :id="`popover-choice-${data.index}`" + class="popover-option-ractive" + variant="toogle-popover" + > + <img :is="iconChevron" class="icon-chevron" /> + </b-button> + <two-chioce-popover + :id="data.index" + fitst-option="Да" + second-option="Нет" + :chosen-option="chosenOption" + :first-action="setYes" + :second-action="setNo" + placement="leftbottom" + /> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + <b-col> + <img + src="@/assets/images/icon-edit.svg" + class="icon-chevron icon-edit" + /> + </b-col> + </b-row> + </template> + </b-table> </div> </div> + </div> - <div class="bmc-settings-section last"> - <div class="smnp-settings-container"> - <span class="bold-12px__caps section-label">{{ - $t('BMC.syslogSettings') - }}</span> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ - $t('global.status.status') - }}</label> - <b-form-select - v-model="syslogStatus" - :options="syslogStatuses" - class="select-connection medium-16px" - /> - </b-form-group> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ - $t('BMC.syslogIP') - }}</label> - <b-form-input - v-model="syslogIp" - type="text" - class="form-control medium-16px" - > - </b-form-input> - <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> - </b-form-group> - <b-form-group class="form-group"> - <label class="regular-12px tretiatry">{{ - $t('BMC.syslogPort') - }}</label> - <b-form-input - v-model="syslogPort" - type="text" - class="form-control medium-16px" - > - </b-form-input> - <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> - </b-form-group> - <div class="accept-container"> - <b-button variant="primary" class="accept-button"> - {{ $t('global.action.acceptChanges') }} - </b-button> - </div> + <div class="bmc-settings-section last"> + <div class="smnp-settings-container"> + <span class="bold-12px__caps section-label">{{ + $t('BMC.syslogSettings') + }}</span> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ + $t('global.status.status') + }}</label> + <b-form-select + v-model="syslogStatus" + :options="syslogStatuses" + class="select-connection medium-16px" + /> + </b-form-group> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ $t('BMC.syslogIP') }}</label> + <b-form-input + v-model="syslogIp" + type="text" + class="form-control medium-16px" + > + </b-form-input> + <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> + </b-form-group> + <b-form-group class="form-group"> + <label class="regular-12px tretiatry">{{ + $t('BMC.syslogPort') + }}</label> + <b-form-input + v-model="syslogPort" + type="text" + class="form-control medium-16px" + > + </b-form-input> + <img class="clear-icon" src="@/assets/images/popups/x-icon.svg" /> + </b-form-group> + <div class="accept-container"> + <b-button variant="primary" class="accept-button"> + {{ $t('global.action.acceptChanges') }} + </b-button> </div> </div> </div> diff --git a/src/views/Fans/DynamicInformation/FansDynamicPage.vue b/src/views/Fans/DynamicInformation/FansDynamicPage.vue index c56d2f837..fff7d3bf9 100644 --- a/src/views/Fans/DynamicInformation/FansDynamicPage.vue +++ b/src/views/Fans/DynamicInformation/FansDynamicPage.vue @@ -4,56 +4,47 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <div class="speed-description"> - <img src="@/assets/images/fans-page/fans-icon.svg" /> - <span class="bold-16px">{{ $t('fansPage.speedDescription') }}</span> + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <div class="speed-description"> + <img src="@/assets/images/fans-page/fans-icon.svg" /> + <span class="bold-16px">{{ $t('fansPage.speedDescription') }}</span> + </div> + <div class="limit-speed-container"> + <div class="speed-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ $t('fansPage.speedWarhihg') }}</span> + <b-form-input + v-model="fanSpeedWarninigInput" + type="number" + :min="0" + :max="fanSpeedShutdownInput" + class="form-control medium-12px" + > + </b-form-input> </div> - <div class="limit-speed-container"> - <div class="speed-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ $t('fansPage.speedWarhihg') }}</span> - <b-form-input - v-model="fanSpeedWarninigInput" - type="number" - :min="0" - :max="fanSpeedShutdownInput" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="speed-limt"> - <img src="@/assets/images/labels/shutdown.svg" /> - <span class="semi-bold-12px">{{ $t('fansPage.speedShutdown') }}</span> - <b-form-input - v-model="fanSpeedShutdownInput" - :min="fanSpeedWarninigInput" - :max="4000" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateFansSpeed" + <div class="speed-limt"> + <img src="@/assets/images/labels/shutdown.svg" /> + <span class="semi-bold-12px">{{ $t('fansPage.speedShutdown') }}</span> + <b-form-input + v-model="fanSpeedShutdownInput" + :min="fanSpeedWarninigInput" + :max="4000" + type="number" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - - <fans-dynamic-table - :speed-warninig="fanSpeedWarninig" - :speed-shutdown="fanSpeedShutdown" - :time-scale="timeScale" - /> - <indicators-table /> + <b-button class="save-button" variant="primary" @click="updateFansSpeed"> + {{ $t('global.action.save') }} + </b-button> </div> + + <fans-dynamic-table + :speed-warninig="fanSpeedWarninig" + :speed-shutdown="fanSpeedShutdown" + :time-scale="timeScale" + /> + <indicators-table /> </b-container> </template> diff --git a/src/views/HardwareStatus/Inventory/Inventory.vue b/src/views/HardwareStatus/Inventory/Inventory.vue index 1fbbe81fe..132002fe9 100644 --- a/src/views/HardwareStatus/Inventory/Inventory.vue +++ b/src/views/HardwareStatus/Inventory/Inventory.vue @@ -1,51 +1,49 @@ <template> <b-container fluid="xxl pt-0 m-2"> <page-title /> - <div class="main-container"> - <!-- Service indicators --> - <service-indicator /> + <!-- Service indicators --> + <service-indicator /> - <!-- Quicklinks section --> - <page-section :section-title="$t('pageInventory.quicklinkTitle')"> - <b-row class="w-75"> - <b-col v-for="column in quicklinkColumns" :key="column.id" xl="4"> - <div v-for="item in column" :key="item.id"> - <b-link - :href="item.href" - :data-ref="item.dataRef" - @click.prevent="scrollToOffset" - > - <jump-link /> {{ item.linkText }} - </b-link> - </div> - </b-col> - </b-row> - </page-section> + <!-- Quicklinks section --> + <page-section :section-title="$t('pageInventory.quicklinkTitle')"> + <b-row class="w-75"> + <b-col v-for="column in quicklinkColumns" :key="column.id" xl="4"> + <div v-for="item in column" :key="item.id"> + <b-link + :href="item.href" + :data-ref="item.dataRef" + @click.prevent="scrollToOffset" + > + <jump-link /> {{ item.linkText }} + </b-link> + </div> + </b-col> + </b-row> + </page-section> - <!-- System table --> - <table-system ref="system" /> + <!-- System table --> + <table-system ref="system" /> - <!-- BMC manager table --> - <table-bmc-manager ref="bmc" /> + <!-- BMC manager table --> + <table-bmc-manager ref="bmc" /> - <!-- Chassis table --> - <table-chassis ref="chassis" /> + <!-- Chassis table --> + <table-chassis ref="chassis" /> - <!-- DIMM slot table --> - <table-dimm-slot ref="dimms" /> + <!-- DIMM slot table --> + <table-dimm-slot ref="dimms" /> - <!-- Fans table --> - <table-fans ref="fans" /> + <!-- Fans table --> + <table-fans ref="fans" /> - <!-- Power supplies table --> - <table-power-supplies ref="powerSupply" /> + <!-- Power supplies table --> + <table-power-supplies ref="powerSupply" /> - <!-- Processors table --> - <table-processors ref="processors" /> + <!-- Processors table --> + <table-processors ref="processors" /> - <!-- Assembly table --> - <table-assembly ref="assembly" /> - </div> + <!-- Assembly table --> + <table-assembly ref="assembly" /> </b-container> </template> diff --git a/src/views/Logs/EventLogs/EventLogs.vue b/src/views/Logs/EventLogs/EventLogs.vue index 10aa9469c..eb1c703ac 100644 --- a/src/views/Logs/EventLogs/EventLogs.vue +++ b/src/views/Logs/EventLogs/EventLogs.vue @@ -1,248 +1,241 @@ <template> <b-container fluid="xxl pt-0 m-2"> <page-title /> - <div class="main-container"> - <b-row class="align-items-start"> - <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4"> - <search - :placeholder="$t('pageEventLogs.table.searchLogs')" - data-test-id="eventLogs-input-searchLogs" - @change-search="onChangeSearchInput" - @clear-search="onClearSearchInput" - /> - <div class="ml-sm-4"> - <table-cell-count - :filtered-items-count="filteredRows" - :total-number-of-cells="allLogs.length" - ></table-cell-count> - </div> - </b-col> - <b-col sm="8" md="7" xl="6"> - <table-date-filter @change="onChangeDateTimeFilter" /> - </b-col> - </b-row> - <b-row> - <b-col class="text-right"> - <table-filter - :filters="tableFilters" - @filter-change="onFilterChange" - /> - <b-button - variant="link" - :disabled="allLogs.length === 0" - @click="deleteAllLogs" - > - <icon-delete /> {{ $t('global.action.deleteAll') }} - </b-button> - <b-button - variant="primary" - :class="{ disabled: allLogs.length === 0 }" - :download="exportFileNameByDate()" - :href="href" - > - <icon-export /> {{ $t('global.action.exportAll') }} - </b-button> - </b-col> - </b-row> - <b-row> - <b-col> - <table-toolbar - ref="toolbar" - :selected-items-count="selectedRows.length" - :actions="batchActions" - @clear-selected="clearSelectedRows($refs.table)" - @batch-action="onBatchAction" - > - <template #toolbar-buttons> - <b-button variant="primary" @click="resolveLogs"> - {{ $t('pageEventLogs.resolve') }} - </b-button> - <b-button variant="primary" @click="unresolveLogs"> - {{ $t('pageEventLogs.unresolve') }} - </b-button> - <table-toolbar-export - :data="batchExportData" - :file-name="exportFileNameByDate()" - /> - </template> - </table-toolbar> - <b-table - id="table-event-logs" - ref="table" - responsive="md" - selectable - no-select-on-click - sort-icon-left - hover - no-sort-reset - sort-desc - show-empty - sort-by="id" - :fields="fields" - :items="filteredLogs" - :sort-compare="onSortCompare" - :empty-text="$t('global.table.emptyMessage')" - :empty-filtered-text="$t('global.table.emptySearchMessage')" - :per-page="perPage" - :current-page="currentPage" - :filter="searchFilter" - :busy="isBusy" - @filtered="onFiltered" - @row-selected="onRowSelected($event, filteredLogs.length)" - > - <!-- Checkbox column --> - <template #head(checkbox)> - <b-form-checkbox - v-model="tableHeaderCheckboxModel" - data-test-id="eventLogs-checkbox-selectAll" - :indeterminate="tableHeaderCheckboxIndeterminate" - @change="onChangeHeaderCheckbox($refs.table)" - > - <span class="sr-only">{{ $t('global.table.selectAll') }}</span> - </b-form-checkbox> - </template> - <template #cell(checkbox)="row"> - <b-form-checkbox - v-model="row.rowSelected" - :data-test-id="`eventLogs-checkbox-selectRow-${row.index}`" - @change="toggleSelectRow($refs.table, row.index)" - > - <span class="sr-only">{{ $t('global.table.selectItem') }}</span> - </b-form-checkbox> - </template> + <b-row class="align-items-start"> + <b-col sm="8" xl="6" class="d-sm-flex align-items-end mb-4"> + <search + :placeholder="$t('pageEventLogs.table.searchLogs')" + data-test-id="eventLogs-input-searchLogs" + @change-search="onChangeSearchInput" + @clear-search="onClearSearchInput" + /> + <div class="ml-sm-4"> + <table-cell-count + :filtered-items-count="filteredRows" + :total-number-of-cells="allLogs.length" + ></table-cell-count> + </div> + </b-col> + <b-col sm="8" md="7" xl="6"> + <table-date-filter @change="onChangeDateTimeFilter" /> + </b-col> + </b-row> + <b-row> + <b-col class="text-right"> + <table-filter :filters="tableFilters" @filter-change="onFilterChange" /> + <b-button + variant="link" + :disabled="allLogs.length === 0" + @click="deleteAllLogs" + > + <icon-delete /> {{ $t('global.action.deleteAll') }} + </b-button> + <b-button + variant="primary" + :class="{ disabled: allLogs.length === 0 }" + :download="exportFileNameByDate()" + :href="href" + > + <icon-export /> {{ $t('global.action.exportAll') }} + </b-button> + </b-col> + </b-row> + <b-row> + <b-col> + <table-toolbar + ref="toolbar" + :selected-items-count="selectedRows.length" + :actions="batchActions" + @clear-selected="clearSelectedRows($refs.table)" + @batch-action="onBatchAction" + > + <template #toolbar-buttons> + <b-button variant="primary" @click="resolveLogs"> + {{ $t('pageEventLogs.resolve') }} + </b-button> + <b-button variant="primary" @click="unresolveLogs"> + {{ $t('pageEventLogs.unresolve') }} + </b-button> + <table-toolbar-export + :data="batchExportData" + :file-name="exportFileNameByDate()" + /> + </template> + </table-toolbar> + <b-table + id="table-event-logs" + ref="table" + responsive="md" + selectable + no-select-on-click + sort-icon-left + hover + no-sort-reset + sort-desc + show-empty + sort-by="id" + :fields="fields" + :items="filteredLogs" + :sort-compare="onSortCompare" + :empty-text="$t('global.table.emptyMessage')" + :empty-filtered-text="$t('global.table.emptySearchMessage')" + :per-page="perPage" + :current-page="currentPage" + :filter="searchFilter" + :busy="isBusy" + @filtered="onFiltered" + @row-selected="onRowSelected($event, filteredLogs.length)" + > + <!-- Checkbox column --> + <template #head(checkbox)> + <b-form-checkbox + v-model="tableHeaderCheckboxModel" + data-test-id="eventLogs-checkbox-selectAll" + :indeterminate="tableHeaderCheckboxIndeterminate" + @change="onChangeHeaderCheckbox($refs.table)" + > + <span class="sr-only">{{ $t('global.table.selectAll') }}</span> + </b-form-checkbox> + </template> + <template #cell(checkbox)="row"> + <b-form-checkbox + v-model="row.rowSelected" + :data-test-id="`eventLogs-checkbox-selectRow-${row.index}`" + @change="toggleSelectRow($refs.table, row.index)" + > + <span class="sr-only">{{ $t('global.table.selectItem') }}</span> + </b-form-checkbox> + </template> - <!-- Expand chevron icon --> - <template #cell(expandRow)="row"> - <b-button - variant="link" - :aria-label="expandRowLabel" - :title="expandRowLabel" - class="btn-icon-only" - @click="toggleRowDetails(row)" - > - <icon-chevron /> - </b-button> - </template> + <!-- Expand chevron icon --> + <template #cell(expandRow)="row"> + <b-button + variant="link" + :aria-label="expandRowLabel" + :title="expandRowLabel" + class="btn-icon-only" + @click="toggleRowDetails(row)" + > + <icon-chevron /> + </b-button> + </template> - <template #row-details="{ item }"> - <b-container fluid> - <b-row> - <b-col> - <dl> - <!-- Name --> - <dt>{{ $t('pageEventLogs.table.name') }}:</dt> - <dd>{{ dataFormatter(item.name) }}</dd> - </dl> - <dl> - <!-- Type --> - <dt>{{ $t('pageEventLogs.table.type') }}:</dt> - <dd>{{ dataFormatter(item.type) }}</dd> - </dl> - </b-col> - <b-col> - <dl> - <!-- Modified date --> - <dt>{{ $t('pageEventLogs.table.modifiedDate') }}:</dt> - <dd v-if="item.modifiedDate"> - {{ item.modifiedDate | formatDate }} - {{ item.modifiedDate | formatTime }} - </dd> - <dd v-else>--</dd> - </dl> - </b-col> - <b-col class="text-nowrap"> - <b-button - class="btn btn-secondary float-right" - :href="item.additionalDataUri" - target="_blank" - > - <icon-download />{{ - $t('pageEventLogs.additionalDataUri') - }} - </b-button> - </b-col> - </b-row> - </b-container> - </template> + <template #row-details="{ item }"> + <b-container fluid> + <b-row> + <b-col> + <dl> + <!-- Name --> + <dt>{{ $t('pageEventLogs.table.name') }}:</dt> + <dd>{{ dataFormatter(item.name) }}</dd> + </dl> + <dl> + <!-- Type --> + <dt>{{ $t('pageEventLogs.table.type') }}:</dt> + <dd>{{ dataFormatter(item.type) }}</dd> + </dl> + </b-col> + <b-col> + <dl> + <!-- Modified date --> + <dt>{{ $t('pageEventLogs.table.modifiedDate') }}:</dt> + <dd v-if="item.modifiedDate"> + {{ item.modifiedDate | formatDate }} + {{ item.modifiedDate | formatTime }} + </dd> + <dd v-else>--</dd> + </dl> + </b-col> + <b-col class="text-nowrap"> + <b-button + class="btn btn-secondary float-right" + :href="item.additionalDataUri" + target="_blank" + > + <icon-download />{{ $t('pageEventLogs.additionalDataUri') }} + </b-button> + </b-col> + </b-row> + </b-container> + </template> - <!-- Severity column --> - <template #cell(severity)="{ value }"> - <status-icon v-if="value" :status="statusIcon(value)" /> - {{ value }} - </template> - <!-- Date column --> - <template #cell(date)="{ value }"> - <p class="mb-0">{{ value | formatDate }}</p> - <p class="mb-0">{{ value | formatTime }}</p> - </template> + <!-- Severity column --> + <template #cell(severity)="{ value }"> + <status-icon v-if="value" :status="statusIcon(value)" /> + {{ value }} + </template> + <!-- Date column --> + <template #cell(date)="{ value }"> + <p class="mb-0">{{ value | formatDate }}</p> + <p class="mb-0">{{ value | formatTime }}</p> + </template> - <!-- Status column --> - <template #cell(status)="row"> - <b-form-checkbox - v-model="row.item.status" - name="switch" - switch - @change="changelogStatus(row.item)" - > - <span v-if="row.item.status"> - {{ $t('pageEventLogs.resolved') }} - </span> - <span v-else> {{ $t('pageEventLogs.unresolved') }} </span> - </b-form-checkbox> - </template> - <template #cell(filterByStatus)="{ value }"> - {{ value }} - </template> + <!-- Status column --> + <template #cell(status)="row"> + <b-form-checkbox + v-model="row.item.status" + name="switch" + switch + @change="changelogStatus(row.item)" + > + <span v-if="row.item.status"> + {{ $t('pageEventLogs.resolved') }} + </span> + <span v-else> {{ $t('pageEventLogs.unresolved') }} </span> + </b-form-checkbox> + </template> + <template #cell(filterByStatus)="{ value }"> + {{ value }} + </template> - <!-- Actions column --> - <template #cell(actions)="row"> - <table-row-action - v-for="(action, index) in row.item.actions" - :key="index" - :value="action.value" - :title="action.title" - :row-data="row.item" - :export-name="exportFileNameByDate('export')" - :data-test-id="`eventLogs-button-deleteRow-${row.index}`" - @click-table-action="onTableRowAction($event, row.item)" - > - <template #icon> - <icon-export v-if="action.value === 'export'" /> - <icon-trashcan v-if="action.value === 'delete'" /> - </template> - </table-row-action> - </template> - </b-table> - </b-col> - </b-row> + <!-- Actions column --> + <template #cell(actions)="row"> + <table-row-action + v-for="(action, index) in row.item.actions" + :key="index" + :value="action.value" + :title="action.title" + :row-data="row.item" + :export-name="exportFileNameByDate('export')" + :data-test-id="`eventLogs-button-deleteRow-${row.index}`" + @click-table-action="onTableRowAction($event, row.item)" + > + <template #icon> + <icon-export v-if="action.value === 'export'" /> + <icon-trashcan v-if="action.value === 'delete'" /> + </template> + </table-row-action> + </template> + </b-table> + </b-col> + </b-row> - <!-- Table pagination --> - <b-row> - <b-col sm="6"> - <b-form-group - class="table-pagination-select" - :label="$t('global.table.itemsPerPage')" - label-for="pagination-items-per-page" - > - <b-form-select - id="pagination-items-per-page" - v-model="perPage" - :options="itemsPerPageOptions" - /> - </b-form-group> - </b-col> - <b-col sm="6"> - <b-pagination - v-model="currentPage" - first-number - last-number - :per-page="perPage" - :total-rows="getTotalRowCount(filteredRows)" - aria-controls="table-event-logs" + <!-- Table pagination --> + <b-row> + <b-col sm="6"> + <b-form-group + class="table-pagination-select" + :label="$t('global.table.itemsPerPage')" + label-for="pagination-items-per-page" + > + <b-form-select + id="pagination-items-per-page" + v-model="perPage" + :options="itemsPerPageOptions" /> - </b-col> - </b-row> - </div> + </b-form-group> + </b-col> + <b-col sm="6"> + <b-pagination + v-model="currentPage" + first-number + last-number + :per-page="perPage" + :total-rows="getTotalRowCount(filteredRows)" + aria-controls="table-event-logs" + /> + </b-col> + </b-row> </b-container> </template> diff --git a/src/views/MemoryModules/DynamicInfo/MemoryDynamicPage.vue b/src/views/MemoryModules/DynamicInfo/MemoryDynamicPage.vue index 640513f5d..eeec0224c 100644 --- a/src/views/MemoryModules/DynamicInfo/MemoryDynamicPage.vue +++ b/src/views/MemoryModules/DynamicInfo/MemoryDynamicPage.vue @@ -20,71 +20,66 @@ </button> </div> </div> - <div class="main-container"> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <div class="limit-container"> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/non-normal.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.nonNormalMode') - }}</span> - <b-form-input - v-model="temperatureNonNormalInput" - type="number" - :min="0" - :max="temperatureCritical" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/critical.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.criticalMode') - }}</span> - <b-form-input - v-model="temperatureCritical" - type="number" - :min="temperatureNonNormalInput" - :max="temperatureWarningInput" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.temperatureWarning') - }}</span> - <b-form-input - v-model="temperatureWarningInput" - type="number" - :min="temperatureCritical" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateTemperatureLimits" + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <div class="limit-container"> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/non-normal.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.nonNormalMode') + }}</span> + <b-form-input + v-model="temperatureNonNormalInput" + type="number" + :min="0" + :max="temperatureCritical" + class="form-control medium-12px" + > + </b-form-input> + </div> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/critical.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.criticalMode') + }}</span> + <b-form-input + v-model="temperatureCritical" + type="number" + :min="temperatureNonNormalInput" + :max="temperatureWarningInput" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> + </div> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.temperatureWarning') + }}</span> + <b-form-input + v-model="temperatureWarningInput" + type="number" + :min="temperatureCritical" + :max="100" + class="form-control medium-12px" + > + </b-form-input> </div> - <!-- Temperature Table --> - <temperature-table - :time-scale="timeScale" - :warning="temperatureWarning" - :non-normal="temperatureNonNormal" - :critical-start="temperatureCriticalStart" - /> - <accessory-table :records="accessoryData.temperatureTable" /> + <b-button + class="save-button" + variant="primary" + @click="updateTemperatureLimits" + > + {{ $t('global.action.save') }} + </b-button> </div> + <!-- Temperature Table --> + <temperature-table + :time-scale="timeScale" + :warning="temperatureWarning" + :non-normal="temperatureNonNormal" + :critical-start="temperatureCriticalStart" + /> + <accessory-table :records="accessoryData.temperatureTable" /> </b-container> </template> <script> diff --git a/src/views/MemoryModules/Specification/MemoryStaticPage.vue b/src/views/MemoryModules/Specification/MemoryStaticPage.vue index 679f4ba19..92df53735 100644 --- a/src/views/MemoryModules/Specification/MemoryStaticPage.vue +++ b/src/views/MemoryModules/Specification/MemoryStaticPage.vue @@ -4,85 +4,83 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <page-section class="bootstrap-table__section info_section"> - <span class="bold-16px">{{ $t('global.table.info') }}</span> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - </b-table> - <span class="bold-16px">{{ $t('global.table.memorySlots') }}</span> - </page-section> - <data-tabs - :slots="memorySlots" - :switch-tab="switchMemorySlot" - :current-tab="currentMemorySlot" - :slot-width="120" - :slider-width="97" - /> - <page-section class="bootstrap-table__section"> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items_slots" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(value)="{ index, value }"> - <b-row v-if="index === 0"> - <b-col cols="11"> - <span> - {{ 'Работоспособность' }} - </span> - </b-col> - <b-col cols="1"> - <img src="@/assets/images/status/on.svg" class="icon-chevron" /> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span>{{ value }}</span> - </b-col> - </b-row> - </template> - </b-table> - </page-section> - <page-section class="bootstrap-table__section"> - <span class="bold-16px">{{ $t('global.table.memoryModules') }}</span> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items_modules" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(value)="{ index, value }"> - <b-row v-if="index === 0"> - <b-col cols="11"> - <span> - {{ 'Работоспособность' }} - </span> - </b-col> - <b-col cols="1"> - <img src="@/assets/images/status/on.svg" class="icon-chevron" /> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span>{{ value }}</span> - </b-col> - </b-row> - </template> - </b-table> - </page-section> - </div> + <page-section class="bootstrap-table__section info_section"> + <span class="bold-16px">{{ $t('global.table.info') }}</span> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + </b-table> + <span class="bold-16px">{{ $t('global.table.memorySlots') }}</span> + </page-section> + <data-tabs + :slots="memorySlots" + :switch-tab="switchMemorySlot" + :current-tab="currentMemorySlot" + :slot-width="120" + :slider-width="97" + /> + <page-section class="bootstrap-table__section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items_slots" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(value)="{ index, value }"> + <b-row v-if="index === 0"> + <b-col cols="11"> + <span> + {{ 'Работоспособность' }} + </span> + </b-col> + <b-col cols="1"> + <img src="@/assets/images/status/on.svg" class="icon-chevron" /> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span>{{ value }}</span> + </b-col> + </b-row> + </template> + </b-table> + </page-section> + <page-section class="bootstrap-table__section"> + <span class="bold-16px">{{ $t('global.table.memoryModules') }}</span> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items_modules" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(value)="{ index, value }"> + <b-row v-if="index === 0"> + <b-col cols="11"> + <span> + {{ 'Работоспособность' }} + </span> + </b-col> + <b-col cols="1"> + <img src="@/assets/images/status/on.svg" class="icon-chevron" /> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span>{{ value }}</span> + </b-col> + </b-row> + </template> + </b-table> + </page-section> </b-container> </template> diff --git a/src/views/Motherboard/DynamicInfo/MotherboardDynamicPage.vue b/src/views/Motherboard/DynamicInfo/MotherboardDynamicPage.vue index 95267ece1..e50bc399d 100644 --- a/src/views/Motherboard/DynamicInfo/MotherboardDynamicPage.vue +++ b/src/views/Motherboard/DynamicInfo/MotherboardDynamicPage.vue @@ -4,43 +4,38 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <div class="limit-container"> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.temperatureWarning') - }}</span> - <b-form-input - v-model="temperatureWarningInput" - type="number" - :min="0" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateTemperature" + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <div class="limit-container"> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.temperatureWarning') + }}</span> + <b-form-input + v-model="temperatureWarningInput" + type="number" + :min="0" + :max="100" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Temperature Table --> - <temperature-table - :time-scale="timeScale" - :warning="temperatureWarning" - :non-normal="temperatureNonNormal" - :critical-start="temperatureCriticalStart" - /> - <accessory-table :records="accessoryData.temperatureTable" /> + <b-button + class="save-button" + variant="primary" + @click="updateTemperature" + > + {{ $t('global.action.save') }} + </b-button> </div> + <!-- Temperature Table --> + <temperature-table + :time-scale="timeScale" + :warning="temperatureWarning" + :non-normal="temperatureNonNormal" + :critical-start="temperatureCriticalStart" + /> + <accessory-table :records="accessoryData.temperatureTable" /> </b-container> </template> <script> diff --git a/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue b/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue index 2146663d0..03fc42e01 100644 --- a/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue +++ b/src/views/Motherboard/Specification/MotherboardSpecificationPage.vue @@ -4,35 +4,31 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <page-section class="bootstrap-table__section"> - <span class="bold-16px">{{ $t('global.table.info') }}</span> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - </b-table> - <span class="bold-16px">{{ - $t('appNavigation.motherboardParam') - }}</span> - <popover - id="popover-reactive-1" - description="SystemDescription.onBootRom" - popup="SystemDescription.onBootRom_popup" - button="global.action.refresh" - /> - <popover - id="popover-reactive-2" - description="SystemDescription.offBootRom" - popup="SystemDescription.offBootRom_popup" - button="global.action.refresh" - /> - </page-section> - </div> + <page-section class="bootstrap-table__section"> + <span class="bold-16px">{{ $t('global.table.info') }}</span> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + </b-table> + <span class="bold-16px">{{ $t('appNavigation.motherboardParam') }}</span> + <popover + id="popover-reactive-1" + description="SystemDescription.onBootRom" + popup="SystemDescription.onBootRom_popup" + button="global.action.refresh" + /> + <popover + id="popover-reactive-2" + description="SystemDescription.offBootRom" + popup="SystemDescription.offBootRom_popup" + button="global.action.refresh" + /> + </page-section> </b-container> </template> diff --git a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue index f2fb62e2a..a394a77f9 100644 --- a/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue +++ b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue @@ -1,192 +1,190 @@ <template> <b-container fluid="xxl pt-0 m-0"> <page-title /> - <div class="main-container"> - <b-row class="m-2"> - <b-col md="8" xl="6"> - <page-section class="m-2 pt-2 pb-2"> - <b-row> - <b-col> - <dl> - <dt class="semi-bold-16px"> - {{ $t('pageServerPowerOperations.serverStatus') }} - </dt> - <dd - v-if="serverStatus === 'on'" - style="margin-top: 10px" - class="regular-12px" - data-test-id="powerServerOps-text-hostStatus" - > - <img - style="margin-right: 5px" - src="@/assets/images/status/on.svg" - /> - {{ $t('global.status.on_full') }} - </dd> - <dd - v-else-if="serverStatus === 'off'" - style="margin-top: 10px" - class="regular-12px" - data-test-id="powerServerOps-text-hostStatus" - > - <img - style="margin-right: 5px" - src="@/assets/images/status/off.svg" - /> - {{ $t('global.status.off_full') }} - </dd> - <dd v-else class="regular-12px"> - {{ $t('global.status.notAvailable') }} - </dd> - </dl> - </b-col> - </b-row> - <b-row> - <b-col> - <dl> - <dt class="semi-bold-12px"> - {{ $t('pageServerPowerOperations.lastPowerOperation') }} - </dt> - <dd - v-if="lastPowerOperationTime" - class="regular-12px" - data-test-id="powerServerOps-text-lastPowerOp" - > - {{ lastPowerOperationTime | formatDate }} - {{ lastPowerOperationTime | formatTime }} - </dd> - <dd v-else>--</dd> - </dl> - </b-col> - </b-row> - </page-section> - </b-col> - </b-row> - <b-row class="m-2"> - <b-col sm="8" md="6" xl="7"> - <page-section class="m-2"> - <b-row class="ml-0 mb-3"> - <span class="semi-bold-16px">{{ 'Управление' }}</span> - </b-row> - <alert :show="oneTimeBootEnabled" variant="warning"> - {{ $t('pageServerPowerOperations.oneTimeBootWarning') }} + <b-row class="m-2"> + <b-col md="8" xl="6"> + <page-section class="m-2 pt-2 pb-2"> + <b-row> + <b-col> + <dl> + <dt class="semi-bold-16px"> + {{ $t('pageServerPowerOperations.serverStatus') }} + </dt> + <dd + v-if="serverStatus === 'on'" + style="margin-top: 10px" + class="regular-12px" + data-test-id="powerServerOps-text-hostStatus" + > + <img + style="margin-right: 5px" + src="@/assets/images/status/on.svg" + /> + {{ $t('global.status.on_full') }} + </dd> + <dd + v-else-if="serverStatus === 'off'" + style="margin-top: 10px" + class="regular-12px" + data-test-id="powerServerOps-text-hostStatus" + > + <img + style="margin-right: 5px" + src="@/assets/images/status/off.svg" + /> + {{ $t('global.status.off_full') }} + </dd> + <dd v-else class="regular-12px"> + {{ $t('global.status.notAvailable') }} + </dd> + </dl> + </b-col> + </b-row> + <b-row> + <b-col> + <dl> + <dt class="semi-bold-12px"> + {{ $t('pageServerPowerOperations.lastPowerOperation') }} + </dt> + <dd + v-if="lastPowerOperationTime" + class="regular-12px" + data-test-id="powerServerOps-text-lastPowerOp" + > + {{ lastPowerOperationTime | formatDate }} + {{ lastPowerOperationTime | formatTime }} + </dd> + <dd v-else>--</dd> + </dl> + </b-col> + </b-row> + </page-section> + </b-col> + </b-row> + <b-row class="m-2"> + <b-col sm="8" md="6" xl="7"> + <page-section class="m-2"> + <b-row class="ml-0 mb-3"> + <span class="semi-bold-16px">{{ 'Управление' }}</span> + </b-row> + <alert :show="oneTimeBootEnabled" variant="warning"> + {{ $t('pageServerPowerOperations.oneTimeBootWarning') }} + </alert> + <template v-if="isOperationInProgress"> + <alert variant="info"> + {{ $t('pageServerPowerOperations.operationInProgress') }} </alert> - <template v-if="isOperationInProgress"> - <alert variant="info"> - {{ $t('pageServerPowerOperations.operationInProgress') }} - </alert> - </template> - <template v-else-if="serverStatus === 'off'"> - <popover-with-slot + </template> + <template v-else-if="serverStatus === 'off'"> + <popover-with-slot + id="popover-powerOn" + :button-label="$t('pageServerPowerOperations.powerOn')" + :popup-label="$t('pageServerPowerOperations.powerOnServer')" + placement="right" + :action="powerOn" + > + <b-button id="popover-powerOn" - :button-label="$t('pageServerPowerOperations.powerOn')" - :popup-label="$t('pageServerPowerOperations.powerOnServer')" + ref="button" + size="md" + variant="primary" + > + {{ $t('pageServerPowerOperations.powerOn') }} + </b-button> + </popover-with-slot> + </template> + <template v-else> + <!-- Reboot server options --> + <b-form novalidate class="mb-2"> + <b-form-group class="regular-12px cb"> + <label class="semi-bold-12px">{{ + $t('pageServerPowerOperations.rebootServer') + }}</label> + <b-form-radio + v-model="form.rebootOption" + name="reboot-option" + data-test-id="serverPowerOperations-radio-rebootOrderly" + value="orderly" + > + {{ $t('pageServerPowerOperations.orderlyReboot') }} + </b-form-radio> + <b-form-radio + v-model="form.rebootOption" + name="reboot-option" + data-test-id="serverPowerOperations-radio-rebootImmediate" + value="immediate" + > + {{ $t('pageServerPowerOperations.immediateReboot') }} + </b-form-radio> + </b-form-group> + <popover-with-slot + id="popover-reboot" + :button-label="$t('pageServerPowerOperations.reboot')" + :popup-label="$t('pageServerPowerOperations.rebootServer')" placement="right" - :action="powerOn" + :action="rebootServer" > <b-button - id="popover-powerOn" + id="popover-reboot" ref="button" size="md" variant="primary" > - {{ $t('pageServerPowerOperations.powerOn') }} + {{ $t('pageServerPowerOperations.reboot') }} </b-button> </popover-with-slot> - </template> - <template v-else> - <!-- Reboot server options --> - <b-form novalidate class="mb-2"> - <b-form-group class="regular-12px cb"> - <label class="semi-bold-12px">{{ - $t('pageServerPowerOperations.rebootServer') - }}</label> - <b-form-radio - v-model="form.rebootOption" - name="reboot-option" - data-test-id="serverPowerOperations-radio-rebootOrderly" - value="orderly" - > - {{ $t('pageServerPowerOperations.orderlyReboot') }} - </b-form-radio> - <b-form-radio - v-model="form.rebootOption" - name="reboot-option" - data-test-id="serverPowerOperations-radio-rebootImmediate" - value="immediate" - > - {{ $t('pageServerPowerOperations.immediateReboot') }} - </b-form-radio> - </b-form-group> - <popover-with-slot - id="popover-reboot" - :button-label="$t('pageServerPowerOperations.reboot')" - :popup-label="$t('pageServerPowerOperations.rebootServer')" - placement="right" - :action="rebootServer" + </b-form> + <!-- Shutdown server options --> + <b-form> + <b-form-group class="regular-12px cb"> + <label class="semi-bold-12px">{{ + $t('pageServerPowerOperations.shutdownServer') + }}</label> + <b-form-radio + v-model="form.shutdownOption" + name="shutdown-option" + data-test-id="serverPowerOperations-radio-shutdownOrderly" + value="orderly" > - <b-button - id="popover-reboot" - ref="button" - size="md" - variant="primary" - > - {{ $t('pageServerPowerOperations.reboot') }} - </b-button> - </popover-with-slot> - </b-form> - <!-- Shutdown server options --> - <b-form> - <b-form-group class="regular-12px cb"> - <label class="semi-bold-12px">{{ - $t('pageServerPowerOperations.shutdownServer') - }}</label> - <b-form-radio - v-model="form.shutdownOption" - name="shutdown-option" - data-test-id="serverPowerOperations-radio-shutdownOrderly" - value="orderly" - > - {{ $t('pageServerPowerOperations.orderlyShutdown') }} - </b-form-radio> - <b-form-radio - v-model="form.shutdownOption" - name="shutdown-option" - data-test-id="serverPowerOperations-radio-shutdownImmediate" - value="immediate" - > - {{ $t('pageServerPowerOperations.immediateShutdown') }} - </b-form-radio> - </b-form-group> - <popover-with-slot + {{ $t('pageServerPowerOperations.orderlyShutdown') }} + </b-form-radio> + <b-form-radio + v-model="form.shutdownOption" + name="shutdown-option" + data-test-id="serverPowerOperations-radio-shutdownImmediate" + value="immediate" + > + {{ $t('pageServerPowerOperations.immediateShutdown') }} + </b-form-radio> + </b-form-group> + <popover-with-slot + id="popover-shutDown" + :button-label="$t('pageServerPowerOperations.shutDown')" + :popup-label="$t('pageServerPowerOperations.shutdownServer')" + placement="right" + :action="shutdownServer" + > + <b-button id="popover-shutDown" - :button-label="$t('pageServerPowerOperations.shutDown')" - :popup-label="$t('pageServerPowerOperations.shutdownServer')" - placement="right" - :action="shutdownServer" + ref="button" + size="md" + variant="secondary" > - <b-button - id="popover-shutDown" - ref="button" - size="md" - variant="secondary" - > - {{ $t('pageServerPowerOperations.shutDown') }} - </b-button> - </popover-with-slot> - </b-form> - </template> - </page-section> - </b-col> - </b-row> - <b-row> - <b-col v-if="hasBootSourceOptions" class="m-2" sm="8" md="6" xl="4"> - <page-section class="m-2"> - <boot-settings /> - </page-section> - </b-col> - </b-row> - </div> + {{ $t('pageServerPowerOperations.shutDown') }} + </b-button> + </popover-with-slot> + </b-form> + </template> + </page-section> + </b-col> + </b-row> + <b-row> + <b-col v-if="hasBootSourceOptions" class="m-2" sm="8" md="6" xl="4"> + <page-section class="m-2"> + <boot-settings /> + </page-section> + </b-col> + </b-row> </b-container> </template> diff --git a/src/views/PowerSupplies/DynamicInfo/PowerDynamicPage.vue b/src/views/PowerSupplies/DynamicInfo/PowerDynamicPage.vue index 3039bebbc..02a209d56 100644 --- a/src/views/PowerSupplies/DynamicInfo/PowerDynamicPage.vue +++ b/src/views/PowerSupplies/DynamicInfo/PowerDynamicPage.vue @@ -23,425 +23,392 @@ </button> </div> </div> - <div class="main-container"> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <!-- Temperature Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_1 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/temperature-icon.svg" /> - <span class="bold-16px">{{ $t('subHeader.temperature') }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_1" class="nav-item__nav"> - <!-- Temperature Limit Inputs --> - <div class="limit-container"> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/non-normal.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.nonNormalMode') - }}</span> - <b-form-input - v-model="temperatureNonNormalInput" - type="number" - :min="0" - :max="temperatureCritical" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/critical.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.criticalMode') - }}</span> - <b-form-input - v-model="temperatureCritical" - type="number" - :min="temperatureNonNormalInput" - :max="temperatureWarningInput" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.temperatureWarning') - }}</span> - <b-form-input - v-model="temperatureWarningInput" - type="number" - :min="temperatureCritical" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateTemperature" + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <!-- Temperature Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_1 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/temperature-icon.svg" /> + <span class="bold-16px">{{ $t('subHeader.temperature') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_1" class="nav-item__nav"> + <!-- Temperature Limit Inputs --> + <div class="limit-container"> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/non-normal.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.nonNormalMode') + }}</span> + <b-form-input + v-model="temperatureNonNormalInput" + type="number" + :min="0" + :max="temperatureCritical" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Temperature Tables --> - <temperature-table - :time-scale="timeScale" - :warning="temperatureWarning" - :non-normal="temperatureNonNormal" - :critical="temperatureCritical" - /> - <accessory-table :records="accessoryData.temperatureTable" /> - </b-collapse> - </div> - <!-- using Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_2 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/usage-icon.svg" /> - <span class="bold-16px">{{ $t('pagePower.usingPercent') }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_2" class="nav-item__nav"> - <!-- using Limit Inputs --> - <div class="limit-container"> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.warningPercent') - }}</span> - <b-form-input - v-model="usingNonNormalInput" - type="number" - :min="0" - :max="usingCritical" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/non-normal.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.nonNormalModePercent') - }}</span> - <b-form-input - v-model="usingCritical" - type="number" - :min="usingNonNormalInput" - :max="usingWarningInput" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/critical.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.criticalModePercent') - }}</span> - <b-form-input - v-model="usingWarningInput" - type="number" - :min="usingCritical" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateUsage" + <div class="trmperature-limt"> + <img src="@/assets/images/labels/critical.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.criticalMode') + }}</span> + <b-form-input + v-model="temperatureCritical" + type="number" + :min="temperatureNonNormalInput" + :max="temperatureWarningInput" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- using Tables --> - <using-table - :time-scale="timeScale" - :warning="usingWarning" - :non-normal="usingNonNormal" - :critical-start="usingCritical" - /> - <accessory-table :records="accessoryData.usingTable" /> - </b-collapse> - </div> - <!-- Input Voltage Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_3 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/voltage-icon.svg" /> - <span class="bold-16px">{{ - $t('tablesDescription.inputVoltage') - }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_3" class="nav-item__nav"> - <div class="limit-container"> - <div class="frequency-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.voltageWarning') - }}</span> - <b-form-input - v-model="powerWarningInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="frequency-limt"> - <img src="@/assets/images/labels/shutdown.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.voltageShutdown') - }}</span> - <b-form-input - v-model="powerShutdownInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updatePower" + <div class="trmperature-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.temperatureWarning') + }}</span> + <b-form-input + v-model="temperatureWarningInput" + type="number" + :min="temperatureCritical" + :max="100" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Input Voltage Tables --> - <voltage-table :time-scale="timeScale" :warning="frequencyWarning" /> - <accessory-table :records="accessoryData.voltageTable" /> - </b-collapse> - </div> - <!-- Input Power Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_4 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/power-icon.svg" /> - <span class="bold-16px">{{ - $t('tablesDescription.inputPower') - }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_4" class="nav-item__nav"> - <div class="limit-container"> - <div class="frequency-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.powerWarning') - }}</span> - <b-form-input - v-model="powerWarningInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="frequency-limt"> - <img src="@/assets/images/labels/shutdown.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.powerShutdown') - }}</span> - <b-form-input - v-model="powerShutdownInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updatePower" + <b-button + class="save-button" + variant="primary" + @click="updateTemperature" + > + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Temperature Tables --> + <temperature-table + :time-scale="timeScale" + :warning="temperatureWarning" + :non-normal="temperatureNonNormal" + :critical="temperatureCritical" + /> + <accessory-table :records="accessoryData.temperatureTable" /> + </b-collapse> + </div> + <!-- using Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_2 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/usage-icon.svg" /> + <span class="bold-16px">{{ $t('pagePower.usingPercent') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_2" class="nav-item__nav"> + <!-- using Limit Inputs --> + <div class="limit-container"> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.warningPercent') + }}</span> + <b-form-input + v-model="usingNonNormalInput" + type="number" + :min="0" + :max="usingCritical" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Input Power Table --> - <power-table - :time-scale="timeScale" - :warning="powerWarning" - :shutdown="powerShutdown" - /> - <accessory-table :records="accessoryData.powerTable" /> - </b-collapse> - </div> - <!-- Output Voltage Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_5 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/voltage-icon.svg" /> - <span class="bold-16px">{{ - $t('tablesDescription.outputVoltage') - }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_5" class="nav-item__nav"> - <div class="limit-container"> - <div class="frequency-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.voltageWarning') - }}</span> - <b-form-input - v-model="powerWarningInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="frequency-limt"> - <img src="@/assets/images/labels/shutdown.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.voltageShutdown') - }}</span> - <b-form-input - v-model="powerShutdownInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updatePower" + <div class="trmperature-limt"> + <img src="@/assets/images/labels/non-normal.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.nonNormalModePercent') + }}</span> + <b-form-input + v-model="usingCritical" + type="number" + :min="usingNonNormalInput" + :max="usingWarningInput" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Output Voltage Tables --> - <voltage-table :time-scale="timeScale" :warning="frequencyWarning" /> - <accessory-table :records="accessoryData.voltageTable" /> - </b-collapse> - </div> - <!-- Output Power Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_6 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/power-icon.svg" /> - <span class="bold-16px">{{ - $t('tablesDescription.outputPower') - }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_6" class="nav-item__nav"> - <div class="limit-container"> - <div class="frequency-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.powerWarning') - }}</span> - <b-form-input - v-model="powerWarningInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="frequency-limt"> - <img src="@/assets/images/labels/shutdown.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.powerShutdown') - }}</span> - <b-form-input - v-model="powerShutdownInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updatePower" + <div class="trmperature-limt"> + <img src="@/assets/images/labels/critical.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.criticalModePercent') + }}</span> + <b-form-input + v-model="usingWarningInput" + type="number" + :min="usingCritical" + :max="100" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Output Power Table --> - <power-table - :time-scale="timeScale" - :warning="powerWarning" - :shutdown="powerShutdown" - /> - <accessory-table :records="accessoryData.powerTable" /> - </b-collapse> - </div> - <!-- Amperage Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_7 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/amperage-icon.svg" /> - <span class="bold-16px">{{ $t('tablesDescription.amperage') }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_7" class="nav-item__nav"> - <div class="limit-container"> - <div class="frequency-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.voltageWarning') - }}</span> - <b-form-input - v-model="powerWarningInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="frequency-limt"> - <img src="@/assets/images/labels/shutdown.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.voltageShutdown') - }}</span> - <b-form-input - v-model="powerShutdownInput" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updatePower" + <b-button class="save-button" variant="primary" @click="updateUsage"> + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- using Tables --> + <using-table + :time-scale="timeScale" + :warning="usingWarning" + :non-normal="usingNonNormal" + :critical-start="usingCritical" + /> + <accessory-table :records="accessoryData.usingTable" /> + </b-collapse> + </div> + <!-- Input Voltage Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_3 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/voltage-icon.svg" /> + <span class="bold-16px">{{ + $t('tablesDescription.inputVoltage') + }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_3" class="nav-item__nav"> + <div class="limit-container"> + <div class="frequency-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.voltageWarning') + }}</span> + <b-form-input + v-model="powerWarningInput" + type="number" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Amperage Table --> - <voltage-table :time-scale="timeScale" :warning="frequencyWarning" /> - <accessory-table :records="accessoryData.voltageTable" /> - </b-collapse> - </div> + <div class="frequency-limt"> + <img src="@/assets/images/labels/shutdown.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.voltageShutdown') + }}</span> + <b-form-input + v-model="powerShutdownInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <b-button class="save-button" variant="primary" @click="updatePower"> + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Input Voltage Tables --> + <voltage-table :time-scale="timeScale" :warning="frequencyWarning" /> + <accessory-table :records="accessoryData.voltageTable" /> + </b-collapse> + </div> + <!-- Input Power Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_4 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/power-icon.svg" /> + <span class="bold-16px">{{ $t('tablesDescription.inputPower') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_4" class="nav-item__nav"> + <div class="limit-container"> + <div class="frequency-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.powerWarning') + }}</span> + <b-form-input + v-model="powerWarningInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <div class="frequency-limt"> + <img src="@/assets/images/labels/shutdown.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.powerShutdown') + }}</span> + <b-form-input + v-model="powerShutdownInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <b-button class="save-button" variant="primary" @click="updatePower"> + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Input Power Table --> + <power-table + :time-scale="timeScale" + :warning="powerWarning" + :shutdown="powerShutdown" + /> + <accessory-table :records="accessoryData.powerTable" /> + </b-collapse> + </div> + <!-- Output Voltage Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_5 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/voltage-icon.svg" /> + <span class="bold-16px">{{ + $t('tablesDescription.outputVoltage') + }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_5" class="nav-item__nav"> + <div class="limit-container"> + <div class="frequency-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.voltageWarning') + }}</span> + <b-form-input + v-model="powerWarningInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <div class="frequency-limt"> + <img src="@/assets/images/labels/shutdown.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.voltageShutdown') + }}</span> + <b-form-input + v-model="powerShutdownInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <b-button class="save-button" variant="primary" @click="updatePower"> + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Output Voltage Tables --> + <voltage-table :time-scale="timeScale" :warning="frequencyWarning" /> + <accessory-table :records="accessoryData.voltageTable" /> + </b-collapse> + </div> + <!-- Output Power Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_6 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/power-icon.svg" /> + <span class="bold-16px">{{ $t('tablesDescription.outputPower') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_6" class="nav-item__nav"> + <div class="limit-container"> + <div class="frequency-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.powerWarning') + }}</span> + <b-form-input + v-model="powerWarningInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <div class="frequency-limt"> + <img src="@/assets/images/labels/shutdown.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.powerShutdown') + }}</span> + <b-form-input + v-model="powerShutdownInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <b-button class="save-button" variant="primary" @click="updatePower"> + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Output Power Table --> + <power-table + :time-scale="timeScale" + :warning="powerWarning" + :shutdown="powerShutdown" + /> + <accessory-table :records="accessoryData.powerTable" /> + </b-collapse> + </div> + <!-- Amperage Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_7 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/amperage-icon.svg" /> + <span class="bold-16px">{{ $t('tablesDescription.amperage') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_7" class="nav-item__nav"> + <div class="limit-container"> + <div class="frequency-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.voltageWarning') + }}</span> + <b-form-input + v-model="powerWarningInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <div class="frequency-limt"> + <img src="@/assets/images/labels/shutdown.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.voltageShutdown') + }}</span> + <b-form-input + v-model="powerShutdownInput" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <b-button class="save-button" variant="primary" @click="updatePower"> + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Amperage Table --> + <voltage-table :time-scale="timeScale" :warning="frequencyWarning" /> + <accessory-table :records="accessoryData.voltageTable" /> + </b-collapse> </div> </b-container> </template> diff --git a/src/views/PowerSupplies/Specification/PowerStaticPage.vue b/src/views/PowerSupplies/Specification/PowerStaticPage.vue index 3511b1f7c..844dc693f 100644 --- a/src/views/PowerSupplies/Specification/PowerStaticPage.vue +++ b/src/views/PowerSupplies/Specification/PowerStaticPage.vue @@ -4,46 +4,44 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <page-section class="bootstrap-table__section info_section"> - <span class="bold-16px">{{ $t('pageInventory.powerSources') }}</span> - </page-section> - <data-tabs - :slots="sourceSlots" - :switch-tab="switchSourceSlot" - :current-tab="currentSourceSlot" - :slot-width="100" - :slider-width="68" - /> - <page-section class="bootstrap-table__section"> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items_slots" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(value)="{ index, value }"> - <b-row v-if="index === 0"> - <b-col cols="11"> - <span> - {{ 'Работоспособность' }} - </span> - </b-col> - <b-col cols="1"> - <img src="@/assets/images/status/on.svg" class="icon-chevron" /> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span>{{ value }}</span> - </b-col> - </b-row> - </template> - </b-table> - </page-section> - </div> + <page-section class="bootstrap-table__section info_section"> + <span class="bold-16px">{{ $t('pageInventory.powerSources') }}</span> + </page-section> + <data-tabs + :slots="sourceSlots" + :switch-tab="switchSourceSlot" + :current-tab="currentSourceSlot" + :slot-width="100" + :slider-width="68" + /> + <page-section class="bootstrap-table__section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items_slots" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(value)="{ index, value }"> + <b-row v-if="index === 0"> + <b-col cols="11"> + <span> + {{ 'Работоспособность' }} + </span> + </b-col> + <b-col cols="1"> + <img src="@/assets/images/status/on.svg" class="icon-chevron" /> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span>{{ value }}</span> + </b-col> + </b-row> + </template> + </b-table> + </page-section> </b-container> </template> diff --git a/src/views/Processors/DynamicInfo/ProcessorsDynamicPage.vue b/src/views/Processors/DynamicInfo/ProcessorsDynamicPage.vue index 9ba32a4d8..2ffc193ec 100644 --- a/src/views/Processors/DynamicInfo/ProcessorsDynamicPage.vue +++ b/src/views/Processors/DynamicInfo/ProcessorsDynamicPage.vue @@ -23,190 +23,178 @@ </button> </div> </div> - <div class="main-container"> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <!-- Temperature Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_1 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/temperature-icon.svg" /> - <span class="bold-16px">{{ $t('subHeader.temperature') }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_1" class="nav-item__nav"> - <!-- Temperature Limit Inputs --> - <div class="limit-container"> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/non-normal.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.nonNormalMode') - }}</span> - <b-form-input - v-model="temperatureNonNormalInput" - type="number" - :min="0" - :max="temperatureCriticalInput" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/critical.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.criticalMode') - }}</span> - <b-form-input - v-model="temperatureCriticalInput" - type="number" - :min="temperatureNonNormalInput" - :max="temperatureWarningInput" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.temperatureWarning') - }}</span> - <b-form-input - v-model="temperatureWarningInput" - type="number" - :min="temperatureCriticalInput" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateTemperature" + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <!-- Temperature Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_1 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/temperature-icon.svg" /> + <span class="bold-16px">{{ $t('subHeader.temperature') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_1" class="nav-item__nav"> + <!-- Temperature Limit Inputs --> + <div class="limit-container"> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/non-normal.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.nonNormalMode') + }}</span> + <b-form-input + v-model="temperatureNonNormalInput" + type="number" + :min="0" + :max="temperatureCriticalInput" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Temperature Tables --> - <temperature-table - :time-scale="timeScale" - :warning="temperatureWarning" - :non-normal="temperatureNonNormal" - :critical-start="temperatureCritical" - /> - <accessory-table :records="accessoryData.temperatureTable" /> - </b-collapse> - </div> - <!-- Frequency Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_2 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/frequency-icon.svg" /> - <span class="bold-16px">{{ $t('subHeader.frequency') }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_2" class="nav-item__nav"> - <div class="limit-container"> - <div class="frequency-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.frequencyWarning') - }}</span> - <b-form-input - v-model="frequencyWarningInput" - :min="0" - :max="1000" - type="number" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateFrequency" + <div class="trmperature-limt"> + <img src="@/assets/images/labels/critical.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.criticalMode') + }}</span> + <b-form-input + v-model="temperatureCriticalInput" + type="number" + :min="temperatureNonNormalInput" + :max="temperatureWarningInput" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Frequency Table --> - <frequency-table - :time-scale="timeScale" - :warning="frequencyWarning" - /> - <accessory-table :records="accessoryData.frequencyTable" /> - <!-- <frequency-table /> --> - </b-collapse> - </div> - <!-- Power Consumption Section --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_3 - variant="link" - class="collapse-button semi-bold-16px" - > - <img src="@/assets/images/power-icon.svg" /> - <span class="bold-16px">{{ $t('subHeader.powerConsumption') }}</span> - <component :is="iconChevronUp" class="icon-expand" /> - </b-button> - <b-collapse id="toggle-collapse_3" class="nav-item__nav"> - <div class="limit-container"> - <div class="frequency-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.powerWarning') - }}</span> - <b-form-input - v-model="powerWarningInput" - type="number" - :min="0" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="frequency-limt"> - <img src="@/assets/images/labels/shutdown.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.powerShutdown') - }}</span> - <b-form-input - v-model="powerShutdownInput" - type="number" - :min="0" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updatePower" + <div class="trmperature-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.temperatureWarning') + }}</span> + <b-form-input + v-model="temperatureWarningInput" + type="number" + :min="temperatureCriticalInput" + :max="100" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Power Consumption Table --> - <power-table - :time-scale="timeScale" - :warning="powerWarning" - :shutdown="powerShutdown" - /> - <!-- <power-table /> --> - <accessory-table :records="accessoryData.powerTable" /> - </b-collapse> - </div> - <!-- <page-section class="bootstrap-table__section"> </page-section> --> + <b-button + class="save-button" + variant="primary" + @click="updateTemperature" + > + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Temperature Tables --> + <temperature-table + :time-scale="timeScale" + :warning="temperatureWarning" + :non-normal="temperatureNonNormal" + :critical-start="temperatureCritical" + /> + <accessory-table :records="accessoryData.temperatureTable" /> + </b-collapse> + </div> + <!-- Frequency Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_2 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/frequency-icon.svg" /> + <span class="bold-16px">{{ $t('subHeader.frequency') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_2" class="nav-item__nav"> + <div class="limit-container"> + <div class="frequency-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.frequencyWarning') + }}</span> + <b-form-input + v-model="frequencyWarningInput" + :min="0" + :max="1000" + type="number" + class="form-control medium-12px" + > + </b-form-input> + </div> + <b-button + class="save-button" + variant="primary" + @click="updateFrequency" + > + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Frequency Table --> + <frequency-table :time-scale="timeScale" :warning="frequencyWarning" /> + <accessory-table :records="accessoryData.frequencyTable" /> + <!-- <frequency-table /> --> + </b-collapse> + </div> + <!-- Power Consumption Section --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_3 + variant="link" + class="collapse-button semi-bold-16px" + > + <img src="@/assets/images/power-icon.svg" /> + <span class="bold-16px">{{ $t('subHeader.powerConsumption') }}</span> + <component :is="iconChevronUp" class="icon-expand" /> + </b-button> + <b-collapse id="toggle-collapse_3" class="nav-item__nav"> + <div class="limit-container"> + <div class="frequency-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.powerWarning') + }}</span> + <b-form-input + v-model="powerWarningInput" + type="number" + :min="0" + :max="100" + class="form-control medium-12px" + > + </b-form-input> + </div> + <div class="frequency-limt"> + <img src="@/assets/images/labels/shutdown.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.powerShutdown') + }}</span> + <b-form-input + v-model="powerShutdownInput" + type="number" + :min="0" + :max="100" + class="form-control medium-12px" + > + </b-form-input> + </div> + <b-button class="save-button" variant="primary" @click="updatePower"> + {{ $t('global.action.save') }} + </b-button> + </div> + <!-- Power Consumption Table --> + <power-table + :time-scale="timeScale" + :warning="powerWarning" + :shutdown="powerShutdown" + /> + <!-- <power-table /> --> + <accessory-table :records="accessoryData.powerTable" /> + </b-collapse> </div> + <!-- <page-section class="bootstrap-table__section"> </page-section> --> </b-container> </template> <script> diff --git a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue index 7baa7e677..a717fdcf8 100644 --- a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue +++ b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue @@ -4,77 +4,72 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <page-section class="bootstrap-table__section"> - <span class="bold-16px">{{ - $t('pageInventory.installedProcessors') - }}</span> - <!-- Processors Specification Table --> - <div class="capability-info"> - <b-row> - <b-col class="mt-0 mb-2 p-0 bold-12px__caps"> - {{ $t('pageInventory.table.processorCapabilityInfo') }} - </b-col> - </b-row> - <b-row> - <b-col class="mt-2 p-0" sm="3" xl="3"> - <dl class="light-12px"> - <dd class="attrib-names"> - {{ $t('global.table.attributes') }} - </dd> - <dd>{{ 'Многопоточность' }}</dd> - <dd>{{ 'Виртуализация' }}</dd> - <dd>{{ 'Турбо режим' }}</dd> - </dl> - </b-col> - <b-col class="mt-2 p-0" sm="3" xl="3"> - <dl class="light-12px"> - <dd class="attrib-names">{{ 'Состояние присутсвия' }}</dd> - <dd - v-for="item in processors[0].presence_status" - :key="item.presence_status" + <page-section class="bootstrap-table__section"> + <span class="bold-16px">{{ + $t('pageInventory.installedProcessors') + }}</span> + <!-- Processors Specification Table --> + <div class="capability-info"> + <b-row> + <b-col class="mt-0 mb-2 p-0 bold-12px__caps"> + {{ $t('pageInventory.table.processorCapabilityInfo') }} + </b-col> + </b-row> + <b-row> + <b-col class="mt-2 p-0" sm="3" xl="3"> + <dl class="light-12px"> + <dd class="attrib-names"> + {{ $t('global.table.attributes') }} + </dd> + <dd>{{ 'Многопоточность' }}</dd> + <dd>{{ 'Виртуализация' }}</dd> + <dd>{{ 'Турбо режим' }}</dd> + </dl> + </b-col> + <b-col class="mt-2 p-0" sm="3" xl="3"> + <dl class="light-12px"> + <dd class="attrib-names">{{ 'Состояние присутсвия' }}</dd> + <dd + v-for="item in processors[0].presence_status" + :key="item.presence_status" + > + {{ item }} + </dd> + </dl> + </b-col> + <b-col class="mt-2 p-0" sm="3" xl="3"> + <dl class="light-12px"> + <!-- Status state --> + <dd class="attrib-names">{{ 'Включен' }}</dd> + <dd> + <b-form-checkbox + v-model="processors[0].statuses.multithreading" + switch > - {{ item }} - </dd> - </dl> - </b-col> - <b-col class="mt-2 p-0" sm="3" xl="3"> - <dl class="light-12px"> - <!-- Status state --> - <dd class="attrib-names">{{ 'Включен' }}</dd> - <dd> - <b-form-checkbox - v-model="processors[0].statuses.multithreading" - switch - > - </b-form-checkbox> - </dd> - <dd> - <b-form-checkbox - v-model="processors[0].statuses.virtualization" - switch - > - </b-form-checkbox> - </dd> - <dd> - <b-form-checkbox - v-model="processors[0].statuses.turbo" - switch - > - </b-form-checkbox> - </dd> - </dl> - </b-col> - </b-row> - </div> - <processors-specification-table /> - <span class="bold-16px">{{ - $t('pageInventory.installedAccelerator') - }}</span> - <!-- Accelerators Specification Table --> - <accelerator-specification-table /> - </page-section> - </div> + </b-form-checkbox> + </dd> + <dd> + <b-form-checkbox + v-model="processors[0].statuses.virtualization" + switch + > + </b-form-checkbox> + </dd> + <dd> + <b-form-checkbox v-model="processors[0].statuses.turbo" switch> + </b-form-checkbox> + </dd> + </dl> + </b-col> + </b-row> + </div> + <processors-specification-table /> + <span class="bold-16px">{{ + $t('pageInventory.installedAccelerator') + }}</span> + <!-- Accelerators Specification Table --> + <accelerator-specification-table /> + </page-section> </b-container> </template> diff --git a/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue b/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue index ed4ee19c8..8506f1438 100644 --- a/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue +++ b/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue @@ -1,136 +1,131 @@ <template> <b-container fluid="xxl pt-0 m-0"> <page-title /> - <div class="main-container"> - <div class="tables-container"> - <div class="server-table"> - <span class="semi-bold-16px">{{ - $t('global.status.serverStatus') - }}</span> + <div class="tables-container"> + <div class="server-table"> + <span class="semi-bold-16px">{{ + $t('global.status.serverStatus') + }}</span> + <b-table + show-empty + responsive="md" + class="bootstrap-analytical-table" + :items="serverItems" + :fields="server_fields" + > + <template #cell(value)="{ value }"> + <b-col v-if="value"> + <img + src="@/assets/images/icon-ok.svg" + class="system-network-table__icon" + /> + </b-col> + <b-col v-else> + <img + src="@/assets/images/icon-no.svg" + class="system-network-table__icon" + /> + </b-col> + </template> + </b-table> + </div> + <div class="events-table"> + <span class="semi-bold-16px">{{ $t('global.action.events') }}</span> + <div id="events-table-wrapper"> <b-table show-empty + :sticky-header="stickyHeader" responsive="md" class="bootstrap-analytical-table" - :items="serverItems" - :fields="server_fields" + :no-border-collapse="true" + :items="eventsItems" + :fields="events_fields" > - <template #cell(value)="{ value }"> - <b-col v-if="value"> - <img - src="@/assets/images/icon-ok.svg" - class="system-network-table__icon" - /> - </b-col> - <b-col v-else> - <img - src="@/assets/images/icon-no.svg" - class="system-network-table__icon" - /> - </b-col> + <template #cell(date)="{ value }"> + <img + src="@/assets/images/event-logs/time.svg" + class="sourse__img" + /> + <span class="regular-12px quaternary"> {{ value }} </span> </template> - </b-table> - </div> - <div class="events-table"> - <span class="semi-bold-16px">{{ $t('global.action.events') }}</span> - <div id="events-table-wrapper"> - <b-table - show-empty - :sticky-header="stickyHeader" - responsive="md" - class="bootstrap-analytical-table" - :no-border-collapse="true" - :items="eventsItems" - :fields="events_fields" - > - <template #cell(date)="{ value }"> - <img - src="@/assets/images/event-logs/time.svg" - class="sourse__img" - /> - <span class="regular-12px quaternary"> {{ value }} </span> - </template> - <template #cell(type)="{ value }"> - <span - v-if="value === 'Критические'" - class="bold-12px__caps errors" - >{{ value }}</span - > - <span - v-else-if="value === 'Предупреждения'" - class="bold-12px__caps warning" - > - {{ value }} - </span> - <span v-else class="bold-12px__caps information">{{ - value - }}</span> - </template> - <template #cell(description)="data"> - <b-row class="semi-bold-16px tretiatry"> - {{ data.item.description.name }} - </b-row> - <b-row - class="regular-12px tretiatry pointer" - @click="toggleRowDetails(data)" - > - {{ data.item.description.description }}</b-row - > - </template> - <template #row-details="{ index }"> - <b-container fluid> - <b-col class="mt-1 mb-2 regular-12px tretiatry"> - <span class="row-details"> - {{ - `Краткое описание ошибки или сообщение которое состоит из текста указывающего на предмет ошибки.Краткое описание ошибки или сообщение которое состоит из текста указывающего на предмет ошибки. + <template #cell(type)="{ value }"> + <span + v-if="value === 'Критические'" + class="bold-12px__caps errors" + >{{ value }}</span + > + <span + v-else-if="value === 'Предупреждения'" + class="bold-12px__caps warning" + > + {{ value }} + </span> + <span v-else class="bold-12px__caps information">{{ + value + }}</span> + </template> + <template #cell(description)="data"> + <b-row class="semi-bold-16px tretiatry"> + {{ data.item.description.name }} + </b-row> + <b-row + class="regular-12px tretiatry pointer" + @click="toggleRowDetails(data)" + > + {{ data.item.description.description }}</b-row + > + </template> + <template #row-details="{ index }"> + <b-container fluid> + <b-col class="mt-1 mb-2 regular-12px tretiatry"> + <span class="row-details"> + {{ + `Краткое описание ошибки или сообщение которое состоит из текста указывающего на предмет ошибки.Краткое описание ошибки или сообщение которое состоит из текста указывающего на предмет ошибки. Краткое описание ошибки или сообщение которое состоит из текста указывающего на предмет ошибки.Краткое описание ошибки или сообщение которое состоит из текста указывающего на предмет ошибки.` - }} - {{ $t(eventsItems[index].description.description) }} - </span> - </b-col> - </b-container> - </template> - </b-table> - </div> + }} + {{ $t(eventsItems[index].description.description) }} + </span> + </b-col> + </b-container> + </template> + </b-table> </div> </div> - <div class="indicators-container"> - <span class="bold-16px">{{ $t('global.status.indicators') }}</span> - <span class="indicators-units regular-12px tretiatry"> - {{ $t('global.units.unit') }}</span + </div> + <div class="indicators-container"> + <span class="bold-16px">{{ $t('global.status.indicators') }}</span> + <span class="indicators-units regular-12px tretiatry"> + {{ $t('global.units.unit') }}</span + > + <b-button id="popover-choice-1" variant="unstiled"> + <span class="regular-12px units-label"> + {{ + $t(`global.units.${unit === 'Ампераж' ? 'amper' : 'volt'}`) + }}</span > - <b-button id="popover-choice-1" variant="unstiled"> - <span class="regular-12px units-label"> - {{ - $t(`global.units.${unit === 'Ампераж' ? 'amper' : 'volt'}`) - }}</span - > - <img class="units__icon" src="@/assets/images/icon-chevron-red.svg" /> - </b-button> - </div> - <two-chioce-popover - :id="1" - fitst-option="Ампераж" - second-option="Вольтаж" - :chosen-option="unit" - :first-action="selectAmper" - :second-action="selectVolt" - /> - <!-- <unit-popover + <img class="units__icon" src="@/assets/images/icon-chevron-red.svg" /> + </b-button> + </div> + <two-chioce-popover + :id="1" + fitst-option="Ампераж" + second-option="Вольтаж" + :chosen-option="unit" + :first-action="selectAmper" + :second-action="selectVolt" + /> + <!-- <unit-popover :select-amper="selectAmper" :select-volt="selectVolt" :unit="unit" /> --> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <accessory-table :records="accessoryData.power" /> - <power-table :time-scale="timeScale" /> - <div class="tables-container"> - <span class="semi-bold-16px">Управление</span> - </div> - <control-system /> + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <accessory-table :records="accessoryData.power" /> + <power-table :time-scale="timeScale" /> + <div class="tables-container"> + <span class="semi-bold-16px">Управление</span> </div> + <control-system /> </b-container> </template> diff --git a/src/views/SILA/EventLogs/EventLogs.vue b/src/views/SILA/EventLogs/EventLogs.vue index aca17ac0d..c7f65e8b8 100644 --- a/src/views/SILA/EventLogs/EventLogs.vue +++ b/src/views/SILA/EventLogs/EventLogs.vue @@ -2,7 +2,7 @@ <b-container :style="{ display: 'flex', 'flex-direction': 'column' }" fluid="xxl pt-0 m-0" - class="event-logs-section" + class="logs-section" > <page-title /> <div class="event-log-head-container"> @@ -253,7 +253,7 @@ <template #row-details="{ item }"> <b-container fluid - style="border-bottom: 1px solid rgba(26, 62, 91, 0.2)" + style="border-bottom: 1px solid rgba(26, 62, 91, 0.1)" > <b-col class="mt-1 mb-2 regular-12px tretiatry"> <span class="row-details"> @@ -265,7 +265,7 @@ </b-table> </div> <div class="pagination-container"> - <div class="pagination-content"> + <div style="margin-left: 10px" class="pagination-content"> <span class="semi-bold-16px"> Страницы </span> <b-pagination v-model="currentPage" @@ -672,19 +672,6 @@ export default { }; </script> <style lang="scss"> -.event-logs-section .table.b-table > thead > tr > [aria-sort='ascending'] { - background-image: url('../../../assets/images/event-logs/sort-icon-rotate.svg'); -} - -.event-logs-section .table.b-table > thead > tr > [aria-sort='descending'], -.table.b-table > thead > tr > [aria-sort='none'] { - background-image: url('../../../assets/images/event-logs/sort-icon.svg'); -} - -.event-logs-section .b-table-sort-icon-left { - background-size: 15px !important; -} - .b-table-details > td { padding: 0px !important; } @@ -802,7 +789,6 @@ $toolbar-height: 64px; } .pagination-content { - width: 300px; display: flex; flex-direction: row; align-items: center; diff --git a/src/views/SILA/NetworkAdapters/Dynamic/NetworkDynamicPage.vue b/src/views/SILA/NetworkAdapters/Dynamic/NetworkDynamicPage.vue index 95267ece1..e50bc399d 100644 --- a/src/views/SILA/NetworkAdapters/Dynamic/NetworkDynamicPage.vue +++ b/src/views/SILA/NetworkAdapters/Dynamic/NetworkDynamicPage.vue @@ -4,43 +4,38 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <div class="limit-container"> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.temperatureWarning') - }}</span> - <b-form-input - v-model="temperatureWarningInput" - type="number" - :min="0" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateTemperature" + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <div class="limit-container"> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.temperatureWarning') + }}</span> + <b-form-input + v-model="temperatureWarningInput" + type="number" + :min="0" + :max="100" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> </div> - <!-- Temperature Table --> - <temperature-table - :time-scale="timeScale" - :warning="temperatureWarning" - :non-normal="temperatureNonNormal" - :critical-start="temperatureCriticalStart" - /> - <accessory-table :records="accessoryData.temperatureTable" /> + <b-button + class="save-button" + variant="primary" + @click="updateTemperature" + > + {{ $t('global.action.save') }} + </b-button> </div> + <!-- Temperature Table --> + <temperature-table + :time-scale="timeScale" + :warning="temperatureWarning" + :non-normal="temperatureNonNormal" + :critical-start="temperatureCriticalStart" + /> + <accessory-table :records="accessoryData.temperatureTable" /> </b-container> </template> <script> diff --git a/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue b/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue index 74e7ee2ca..16aeec10d 100644 --- a/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue +++ b/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue @@ -4,197 +4,195 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <data-tabs - :slots="adaptersSlots" - :switch-tab="switchAdapterSlot" - :current-tab="currentAdapterSlot" - :slot-width="85" - :slider-width="60" - style="margin-top: 16px" - /> - <page-section class="bootstrap-table__section"> - <div class="settings-container"> - <span class="bold-16px">{{ $t('appNavigation.settings') }}</span> - <apply-settings-popover - :appaly-on-reload="appalyOnReload" - :appaly-option1="appalyOption1" - :appaly-option2="appalyOption2" - :apply-type="applyType" - /> - <b-button variant="primary" class="apply-button"> - {{ $t('global.action.acceptChanges') }} - </b-button> - </div> - <span class="bold-12px__caps"> - {{ $t('pageNetwork.macAddress') }} - </span> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" - :items="items" - :fields="fields" - > - <template #cell(value)="data"> - <b-row> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - <b-col> - <img - src="@/assets/images/icon-edit.svg" - class="icon-chevron icon-edit" - /> - </b-col> - </b-row> - </template> - </b-table> - <span class="bold-12px__caps"> - {{ $t('adapters.settings') }} - </span> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" - :items="items_2" - :fields="fields" - > - <template #cell(value)="data"> - <b-row v-if="data.index === 3" class="multiple-select-container"> - <b-col v-if="selected.length" class="chip-column"> - <b-row class="chip-container"> - <div - v-for="item in selected" - :key="item.value" - class="custom-chip" - > - <span> {{ item.text }} </span> - <img - class="clear-icon" - src="@/assets/images/popups/x-icon.svg" - @click="optionRemove(item.value)" - /> - </div> - </b-row> - </b-col> - <b-col v-else> - {{ 'Не выбрано ' }} - </b-col> - <b-col class="icon-container"> - <b-button id="popover-boot" variant="toogle-popover"> - <img :is="iconChevron" class="icon-chevron" /> - </b-button> - <b-popover - placement="left" - triggers="focus" - :show.sync="show" - custom-class="boot-popover" - target="popover-boot" + <data-tabs + :slots="adaptersSlots" + :switch-tab="switchAdapterSlot" + :current-tab="currentAdapterSlot" + :slot-width="85" + :slider-width="60" + style="margin-top: 16px" + /> + <page-section class="bootstrap-table__section"> + <div class="settings-container"> + <span class="bold-16px">{{ $t('appNavigation.settings') }}</span> + <apply-settings-popover + :appaly-on-reload="appalyOnReload" + :appaly-option1="appalyOption1" + :appaly-option2="appalyOption2" + :apply-type="applyType" + /> + <b-button variant="primary" class="apply-button"> + {{ $t('global.action.acceptChanges') }} + </b-button> + </div> + <span class="bold-12px__caps"> + {{ $t('pageNetwork.macAddress') }} + </span> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes_odd" + :items="items" + :fields="fields" + > + <template #cell(value)="data"> + <b-row> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + <b-col> + <img + src="@/assets/images/icon-edit.svg" + class="icon-chevron icon-edit" + /> + </b-col> + </b-row> + </template> + </b-table> + <span class="bold-12px__caps"> + {{ $t('adapters.settings') }} + </span> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes_odd" + :items="items_2" + :fields="fields" + > + <template #cell(value)="data"> + <b-row v-if="data.index === 3" class="multiple-select-container"> + <b-col v-if="selected.length" class="chip-column"> + <b-row class="chip-container"> + <div + v-for="item in selected" + :key="item.value" + class="custom-chip" > - <b-form-group - v-slot="{ ariaDescribedby }" - class="checkbox-group" - > - <b-form-checkbox-group - v-model="selected" - :options="options" - :aria-describedby="ariaDescribedby" - class="regular-14px checkbox-container" - stacked - ></b-form-checkbox-group> - </b-form-group> - </b-popover> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span> - {{ data.value ? 'Возможно' : 'Не возможно' }} - </span> - </b-col> - <b-col> - <img :is="iconChevron" class="icon-chevron icon-options" /> - </b-col> - </b-row> - </template> - </b-table> - <span class="bold-12px__caps"> - {{ $t('adapters.propherties') }} - </span> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes" - :items="items_3" - :fields="fields" - > - </b-table> - <div class="settings-container"> - <span class="bold-16px">{{ $t('adapters.PXE') }}</span> - <apply-settings-popover - :id="2" - :appaly-on-reload="appalyOnReload" - :appaly-option1="appalyOption1" - :appaly-option2="appalyOption2" - :apply-type="applyType" - /> - </div> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" - :items="items_4" - :fields="fields" - > - <template #cell(value)="data"> - <b-row class="flex-row"> - <b-col> - <span> - {{ data.value ? 'Включено' : 'Выключено' }} - </span> - </b-col> - <b-col> - <b-form-checkbox v-model="items_4[data.index].value" switch> - </b-form-checkbox> - </b-col> - </b-row> - </template> - </b-table> - <div class="settings-container"> - <span class="bold-16px">{{ $t('adapters.links') }}</span> - </div> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes" - :items="items_5" - :fields="fields" - > - </b-table> - <div class="settings-container"> - <span class="bold-16px">{{ $t('adapters.transceivers') }}</span> - </div> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items_6" - :fields="fields_2" - :empty-text="$t('global.table.emptyMessage')" - > - </b-table> - <div class="microcode-container"> - <span class="bold-16px">{{ - $t('SystemDescription.microcodeAdapter') - }}</span> - <popover - id="popover-reactive-1" - description="adapters.microcodeUpdate" - popup="adapters.microcodeUpdate_popup" - button="global.action.refresh" - :is-microcode-drivers="true" - /> - </div> - </page-section> - </div> + <span> {{ item.text }} </span> + <img + class="clear-icon" + src="@/assets/images/popups/x-icon.svg" + @click="optionRemove(item.value)" + /> + </div> + </b-row> + </b-col> + <b-col v-else> + {{ 'Не выбрано ' }} + </b-col> + <b-col class="icon-container"> + <b-button id="popover-boot" variant="toogle-popover"> + <img :is="iconChevron" class="icon-chevron" /> + </b-button> + <b-popover + placement="left" + triggers="focus" + :show.sync="show" + custom-class="boot-popover" + target="popover-boot" + > + <b-form-group + v-slot="{ ariaDescribedby }" + class="checkbox-group" + > + <b-form-checkbox-group + v-model="selected" + :options="options" + :aria-describedby="ariaDescribedby" + class="regular-14px checkbox-container" + stacked + ></b-form-checkbox-group> + </b-form-group> + </b-popover> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span> + {{ data.value ? 'Возможно' : 'Не возможно' }} + </span> + </b-col> + <b-col> + <img :is="iconChevron" class="icon-chevron icon-options" /> + </b-col> + </b-row> + </template> + </b-table> + <span class="bold-12px__caps"> + {{ $t('adapters.propherties') }} + </span> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes" + :items="items_3" + :fields="fields" + > + </b-table> + <div class="settings-container"> + <span class="bold-16px">{{ $t('adapters.PXE') }}</span> + <apply-settings-popover + :id="2" + :appaly-on-reload="appalyOnReload" + :appaly-option1="appalyOption1" + :appaly-option2="appalyOption2" + :apply-type="applyType" + /> + </div> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes_odd" + :items="items_4" + :fields="fields" + > + <template #cell(value)="data"> + <b-row class="flex-row"> + <b-col> + <span> + {{ data.value ? 'Включено' : 'Выключено' }} + </span> + </b-col> + <b-col> + <b-form-checkbox v-model="items_4[data.index].value" switch> + </b-form-checkbox> + </b-col> + </b-row> + </template> + </b-table> + <div class="settings-container"> + <span class="bold-16px">{{ $t('adapters.links') }}</span> + </div> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes" + :items="items_5" + :fields="fields" + > + </b-table> + <div class="settings-container"> + <span class="bold-16px">{{ $t('adapters.transceivers') }}</span> + </div> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items_6" + :fields="fields_2" + :empty-text="$t('global.table.emptyMessage')" + > + </b-table> + <div class="microcode-container"> + <span class="bold-16px">{{ + $t('SystemDescription.microcodeAdapter') + }}</span> + <popover + id="popover-reactive-1" + description="adapters.microcodeUpdate" + popup="adapters.microcodeUpdate_popup" + button="global.action.refresh" + :is-microcode-drivers="true" + /> + </div> + </page-section> </b-container> </template> diff --git a/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue b/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue index 8184349de..6890f2c0c 100644 --- a/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue +++ b/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue @@ -4,116 +4,114 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <data-tabs - :slots="adaptersSlots" - :switch-tab="switchAdapterSlot" - :current-tab="currentAdapterSlot" - :slot-width="85" - :slider-width="60" - style="margin-top: 16px" - /> - <page-section class="bootstrap-table__section"> - <div class="settings-container"> - <span class="bold-16px">{{ $t('appNavigation.settings') }}</span> - <apply-settings-popover - :appaly-on-reload="appalyOnReload" - :appaly-option1="appalyOption1" - :appaly-option2="appalyOption2" - :apply-type="applyType" - /> - <b-button variant="primary" class="apply-button"> - {{ $t('global.action.acceptChanges') }} - </b-button> - </div> - <span class="bold-12px__caps"> - {{ $t('adapters.wwnAddres') }} - </span> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" - :items="items" - :fields="fields" - > - <template #cell(value)="data"> - <b-row> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - <b-col> - <img - src="@/assets/images/icon-edit.svg" - class="icon-chevron icon-edit" - /> - </b-col> - </b-row> - </template> - </b-table> - <span class="bold-12px__caps"> - {{ $t('adapters.settings') }} - </span> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" - :items="items_2" - :fields="fields" - > - <template #cell(value)="data"> - <b-row v-if="data.index === 0 || data.index === 3"> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - </b-row> - <b-row v-else-if="data.index === 4"> - <b-col> - <span> - {{ data.value ? 'Включено' : 'Выключено' }} - </span> - </b-col> - <b-col> - <img :is="iconChevron" class="icon-chevron icon-options" /> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - <b-col> - <img :is="iconChevron" class="icon-chevron icon-options" /> - </b-col> - </b-row> - </template> - </b-table> - <span class="bold-12px__caps"> - {{ $t('adapters.propherties') }} - </span> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes" - :items="items_3" - :fields="fields" - > - </b-table> - <div class="microcode-container"> - <span class="bold-16px">{{ - $t('SystemDescription.microcodeAdapter') - }}</span> - <popover - id="popover-reactive-1" - description="adapters.microcodeUpdate" - popup="adapters.microcodeUpdate_popup" - button="global.action.refresh" - :is-microcode-drivers="true" - /> - </div> - </page-section> - </div> + <data-tabs + :slots="adaptersSlots" + :switch-tab="switchAdapterSlot" + :current-tab="currentAdapterSlot" + :slot-width="85" + :slider-width="60" + style="margin-top: 16px" + /> + <page-section class="bootstrap-table__section"> + <div class="settings-container"> + <span class="bold-16px">{{ $t('appNavigation.settings') }}</span> + <apply-settings-popover + :appaly-on-reload="appalyOnReload" + :appaly-option1="appalyOption1" + :appaly-option2="appalyOption2" + :apply-type="applyType" + /> + <b-button variant="primary" class="apply-button"> + {{ $t('global.action.acceptChanges') }} + </b-button> + </div> + <span class="bold-12px__caps"> + {{ $t('adapters.wwnAddres') }} + </span> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes_odd" + :items="items" + :fields="fields" + > + <template #cell(value)="data"> + <b-row> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + <b-col> + <img + src="@/assets/images/icon-edit.svg" + class="icon-chevron icon-edit" + /> + </b-col> + </b-row> + </template> + </b-table> + <span class="bold-12px__caps"> + {{ $t('adapters.settings') }} + </span> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes_odd" + :items="items_2" + :fields="fields" + > + <template #cell(value)="data"> + <b-row v-if="data.index === 0 || data.index === 3"> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + </b-row> + <b-row v-else-if="data.index === 4"> + <b-col> + <span> + {{ data.value ? 'Включено' : 'Выключено' }} + </span> + </b-col> + <b-col> + <img :is="iconChevron" class="icon-chevron icon-options" /> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + <b-col> + <img :is="iconChevron" class="icon-chevron icon-options" /> + </b-col> + </b-row> + </template> + </b-table> + <span class="bold-12px__caps"> + {{ $t('adapters.propherties') }} + </span> + <b-table + responsive="md" + class="bootstrap-table bootstrap-table__stripes" + :items="items_3" + :fields="fields" + > + </b-table> + <div class="microcode-container"> + <span class="bold-16px">{{ + $t('SystemDescription.microcodeAdapter') + }}</span> + <popover + id="popover-reactive-1" + description="adapters.microcodeUpdate" + popup="adapters.microcodeUpdate_popup" + button="global.action.refresh" + :is-microcode-drivers="true" + /> + </div> + </page-section> </b-container> </template> diff --git a/src/views/SILA/PciDevices/PciDevicesPage.vue b/src/views/SILA/PciDevices/PciDevicesPage.vue index e25e0606e..7eb410f2b 100644 --- a/src/views/SILA/PciDevices/PciDevicesPage.vue +++ b/src/views/SILA/PciDevices/PciDevicesPage.vue @@ -4,29 +4,27 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <page-section class="bootstrap-table__section"> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(status)> - <b-row> - <b-col> - <img src="@/assets/images/status/on.svg" class="icon-chevron" /> - <span> - {{ 'Работоспособен' }} - </span> - </b-col> - </b-row> - </template> - </b-table> - </page-section> - </div> + <page-section class="bootstrap-table__section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(status)> + <b-row> + <b-col> + <img src="@/assets/images/status/on.svg" class="icon-chevron" /> + <span> + {{ 'Работоспособен' }} + </span> + </b-col> + </b-row> + </template> + </b-table> + </page-section> </b-container> </template> diff --git a/src/views/SILA/PhysicalDrivers/DynamicInfo/DriversDynamicPage.vue b/src/views/SILA/PhysicalDrivers/DynamicInfo/DriversDynamicPage.vue index cd148f7df..1e643ebd5 100644 --- a/src/views/SILA/PhysicalDrivers/DynamicInfo/DriversDynamicPage.vue +++ b/src/views/SILA/PhysicalDrivers/DynamicInfo/DriversDynamicPage.vue @@ -20,72 +20,67 @@ </button> </div> </div> - <div class="main-container"> - <date-switch - :switch-time-scale="switchTimeScale" - :time-scale="timeScale" - /> - <div class="limit-container"> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/non-normal.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.nonNormalMode') - }}</span> - <b-form-input - v-model="temperatureNonNormalInput" - type="number" - :min="0" - :max="temperatureCritical" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/critical.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.criticalMode') - }}</span> - <b-form-input - v-model="temperatureCritical" - type="number" - :min="temperatureNonNormalInput" - :max="temperatureWarningInput" - class="form-control medium-12px" - > - </b-form-input> - </div> - <div class="trmperature-limt"> - <img src="@/assets/images/labels/warning.svg" /> - <span class="semi-bold-12px">{{ - $t('tablesDescription.temperatureWarning') - }}</span> - <b-form-input - v-model="temperatureWarningInput" - type="number" - :min="temperatureCritical" - :max="100" - class="form-control medium-12px" - > - </b-form-input> - </div> - <b-button - class="save-button" - variant="primary" - @click="updateTemperatureLimits" + <date-switch :switch-time-scale="switchTimeScale" :time-scale="timeScale" /> + <div class="limit-container"> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/non-normal.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.nonNormalMode') + }}</span> + <b-form-input + v-model="temperatureNonNormalInput" + type="number" + :min="0" + :max="temperatureCritical" + class="form-control medium-12px" + > + </b-form-input> + </div> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/critical.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.criticalMode') + }}</span> + <b-form-input + v-model="temperatureCritical" + type="number" + :min="temperatureNonNormalInput" + :max="temperatureWarningInput" + class="form-control medium-12px" > - {{ $t('global.action.save') }} - </b-button> + </b-form-input> + </div> + <div class="trmperature-limt"> + <img src="@/assets/images/labels/warning.svg" /> + <span class="semi-bold-12px">{{ + $t('tablesDescription.temperatureWarning') + }}</span> + <b-form-input + v-model="temperatureWarningInput" + type="number" + :min="temperatureCritical" + :max="100" + class="form-control medium-12px" + > + </b-form-input> </div> - <!-- Temperature Table --> - <temperature-table - :time-scale="timeScale" - :warning="temperatureWarning" - :non-normal="temperatureNonNormal" - :critical-start="temperatureCriticalStart" - /> - <accessory-table-drivers :records="accessoryData.table" /> - <accessory-table :records="accessoryData.temperatureTable" /> + <b-button + class="save-button" + variant="primary" + @click="updateTemperatureLimits" + > + {{ $t('global.action.save') }} + </b-button> </div> + <!-- Temperature Table --> + <temperature-table + :time-scale="timeScale" + :warning="temperatureWarning" + :non-normal="temperatureNonNormal" + :critical-start="temperatureCriticalStart" + /> + <accessory-table-drivers :records="accessoryData.table" /> + <accessory-table :records="accessoryData.temperatureTable" /> </b-container> </template> <script> diff --git a/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue b/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue index 452abf886..f54488716 100644 --- a/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue +++ b/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue @@ -4,41 +4,39 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <page-section class="bootstrap-table__section info_section"> - <span class="bold-16px">{{ $t('global.table.info') }}</span> - </page-section> - <data-tabs - :slots="memorySlots" - :switch-tab="switchMemorySlot" - :current-tab="currentMemorySlot" - :slot-width="100" - :slider-width="81" - /> - <page-section class="bootstrap-table__section info_section"> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - </b-table> - <div class="microcode-container"> - <span class="bold-16px">{{ - $t('SystemDescription.microcodeDrivers') - }}</span> - <popover - id="popover-reactive-1" - description="SystemDescription.reloadMicrocodeDrivers" - popup="SystemDescription.reloadMicrocodeDrivers" - button="global.action.refresh" - :is-microcode-drivers="true" - /> - </div> - </page-section> - </div> + <page-section class="bootstrap-table__section info_section"> + <span class="bold-16px">{{ $t('global.table.info') }}</span> + </page-section> + <data-tabs + :slots="memorySlots" + :switch-tab="switchMemorySlot" + :current-tab="currentMemorySlot" + :slot-width="100" + :slider-width="81" + /> + <page-section class="bootstrap-table__section info_section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + </b-table> + <div class="microcode-container"> + <span class="bold-16px">{{ + $t('SystemDescription.microcodeDrivers') + }}</span> + <popover + id="popover-reactive-1" + description="SystemDescription.reloadMicrocodeDrivers" + popup="SystemDescription.reloadMicrocodeDrivers" + button="global.action.refresh" + :is-microcode-drivers="true" + /> + </div> + </page-section> </b-container> </template> diff --git a/src/views/SILA/RAID/Cache/RAIDCachePage.vue b/src/views/SILA/RAID/Cache/RAIDCachePage.vue index f41cd7876..60ca3a816 100644 --- a/src/views/SILA/RAID/Cache/RAIDCachePage.vue +++ b/src/views/SILA/RAID/Cache/RAIDCachePage.vue @@ -4,28 +4,26 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <data-tabs - :slots="raidSlots" - :switch-tab="switchRaidSlot" - :current-tab="currentRaidSlot" - :slot-width="100" - :slider-width="79" - style="margin-top: 16px" - /> - <page-section class="bootstrap-table__section info_section"> - <span class="bold-16px">{{ $t('RAID.cache_info') }}</span> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - </b-table> - </page-section> - </div> + <data-tabs + :slots="raidSlots" + :switch-tab="switchRaidSlot" + :current-tab="currentRaidSlot" + :slot-width="100" + :slider-width="79" + style="margin-top: 16px" + /> + <page-section class="bootstrap-table__section info_section"> + <span class="bold-16px">{{ $t('RAID.cache_info') }}</span> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + </b-table> + </page-section> </b-container> </template> diff --git a/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue b/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue index 614c06d1e..693806662 100644 --- a/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue +++ b/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue @@ -4,137 +4,135 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <data-tabs - :slots="raidSlots" - :switch-tab="switchRaidSlot" - :current-tab="currentRaidSlot" - :slot-width="100" - :slider-width="79" - style="margin-top: 16px" - /> - <page-section class="bootstrap-table__section" style="margin-top: 0px"> - <div class="settings-container"> - <span class="bold-16px">{{ $t('appNavigation.settings') }}</span> - <apply-settings-popover - :appaly-on-reload="appalyOnReload" - :appaly-option1="appalyOption1" - :appaly-option2="appalyOption2" - :apply-type="applyType" - /> - <b-button variant="primary" class="apply-button"> - {{ $t('global.action.acceptChanges') }} - </b-button> - </div> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" + <data-tabs + :slots="raidSlots" + :switch-tab="switchRaidSlot" + :current-tab="currentRaidSlot" + :slot-width="100" + :slider-width="79" + style="margin-top: 16px" + /> + <page-section class="bootstrap-table__section" style="margin-top: 0px"> + <div class="settings-container"> + <span class="bold-16px">{{ $t('appNavigation.settings') }}</span> + <apply-settings-popover + :appaly-on-reload="appalyOnReload" + :appaly-option1="appalyOption1" + :appaly-option2="appalyOption2" + :apply-type="applyType" + /> + <b-button variant="primary" class="apply-button"> + {{ $t('global.action.acceptChanges') }} + </b-button> + </div> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(action)="data"> + <b-row v-if="data.index <= 5"> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + <b-col> + <b-button + :id="`popover-action-${data.index}`" + class="popover-action-ractive" + variant="toogle-popover" + > + <img :is="iconChevron" class="icon-chevron" /> + </b-button> + <action-settings-popover + :id="data.index" + :appaly-on-reload="appalyOnReload" + :appaly-option1="appalyOption1" + :appaly-option2="appalyOption2" + :apply-type="applyType" + /> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + <b-col> + <img + src="@/assets/images/icon-edit.svg" + class="icon-chevron icon-edit" + /> + </b-col> + </b-row> + </template> + </b-table> + </page-section> + <page-section class="bootstrap-table__section"> + <div class="settings-container"> + <span class="bold-16px">{{ $t('RAID.lun') }}</span> + <b-button + variant="primary" + class="apply-button apply-button__lun" + @click="$bvModal.show('add-tome-images')" > - <template #cell(action)="data"> - <b-row v-if="data.index <= 5"> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - <b-col> - <b-button - :id="`popover-action-${data.index}`" - class="popover-action-ractive" - variant="toogle-popover" - > - <img :is="iconChevron" class="icon-chevron" /> - </b-button> - <action-settings-popover - :id="data.index" - :appaly-on-reload="appalyOnReload" - :appaly-option1="appalyOption1" - :appaly-option2="appalyOption2" - :apply-type="applyType" - /> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - <b-col> + {{ $t('global.action.addNew') }} + </b-button> + </div> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items_2" + :fields="fields_2" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(action)="data"> + <b-row> + <b-col> + <span> + {{ data.value }} + </span> + </b-col> + <b-col> + <b-button + :id="`popover-option-${data.index}`" + class="popover-option-ractive" + variant="toogle-popover" + > <img - src="@/assets/images/icon-edit.svg" - class="icon-chevron icon-edit" - /> - </b-col> - </b-row> - </template> - </b-table> - </page-section> - <page-section class="bootstrap-table__section"> - <div class="settings-container"> - <span class="bold-16px">{{ $t('RAID.lun') }}</span> - <b-button - variant="primary" - class="apply-button apply-button__lun" - @click="$bvModal.show('add-tome-images')" - > - {{ $t('global.action.addNew') }} - </b-button> - </div> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items_2" - :fields="fields_2" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(action)="data"> - <b-row> - <b-col> - <span> - {{ data.value }} - </span> - </b-col> - <b-col> - <b-button - :id="`popover-option-${data.index}`" - class="popover-option-ractive" - variant="toogle-popover" - > - <img - src="@/assets/images/icon-options.svg" - class="icon-chevron icon-options" - /> - </b-button> - <options-popover :id="data.index" /> - <tome-modal - :id="`edit-tome${data.index}`" - :title="'Настройка виртуального тома'" - :action="editTome" - :index="data.index" - :item="items_2[data.index]" + src="@/assets/images/icon-options.svg" + class="icon-chevron icon-options" /> - </b-col> - </b-row> - </template> - </b-table> - <div class="microcode-container"> - <span class="bold-16px">{{ $t('RAID.microcode') }}</span> - <popover - id="popover-reactive-1" - description="RAID.microcode_update" - popup="RAID.microcode_popoveer" - button="global.action.refresh" - :is-microcode-drivers="true" - /> - </div> - </page-section> - </div> + </b-button> + <options-popover :id="data.index" /> + <tome-modal + :id="`edit-tome${data.index}`" + :title="'Настройка виртуального тома'" + :action="editTome" + :index="data.index" + :item="items_2[data.index]" + /> + </b-col> + </b-row> + </template> + </b-table> + <div class="microcode-container"> + <span class="bold-16px">{{ $t('RAID.microcode') }}</span> + <popover + id="popover-reactive-1" + description="RAID.microcode_update" + popup="RAID.microcode_popoveer" + button="global.action.refresh" + :is-microcode-drivers="true" + /> + </div> + </page-section> <tome-modal :id="'add-tome-images'" :title="'Новый виртуальный том'" diff --git a/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue b/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue index 057c120bd..44eba030f 100644 --- a/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue +++ b/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue @@ -4,23 +4,69 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <data-tabs - :slots="raidSlots" - :switch-tab="switchRaidSlot" - :current-tab="currentRaidSlot" - :slot-width="100" - :slider-width="79" - style="margin-top: 16px" - /> + <data-tabs + :slots="raidSlots" + :switch-tab="switchRaidSlot" + :current-tab="currentRaidSlot" + :slot-width="100" + :slider-width="79" + style="margin-top: 16px" + /> + <page-section class="bootstrap-table__section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(value)="{ index, value }"> + <b-row v-if="index === 0"> + <b-col> + <img src="@/assets/images/status/on.svg" class="icon-chevron" /> + <span> + {{ 'Работоспособен' }} + </span> + </b-col> + </b-row> + <b-row v-else-if="index === 7"> + <b-col> + <span class="regular-12px pointer" @click="redirectDrivers"> + {{ value }} + </span> + </b-col> + </b-row> + <b-row v-else-if="index === 8"> + <b-col> + <span class="regular-12px pointer" @click="redirectVirtual"> + {{ value }} + </span> + </b-col> + </b-row> + <b-row v-else> + <b-col> + <span>{{ value }}</span> + </b-col> + </b-row> + </template> + </b-table> + </page-section> + <b-button + v-b-toggle.toggle-collapse + variant="link" + class="collapse-button semi-bold-16px" + > + <component :is="iconChevronUp" class="icon-expand-right" /> + {{ $t('RAID.extraParam') }} + </b-button> + <b-collapse id="toggle-collapse" class="nav-item__nav"> <page-section class="bootstrap-table__section"> <b-table responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" + class="bootstrap-table bootstrap-table__stripes" + :items="items_2" + :fields="fields_2" > <template #cell(value)="{ index, value }"> <b-row v-if="index === 0"> @@ -31,20 +77,6 @@ </span> </b-col> </b-row> - <b-row v-else-if="index === 7"> - <b-col> - <span class="regular-12px pointer" @click="redirectDrivers"> - {{ value }} - </span> - </b-col> - </b-row> - <b-row v-else-if="index === 8"> - <b-col> - <span class="regular-12px pointer" @click="redirectVirtual"> - {{ value }} - </span> - </b-col> - </b-row> <b-row v-else> <b-col> <span>{{ value }}</span> @@ -53,44 +85,7 @@ </template> </b-table> </page-section> - <b-button - v-b-toggle.toggle-collapse - variant="link" - class="collapse-button semi-bold-16px" - > - <component :is="iconChevronUp" class="icon-expand-right" /> - {{ $t('RAID.extraParam') }} - </b-button> - <b-collapse id="toggle-collapse" class="nav-item__nav"> - <page-section class="bootstrap-table__section"> - <b-table - responsive="md" - class="bootstrap-table bootstrap-table__stripes" - :items="items_2" - :fields="fields_2" - > - <template #cell(value)="{ index, value }"> - <b-row v-if="index === 0"> - <b-col> - <img - src="@/assets/images/status/on.svg" - class="icon-chevron" - /> - <span> - {{ 'Работоспособен' }} - </span> - </b-col> - </b-row> - <b-row v-else> - <b-col> - <span>{{ value }}</span> - </b-col> - </b-row> - </template> - </b-table> - </page-section> - </b-collapse> - </div> + </b-collapse> </b-container> </template> diff --git a/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue b/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue index bd82757f2..6a4c79e78 100644 --- a/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue +++ b/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue @@ -4,41 +4,39 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <page-section class="bootstrap-table__section info_section"> - <span class="bold-16px">{{ $t('global.table.info') }}</span> - </page-section> - <data-tabs - :slots="memorySlots" - :switch-tab="switchMemorySlot" - :current-tab="currentMemorySlot" - :slot-width="180" - :slider-width="156" - /> - <page-section class="bootstrap-table__section info_section"> - <b-table - responsive="md" - show-empty - class="bootstrap-rounded-table" - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - </b-table> - <div class="microcode-container"> - <span class="bold-16px">{{ - $t('SystemDescription.microcodeDrivers') - }}</span> - <popover - id="popover-reactive-1" - description="SystemDescription.reloadMicrocodeDrivers" - popup="SystemDescription.reloadMicrocodeDrivers" - button="global.action.refresh" - :is-microcode-drivers="true" - /> - </div> - </page-section> - </div> + <page-section class="bootstrap-table__section info_section"> + <span class="bold-16px">{{ $t('global.table.info') }}</span> + </page-section> + <data-tabs + :slots="memorySlots" + :switch-tab="switchMemorySlot" + :current-tab="currentMemorySlot" + :slot-width="180" + :slider-width="156" + /> + <page-section class="bootstrap-table__section info_section"> + <b-table + responsive="md" + show-empty + class="bootstrap-rounded-table" + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + </b-table> + <div class="microcode-container"> + <span class="bold-16px">{{ + $t('SystemDescription.microcodeDrivers') + }}</span> + <popover + id="popover-reactive-1" + description="SystemDescription.reloadMicrocodeDrivers" + popup="SystemDescription.reloadMicrocodeDrivers" + button="global.action.refresh" + :is-microcode-drivers="true" + /> + </div> + </page-section> </b-container> </template> diff --git a/src/views/SystemDescription/Info/SystemDescription.vue b/src/views/SystemDescription/Info/SystemDescription.vue index b5cde9659..0a2bb3052 100644 --- a/src/views/SystemDescription/Info/SystemDescription.vue +++ b/src/views/SystemDescription/Info/SystemDescription.vue @@ -5,63 +5,55 @@ > <page-title /> <!-- System table --> - <div class="main-container"> - <table-system /> - <!-- Notes Administration --> - <section class="notes-section"> - <div class="semi-bold-12px textarea-description"> - <span>{{ $t('SystemDescription.title.Notes') }}</span> + <table-system /> + <!-- Notes Administration --> + <section class="notes-section"> + <div class="semi-bold-12px textarea-description"> + <span>{{ $t('SystemDescription.title.Notes') }}</span> + </div> + <div class="textarea-container"> + <div class="buttons-container"> + <button class="notes-button"> + <img src="@/assets/images/textarea-buttons/button-icon-bold.svg" /> + </button> + <button class="notes-button"> + <img + src="@/assets/images/textarea-buttons/button-icon-cursive.svg" + /> + </button> + <button class="notes-button"> + <img + src="@/assets/images/textarea-buttons/button-icon-underline.svg" + /> + </button> + <button class="notes-button"> + <img + src="@/assets/images/textarea-buttons/button-icon-crossline.svg" + /> + </button> + <button class="notes-button"> + <img src="@/assets/images/textarea-buttons/button-icon-link.svg" /> + </button> + <div class="line"></div> + <button class="notes-button"> + <img src="@/assets/images/textarea-buttons/button-icon-list.svg" /> + </button> + <button class="notes-button"> + <img + src="@/assets/images/textarea-buttons/button-icon-number-list.svg" + /> + </button> </div> - <div class="textarea-container"> - <div class="buttons-container"> - <button class="notes-button"> - <img - src="@/assets/images/textarea-buttons/button-icon-bold.svg" - /> - </button> - <button class="notes-button"> - <img - src="@/assets/images/textarea-buttons/button-icon-cursive.svg" - /> - </button> - <button class="notes-button"> - <img - src="@/assets/images/textarea-buttons/button-icon-underline.svg" - /> - </button> - <button class="notes-button"> - <img - src="@/assets/images/textarea-buttons/button-icon-crossline.svg" - /> - </button> - <button class="notes-button"> - <img - src="@/assets/images/textarea-buttons/button-icon-link.svg" - /> - </button> - <div class="line"></div> - <button class="notes-button"> - <img - src="@/assets/images/textarea-buttons/button-icon-list.svg" - /> - </button> - <button class="notes-button"> - <img - src="@/assets/images/textarea-buttons/button-icon-number-list.svg" - /> - </button> - </div> - <textarea - id="" - name="area" - placeholder="Тут будет текст который ввел администратор и работать в качестве блокнота" - cols="30" - rows="10" - class="notes-textarea" - ></textarea> - </div> - </section> - </div> + <textarea + id="" + name="area" + placeholder="Тут будет текст который ввел администратор и работать в качестве блокнота" + cols="30" + rows="10" + class="notes-textarea" + ></textarea> + </div> + </section> </b-container> </template> diff --git a/src/views/SystemDescription/Network/SystemNetwork.vue b/src/views/SystemDescription/Network/SystemNetwork.vue index 17b487942..72d9e9940 100644 --- a/src/views/SystemDescription/Network/SystemNetwork.vue +++ b/src/views/SystemDescription/Network/SystemNetwork.vue @@ -5,44 +5,42 @@ > <page-title /> <!-- IPv4 --> - <div class="main-container"> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_1 - variant="link" - class="collapse-button semi-bold-16px" - @click="ipv4Handler" - > - {{ $t('SystemDescription.title.Ipv4Settings') }} - <b-form-checkbox - id="checkbox-1" - v-model="ipv4" - @click.native.prevent - ></b-form-checkbox> - </b-button> - <b-collapse id="toggle-collapse_1" class="nav-item__nav"> - <i-pv4-settings ref="system" /> - </b-collapse> - </div> - <!-- IPv6 --> - <div class="page-collapse-decorator"> - <b-button - v-b-toggle.toggle-collapse_2 - variant="link" - class="collapse-button semi-bold-16px" - @click="ipv6Handler" - > - {{ $t('SystemDescription.title.Ipv6Settings') }} - <b-form-checkbox - id="checkbox-2" - v-model="ipv6" - @click.native.prevent - ></b-form-checkbox> - </b-button> - <b-collapse id="toggle-collapse_2" class="nav-item__nav"> - <i-pv6-settings ref="system" /> - </b-collapse> - </div> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_1 + variant="link" + class="collapse-button semi-bold-16px" + @click="ipv4Handler" + > + {{ $t('SystemDescription.title.Ipv4Settings') }} + <b-form-checkbox + id="checkbox-1" + v-model="ipv4" + @click.native.prevent + ></b-form-checkbox> + </b-button> + <b-collapse id="toggle-collapse_1" class="nav-item__nav"> + <i-pv4-settings ref="system" /> + </b-collapse> + </div> + <!-- IPv6 --> + <div class="page-collapse-decorator"> + <b-button + v-b-toggle.toggle-collapse_2 + variant="link" + class="collapse-button semi-bold-16px" + @click="ipv6Handler" + > + {{ $t('SystemDescription.title.Ipv6Settings') }} + <b-form-checkbox + id="checkbox-2" + v-model="ipv6" + @click.native.prevent + ></b-form-checkbox> + </b-button> + <b-collapse id="toggle-collapse_2" class="nav-item__nav"> + <i-pv6-settings ref="system" /> + </b-collapse> </div> </b-container> </template> diff --git a/src/views/SystemDescription/ServerParametrs/ServerParametrs.vue b/src/views/SystemDescription/ServerParametrs/ServerParametrs.vue index bbc461eb7..413b9ae80 100644 --- a/src/views/SystemDescription/ServerParametrs/ServerParametrs.vue +++ b/src/views/SystemDescription/ServerParametrs/ServerParametrs.vue @@ -4,9 +4,7 @@ fluid="xxl pt-0 m-0" > <page-title /> - <div class="main-container"> - <servere-parametrs-section /> - </div> + <servere-parametrs-section /> </b-container> </template> |