diff options
Diffstat (limited to 'src/views/Processors')
4 files changed, 19 insertions, 132 deletions
diff --git a/src/views/Processors/DynamicInfo/helpers.js b/src/views/Processors/DynamicInfo/helpers.js index bc62bfa0..82e23544 100644 --- a/src/views/Processors/DynamicInfo/helpers.js +++ b/src/views/Processors/DynamicInfo/helpers.js @@ -1225,44 +1225,30 @@ export const AccessoryData = { { key: 'name', label: 'Имя модуля', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'currentTemperature', label: 'Текущее, С°', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'middleTemperature', label: 'Среднее, С°', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'minTemperature', label: 'Минимальное, С°', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'minDate', label: 'Дата минимального', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'maxTemperature', label: 'Максимальное, С°', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'maxDate', label: 'Дата максимального', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, ], items: [ @@ -1327,20 +1313,14 @@ export const AccessoryData = { { key: 'name', label: 'Имя модуля', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'currentFrequency', label: 'Текущее, Hz', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'baseFrequency', label: 'Базовое, Hz', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, ], items: [ @@ -1381,15 +1361,11 @@ export const AccessoryData = { { key: 'name', label: 'Имя модуля', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'currentPower', label: 'Текущее, Вт', label2: '', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, ], items: [ diff --git a/src/views/Processors/Specification/AcceleratorSpecificationTable.vue b/src/views/Processors/Specification/AcceleratorSpecificationTable.vue index c13e13ff..bcdfdbe6 100644 --- a/src/views/Processors/Specification/AcceleratorSpecificationTable.vue +++ b/src/views/Processors/Specification/AcceleratorSpecificationTable.vue @@ -2,7 +2,7 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + no-border-collapse :items="accelerators" :fields="fields" > @@ -54,74 +54,50 @@ export default { { key: 'expandRow', label: '', - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-expand`, - tdClass: 'table-row-expand bootstrap-rounded-table__td', + thStyle: { width: '3%' }, sortable: false, }, { key: 'status', label: 'Статус', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '15%' }, }, { key: 'name', label: 'Имя', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-third`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '10%' }, }, { key: 'slot_number', label: '№ Слота', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-fourth`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '8%' }, }, { key: 'board_number', label: '№ Платы', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-fourth`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '8%' }, }, { key: 'serial_number', label: 'Серийный номер', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '15%' }, }, { key: 'frequency', label: '№ Детали', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-fourth`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '8%' }, }, { key: 'cores', label: 'Версия прошивки', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-last - fans-table-col-third`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '10%' }, }, ], expandRowLabel: expandRowLabel, @@ -129,27 +105,6 @@ export default { }, }; </script> -<style lang="scss"> -.fans-table-col-expand { - width: 3%; -} -.fans-table-col-first { - width: 15%; -} - -.fans-table-col-second { - width: 12%; -} - -.fans-table-col-third { - width: 10%; -} - -.fans-table-col-fourth { - width: 8%; -} -</style> - <style lang="scss" scoped> .row { margin: 0px; diff --git a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue index 02c8eb9c..50362ac2 100644 --- a/src/views/Processors/Specification/ProcessorsSpecificationPage.vue +++ b/src/views/Processors/Specification/ProcessorsSpecificationPage.vue @@ -1,5 +1,6 @@ <template> <b-container + id="page-processors" :style="{ display: 'flex', 'flex-direction': 'column' }" fluid="xxl pt-0 m-0" > diff --git a/src/views/Processors/Specification/ProcessorsSpecificationTable.vue b/src/views/Processors/Specification/ProcessorsSpecificationTable.vue index 07a4512d..31210f50 100644 --- a/src/views/Processors/Specification/ProcessorsSpecificationTable.vue +++ b/src/views/Processors/Specification/ProcessorsSpecificationTable.vue @@ -5,7 +5,7 @@ :sort-desc="true" responsive="md" show-empty - class="bootstrap-rounded-table" + no-border-collapse :items="processors" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -159,74 +159,50 @@ export default { { key: 'expandRow', label: '', - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-expand`, - tdClass: 'table-row-expand bootstrap-rounded-table__td', + thStyle: { width: '3%' }, sortable: false, }, { key: 'status', label: 'Статус', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '17%' }, }, { key: 'name', label: 'Имя', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-second`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '15%' }, }, { key: 'model', label: 'Модель', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-third`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '12%' }, }, { key: 'serialNumber', label: 'Серийный номер', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-second`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '15%' }, }, { key: 'version', label: 'Версия', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-fourth`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '10%' }, }, { key: 'frequency', label: 'Частота', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__without-border - fans-table-col-fourth`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '10%' }, }, { key: 'cores', label: 'Ядра', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-last - fans-table-col-fourth`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '10%' }, }, ], expandRowLabel: expandRowLabel, @@ -234,27 +210,6 @@ export default { }, }; </script> -<style lang="scss"> -.fans-table-col-expand { - width: 3%; -} -.fans-table-col-first { - width: 17%; -} - -.fans-table-col-second { - width: 15%; -} - -.fans-table-col-third { - width: 12%; -} - -.fans-table-col-fourth { - width: 10%; -} -</style> - <style lang="scss" scoped> .row { margin: 0px; |