diff options
Diffstat (limited to 'src/views/SILA')
12 files changed, 51 insertions, 316 deletions
diff --git a/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue b/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue index 045fc5ef..72e6e77e 100644 --- a/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue +++ b/src/views/SILA/AnalyticalPanel/AnalyticalPanelPage.vue @@ -9,7 +9,8 @@ <b-table show-empty responsive="md" - class="bootstrap-analytical-table" + class="table-analytical" + no-border-collapse :items="serverItems" :fields="server_fields" > @@ -36,8 +37,8 @@ show-empty :sticky-header="stickyHeader" responsive="md" - class="bootstrap-analytical-table" - :no-border-collapse="true" + class="table-analytical" + no-border-collapse :items="eventsItems" :fields="events_fields" > @@ -114,11 +115,6 @@ :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" /> @@ -163,18 +159,12 @@ export default { key: 'param', label: 'Раздел', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-analytical-th', - class: 'bootstrap-analytical-table__column-first', - tdClass: 'regular-12px bootstrap-analytical-table__td', }, { key: 'value', label: 'Статус', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-analytical-th', - class: - 'bootstrap-rounded-table__column-last analytical-table__status', - tdClass: 'regular-12px bootstrap-analytical-table__td', + thStyle: { width: '10%' }, }, ], events_fields: [ @@ -182,25 +172,16 @@ export default { key: 'date', label: 'Время', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-analytical-th', - class: 'bootstrap-analytical-table__column-first', - tdClass: 'regular-12px bootstrap-analytical-table__td', }, { key: 'type', label: 'Тип события', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-analytical-th', - class: 'bootstrap-analytical-table__column-center', - tdClass: 'regular-12px bootstrap-analytical-table__td', }, { key: 'description', label: 'О событии', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-analytical-th', - class: 'bootstrap-analytical-table__column-last', - tdClass: 'regular-12px bootstrap-analytical-table__td', }, ], }; @@ -218,32 +199,6 @@ export default { }, }; </script> -<style lang="scss"> -.analytical-table__status { - width: 10%; -} - -#popover-unit-ractive { - padding-left: 5px; -} - -#popover-unit-ampere { - width: 89px; - height: 28px; - border-radius: 8px; - font-weight: 500; - font-size: 12px; -} - -#popover-unit-volt { - width: 89px; - height: 28px; - border-radius: 8px; - font-weight: 500; - font-size: 12px; - // color: $red-brand-primary; -} -</style> <style lang="scss" scoped> .tables-container { display: flex; diff --git a/src/views/SILA/AnalyticalPanel/helpers.js b/src/views/SILA/AnalyticalPanel/helpers.js index 8655afc3..d1ffd728 100644 --- a/src/views/SILA/AnalyticalPanel/helpers.js +++ b/src/views/SILA/AnalyticalPanel/helpers.js @@ -49,14 +49,10 @@ export const AccessoryData = { { key: 'name', label: 'Наименование', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, { key: 'power', label: 'Текущее значение тока, А', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - tdClass: 'bootstrap-fans-table__td light-12px', }, ], items: [ diff --git a/src/views/SILA/NetworkAdapters/Dynamic/helpers.js b/src/views/SILA/NetworkAdapters/Dynamic/helpers.js index 2be5ce24..65046d01 100644 --- a/src/views/SILA/NetworkAdapters/Dynamic/helpers.js +++ b/src/views/SILA/NetworkAdapters/Dynamic/helpers.js @@ -288,44 +288,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: [ diff --git a/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue b/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue index 92f386fb..aadb6415 100644 --- a/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue +++ b/src/views/SILA/NetworkAdapters/EthernetAdapters/EthernetAdaptersPage.vue @@ -30,7 +30,8 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" + class="table-stripes" + no-border-collapse :items="items" :fields="fields" > @@ -55,7 +56,8 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" + class="table-stripes" + no-border-collapse :items="items_2" :fields="fields" > @@ -123,7 +125,8 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes" + class="table-stripes" + no-border-collapse :items="items_3" :fields="fields" > @@ -140,7 +143,8 @@ </div> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" + class="table-stripes" + no-border-collapse :items="items_4" :fields="fields" > @@ -163,7 +167,8 @@ </div> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes" + class="table-stripes" + no-border-collapse :items="items_5" :fields="fields" > @@ -174,7 +179,8 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items_6" :fields="fields_2" :empty-text="$t('global.table.emptyMessage')" @@ -248,18 +254,11 @@ export default { key: 'param', label: '', formatter: this.dataFormatter, - thClass: 'bootstrap-table__head_bg', - class: 'bootstrap-table__column-first', - tdClass: 'regular-12px bootstrap-table__td', }, { key: 'value', label: '', formatter: this.dataFormatter, - thClass: 'bootstrap-table__head_bg', - class: `bootstrap-table__column-last - bootstrap-table__server-param`, - tdClass: 'regular-12px bootstrap-table__td', }, ], fields_2: [ @@ -267,49 +266,31 @@ export default { key: 'name', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-first', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'model', label: 'Модель', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'number', label: 'Серийный номер', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'type', label: 'Тип устройства', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'firmware', label: 'Прошивка', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'status', label: 'Статус', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], }; @@ -337,16 +318,6 @@ export default { }, }; </script> -<style lang="scss"> -.bootstrap-table__section { - width: auto; -} - -.bootstrap-table__server-param { - width: 30%; -} -</style> - <style lang="scss" scoped> .bold-16px { display: block; diff --git a/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue b/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue index 827d195b..9ccc0509 100644 --- a/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue +++ b/src/views/SILA/NetworkAdapters/FcHbaAdapters/FcHbaAdaptersPage.vue @@ -30,7 +30,8 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" + class="table-stripes" + no-border-collapse :items="items" :fields="fields" > @@ -55,7 +56,8 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes_odd" + class="table-stripes" + no-border-collapse :items="items_2" :fields="fields" > @@ -94,7 +96,8 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes" + class="table-stripes" + no-border-collapse :items="items_3" :fields="fields" > @@ -151,18 +154,11 @@ export default { key: 'param', label: '', formatter: this.dataFormatter, - thClass: 'bootstrap-table__head_bg', - class: 'bootstrap-table__column-first', - tdClass: 'regular-12px bootstrap-table__td', }, { key: 'value', label: '', formatter: this.dataFormatter, - thClass: 'bootstrap-table__head_bg', - class: `bootstrap-table__column-last - bootstrap-table__server-param`, - tdClass: 'regular-12px bootstrap-table__td', }, ], }; @@ -183,17 +179,7 @@ export default { }, }; </script> -<style lang="scss"> -.bootstrap-table__server-param { - width: 30%; -} -</style> - <style lang="scss" scoped> -.bootstrap-table__section { - width: auto; -} - .bold-16px { display: block; margin: 25px 0 16px 0; diff --git a/src/views/SILA/PciDevices/PciDevicesPage.vue b/src/views/SILA/PciDevices/PciDevicesPage.vue index adf754ac..3bc45ca2 100644 --- a/src/views/SILA/PciDevices/PciDevicesPage.vue +++ b/src/views/SILA/PciDevices/PciDevicesPage.vue @@ -4,11 +4,15 @@ fluid="xxl pt-0 m-0" > <page-title /> - <page-section class="bootstrap-table__section"> + <page-section + :section-title="$t('appNavigation.pciDevicesTitle')" + class="bootstrap-table__section" + > <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -41,49 +45,31 @@ export default { key: 'status', label: 'Статус', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-first', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'name', label: 'Имя', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'type', label: 'Тип устройства', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'model', label: 'Модель', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'serial_number', label: 'Серийный номер', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'producer', label: 'Производитель', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], items: [ @@ -127,37 +113,3 @@ export default { }, }; </script> -<style lang="scss"> -.bootstrap-table__stripes tr:nth-of-type(even) { - background-color: rgb(255 255 255); -} -.bootstrap-table__head_bg { - border-top: none; - display: none; -} - -.bootstrap-table__column-first { - border-right: 1px solid rgba(26, 62, 91, 0.1); - border-top: none; -} - -.bootstrap-table__column-last { - border-top: none; -} - -.bootstrap-table__td { - border-top: 1px solid rgba(26, 62, 91, 0.1); -} -</style> - -<style lang="scss" scoped> -.bold-16px { - display: block; - margin: 25px 0 16px 0; -} - -.pointer { - color: $red-brand-primary; - cursor: pointer; -} -</style> diff --git a/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js b/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js index 5bb87b84..9115f9e5 100644 --- a/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js +++ b/src/views/SILA/PhysicalDrivers/DynamicInfo/helpers.js @@ -427,44 +427,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: [ @@ -529,23 +515,17 @@ export const AccessoryData = { { key: 'name', label: 'Имя модуля', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - class: 'SMART-table-col-first', - tdClass: 'bootstrap-fans-table__td light-12px', + thStyle: { width: '34%' }, }, { key: 'SMART', label: 'Текущие значения атрибутов SMART', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - class: 'SMART-table-col-second', - tdClass: 'bootstrap-fans-table__td light-12px', + thStyle: { width: '32%' }, }, { key: 'resource', label: 'Оставшийся ресурс для SSD, Мб', - thClass: 'bootstrap-fans-table__th semi-bold-12px', - class: 'SMART-table-col-last', - tdClass: 'bootstrap-fans-table__td light-12px', + thStyle: { width: '39%' }, }, ], items: [ diff --git a/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue b/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue index d53ff449..d6f31985 100644 --- a/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue +++ b/src/views/SILA/PhysicalDrivers/StaticInfo/DriversStaticPage.vue @@ -18,7 +18,8 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -73,18 +74,12 @@ export default { key: 'parametr', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first - memory-table-col-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '50%' }, }, { key: 'value', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], items: [ @@ -118,12 +113,6 @@ export default { }, }; </script> -<style lang="scss"> -.memory-table-col-first { - width: 50%; -} -</style> - <style lang="scss" scoped> .info_section { margin-bottom: 0px; diff --git a/src/views/SILA/RAID/Cache/RAIDCachePage.vue b/src/views/SILA/RAID/Cache/RAIDCachePage.vue index d4c049a5..54efa48f 100644 --- a/src/views/SILA/RAID/Cache/RAIDCachePage.vue +++ b/src/views/SILA/RAID/Cache/RAIDCachePage.vue @@ -17,7 +17,8 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -47,18 +48,12 @@ export default { key: 'parametr', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first - cache-table-col-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '50%' }, }, { key: 'value', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], items: [ @@ -104,12 +99,6 @@ export default { }, }; </script> -<style lang="scss"> -.cache-table-col-first { - width: 50%; -} -</style> - <style lang="scss" scoped> .bold-16px { display: block; diff --git a/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue b/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue index d6759150..19caafe0 100644 --- a/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue +++ b/src/views/SILA/RAID/Settings/RAIDSettingsPage.vue @@ -28,7 +28,8 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -85,9 +86,11 @@ </b-button> </div> <b-table + id="table-raid-settings" responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items_2" :fields="fields_2" :empty-text="$t('global.table.emptyMessage')" @@ -184,26 +187,17 @@ export default { key: 'parametr', label: 'Имя', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first - settings-table`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '35%' }, }, { key: 'value', label: 'Текущее значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'action', label: 'Действие', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], fields_2: [ @@ -211,33 +205,21 @@ export default { key: 'name', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-first', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'type', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'size', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-center', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'action', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], }; @@ -265,12 +247,6 @@ export default { }, }; </script> -<style lang="scss"> -.settings-table { - width: 35%; -} -</style> - <style lang="scss" scoped> .bold-16px { display: block; diff --git a/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue b/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue index 737126e4..239a41e4 100644 --- a/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue +++ b/src/views/SILA/RAID/Specification/RAIDSpecificationPage.vue @@ -16,7 +16,8 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -64,7 +65,7 @@ <page-section class="bootstrap-table__section"> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes" + class="table-stripes" :items="items_2" :fields="fields_2" > @@ -112,17 +113,12 @@ export default { key: 'parametr', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '50%' }, }, { key: 'value', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], items: [ @@ -168,18 +164,11 @@ export default { key: 'param', label: '', formatter: this.dataFormatter, - thClass: 'bootstrap-table__head_bg', - class: 'bootstrap-table__column-first', - tdClass: 'regular-12px bootstrap-table__td', }, { key: 'value', label: '', formatter: this.dataFormatter, - thClass: 'bootstrap-table__head_bg', - class: `bootstrap-table__column-last - bootstrap-table__server-param`, - tdClass: 'regular-12px bootstrap-table__td', }, ], items_2: [ @@ -219,29 +208,6 @@ export default { }, }; </script> -<style lang="scss"> -.bootstrap-table__stripes tr:nth-of-type(even) { - background-color: rgb(255 255 255); -} -.bootstrap-table__head_bg { - border-top: none; - display: none; -} - -.bootstrap-table__column-first { - border-right: 1px solid rgba(26, 62, 91, 0.1); - border-top: none; -} - -.bootstrap-table__column-last { - border-top: none; -} - -.bootstrap-table__td { - border-top: 1px solid rgba(26, 62, 91, 0.1); -} -</style> - <style lang="scss" scoped> .bold-16px { display: block; diff --git a/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue b/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue index 4292db40..73633901 100644 --- a/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue +++ b/src/views/SILA/VirtualDrivers/VirtualDriversPage.vue @@ -18,7 +18,8 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + class="table-rounded" + no-border-collapse :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -66,18 +67,12 @@ export default { key: 'parametr', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first - memory-table-col-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '50%' }, }, { key: 'value', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: 'bootstrap-rounded-table__column-last', - tdClass: 'regular-12px bootstrap-rounded-table__td', }, ], items: [ @@ -107,12 +102,6 @@ export default { }, }; </script> -<style lang="scss"> -.memory-table-col-first { - width: 50%; -} -</style> - <style lang="scss" scoped> .info_section { margin-bottom: 0px; |