diff options
Diffstat (limited to 'src/views/SystemDescription')
5 files changed, 15 insertions, 73 deletions
diff --git a/src/views/SystemDescription/Info/InventoryTableSystem.vue b/src/views/SystemDescription/Info/InventoryTableSystem.vue index eef0d871..0c32d2c0 100644 --- a/src/views/SystemDescription/Info/InventoryTableSystem.vue +++ b/src/views/SystemDescription/Info/InventoryTableSystem.vue @@ -3,7 +3,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')" @@ -30,18 +31,12 @@ export default { key: 'param', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first - bootstrap-rounded-table__column-first___system-table`, - 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', }, ], expandRowLabel: expandRowLabel, @@ -84,8 +79,3 @@ export default { }, }; </script> -<style lang="scss"> -.bootstrap-rounded-table__column-first___system-table { - width: 50%; -} -</style> diff --git a/src/views/SystemDescription/Network/InventoryIPv4Settings.vue b/src/views/SystemDescription/Network/InventoryIPv4Settings.vue index 94845854..980aee5a 100644 --- a/src/views/SystemDescription/Network/InventoryIPv4Settings.vue +++ b/src/views/SystemDescription/Network/InventoryIPv4Settings.vue @@ -3,7 +3,7 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + no-border-collapse :items="systems" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -46,7 +46,7 @@ @keydown.escape="clickCancel(data)" ></b-form-input> <b-col v-else>{{ data.value }}</b-col> - <b-col class="system-network-table__icon-col"> + <b-col class="table-network__icon"> <b-row v-if="systems[data.index].isEdit"> <img src="@/assets/images/edit-ok.svg" @@ -96,27 +96,18 @@ export default { key: 'param', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first - bootstrap-rounded-table__column-first___ipv-table`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '30%' }, }, { key: 'value', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-center - bootstrap-rounded-table__ipv-table___center`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '20%' }, }, { key: 'comment', 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', }, ], expandRowLabel: expandRowLabel, @@ -197,19 +188,6 @@ export default { }, }; </script> -<style lang="scss"> -.bootstrap-rounded-table__column-first___ipv-table { - width: 30%; -} - -.bootstrap-rounded-table__ipv-table___center { - width: 20%; -} - -.system-network-table__icon-col { - max-width: 20%; -} -</style> <style lang="scss" scoped> .row { align-items: baseline; diff --git a/src/views/SystemDescription/Network/InventoryIPv6Settings.vue b/src/views/SystemDescription/Network/InventoryIPv6Settings.vue index 3f47b1fd..a8c590b1 100644 --- a/src/views/SystemDescription/Network/InventoryIPv6Settings.vue +++ b/src/views/SystemDescription/Network/InventoryIPv6Settings.vue @@ -3,7 +3,7 @@ <b-table responsive="md" show-empty - class="bootstrap-rounded-table" + no-border-collapse :items="systems" :fields="fields" :empty-text="$t('global.table.emptyMessage')" @@ -21,7 +21,7 @@ @keydown.escape="clickCancel(data)" ></b-form-input> <b-col v-else>{{ data.value }}</b-col> - <b-col class="system-network-table__icon-col"> + <b-col class="table-network__icon"> <b-row v-if="systems[data.index].isEdit"> <img src="@/assets/images/edit-ok.svg" @@ -57,7 +57,7 @@ <span class="popup-text">Выключен</span> </button> </div> - <b-col class="system-network-table__icon-col"> + <b-col class="table-network__icon"> <img :is="iconChevron" class="pointer" @@ -93,27 +93,18 @@ export default { key: 'param', label: 'Параметр', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-first___ipv-table - bootstrap-rounded-table__column-first`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '30%' }, }, { key: 'value', label: 'Значение', formatter: this.dataFormatter, - thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', - class: `bootstrap-rounded-table__column-center - bootstrap-rounded-table__ipv-table___center`, - tdClass: 'regular-12px bootstrap-rounded-table__td', + thStyle: { width: '20%' }, }, { key: 'comment', 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', }, ], expandRowLabel: expandRowLabel, diff --git a/src/views/SystemDescription/Network/SystemNetwork.vue b/src/views/SystemDescription/Network/SystemNetwork.vue index 69ede837..19243493 100644 --- a/src/views/SystemDescription/Network/SystemNetwork.vue +++ b/src/views/SystemDescription/Network/SystemNetwork.vue @@ -1,5 +1,6 @@ <template> <b-container + id="page-system-network" :style="{ display: 'flex', 'flex-direction': 'column' }" fluid="xxl pt-0 m-0" > diff --git a/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue b/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue index 03cd1356..f8aebeb6 100644 --- a/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue +++ b/src/views/SystemDescription/ServerParametrs/ServereParametrsSection.vue @@ -5,7 +5,7 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes" + class="table-stripes" :items="queueItems" :fields="fields" > @@ -35,7 +35,7 @@ </span> <b-table responsive="md" - class="bootstrap-table bootstrap-table__stripes" + class="table-stripes" :items="diskItems" :fields="fields" > @@ -57,18 +57,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: 'active', label: '', formatter: this.dataFormatter, - thClass: 'bootstrap-table__head_bg', - class: `bootstrap-table__column-last - bootstrap-table__server-param`, - tdClass: 'regular-12px bootstrap-table__td', }, ], iconChevron, @@ -118,17 +111,6 @@ export default { }, }; </script> -<style lang="scss"> -.bootstrap-table__server-param { - width: 30%; -} - -.system-network-table__icon-col { - max-width: 20%; - margin: 0 5px 0 auto !important; -} -</style> - <style lang="scss" scoped> .row { align-items: center; |