diff options
author | Maksim Zakharov <m.zakharov@IBS.RU> | 2022-06-20 11:52:15 +0300 |
---|---|---|
committer | Maksim Zakharov <m.zakharov@IBS.RU> | 2022-06-20 11:52:15 +0300 |
commit | 931c2cad0da1a84e3df0745b385ec06d29cc2634 (patch) | |
tree | c5ee97bcd812a1a45cd645ab334613cdada13118 /src/views/HardwareStatus/Inventory | |
parent | 58d1eb3b899b730877299be6635adceb127fe6a9 (diff) | |
download | webui-vue-931c2cad0da1a84e3df0745b385ec06d29cc2634.tar.xz |
fix Modals, Tables and Pages: event logs, inventoty, post logs, operttions, global styles
Diffstat (limited to 'src/views/HardwareStatus/Inventory')
9 files changed, 158 insertions, 45 deletions
diff --git a/src/views/HardwareStatus/Inventory/Inventory.vue b/src/views/HardwareStatus/Inventory/Inventory.vue index 0e97f711..bfb930ab 100644 --- a/src/views/HardwareStatus/Inventory/Inventory.vue +++ b/src/views/HardwareStatus/Inventory/Inventory.vue @@ -1,5 +1,5 @@ <template> - <b-container fluid class="p-0 m-0"> + <b-container id="page-inventory" fluid class="p-0 m-0"> <page-title /> <!-- Service indicators --> <service-indicator /> diff --git a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue index f7fef0e3..47edf3a5 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableAssembly.vue @@ -10,6 +10,7 @@ responsive="md" :items="items" :fields="fields" + show-empty :empty-text="$t('global.table.emptyMessage')" :busy="isBusy" > @@ -89,30 +90,44 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'name', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'partNumber', label: this.$t('pageInventory.table.partNumber'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], expandRowLabel: expandRowLabel, diff --git a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue index 41a88c2e..21a07e5f 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue @@ -18,6 +18,7 @@ variant="link" data-test-id="hardwareStatus-button-expandBmc" :title="expandRowLabel" + class="btn-icon-only" @click="toggleRowDetails(row)" > <icon-chevron /> @@ -183,27 +184,43 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', + thStyle: { maxWidth: '27px' }, + tdStyle: { maxWidth: '27px' }, + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'id', label: this.$t('pageInventory.table.id'), 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: 'health', label: this.$t('pageInventory.table.health'), 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: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), 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: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], expandRowLabel: expandRowLabel, @@ -246,37 +263,37 @@ export default { }; </script> <style lang="scss" scoped> -.row { - margin: 0px; - flex-wrap: nowrap; -} -.fans-table-col-first__cell { - display: flex; - flex-flow: row nowrap; - align-items: center; - justify-content: flex-start; -} +// .row { +// margin: 0px; +// flex-wrap: nowrap; +// } +// .fans-table-col-first__cell { +// display: flex; +// flex-flow: row nowrap; +// align-items: center; +// justify-content: flex-start; +// } -.status__img { - margin-right: 7px; -} +// .status__img { +// margin-right: 7px; +// } -.bold-12px__caps { - color: $text-secondary; -} +// .bold-12px__caps { +// color: $text-secondary; +// } -.attrib-names { - border-bottom: 1px solid $faint-secondary-primary-10; - color: $text-secondary !important; - font-weight: 600; -} +// .attrib-names { +// border-bottom: 1px solid $faint-secondary-primary-10; +// color: $text-secondary !important; +// font-weight: 600; +// } -.custom-switch { - margin: 0; -} +// .custom-switch { +// margin: 0; +// } -.btn-link { - width: 30px !important; - height: 20px !important; -} +// .btn-link { +// width: 30px !important; +// height: 20px !important; +// } </style> diff --git a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue index 60f593f4..c213aa97 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue @@ -137,28 +137,41 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'id', label: this.$t('pageInventory.table.id'), 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: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - tdClass: 'text-nowrap', + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), 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: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], expandRowLabel: expandRowLabel, diff --git a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue index 020ab1f6..430e86af 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue @@ -190,28 +190,41 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'id', label: this.$t('pageInventory.table.id'), 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: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - tdClass: 'text-nowrap', + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), 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: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], searchFilter: searchFilter, diff --git a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue index 8706f498..e1932d53 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableFans.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue @@ -129,32 +129,45 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', sortable: false, + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'id', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, sortable: true, - tdClass: 'text-nowrap', + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td', }, { key: 'partNumber', label: this.$t('pageInventory.table.partNumber'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'serialNumber', label: this.$t('pageInventory.table.serialNumber'), formatter: this.dataFormatter, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], searchFilter: searchFilter, diff --git a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue index 9417d9d6..7bb14a52 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue @@ -148,32 +148,45 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', sortable: false, + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'id', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, sortable: true, - tdClass: 'text-nowrap', + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], searchFilter: searchFilter, diff --git a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue index 3e25747d..d81a0490 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue @@ -183,33 +183,46 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', sortable: false, + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'id', label: this.$t('pageInventory.table.id'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, sortable: true, - tdClass: 'text-nowrap', + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), formatter: this.dataFormatter, sortable: true, + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'identifyLed', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, sortable: false, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], processors: [ diff --git a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue index 1576c8d8..9ddcaa69 100644 --- a/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue +++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue @@ -29,7 +29,7 @@ <!-- Health --> <template #cell(health)="{ value }"> <status-icon :status="statusIcon(value)" /> - {{ value }} + {{ statusIcon(value) }} </template> <template #cell(locationIndicatorActive)="{ item }"> @@ -171,34 +171,50 @@ export default { { key: 'expandRow', label: '', - tdClass: 'table-row-expand', + thStyle: { minWidth: '29px' }, + thClass: 'bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-first', + tdClass: 'table-row-expand bootstrap-rounded-table__td', }, { key: 'id', label: this.$t('pageInventory.table.id'), 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: 'hardwareType', label: this.$t('pageInventory.table.hardwareType'), formatter: this.dataFormatter, - tdClass: 'text-nowrap', + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'text-nowrap regular-12px bootstrap-rounded-table__td', }, { key: 'health', label: this.$t('pageInventory.table.health'), formatter: this.dataFormatter, - tdClass: 'text-nowrap', + thClass: 'semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-center', + tdClass: 'regular-12px bootstrap-rounded-table__td', }, { key: 'locationNumber', label: this.$t('pageInventory.table.locationNumber'), 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: 'locationIndicatorActive', label: this.$t('pageInventory.table.identifyLed'), formatter: this.dataFormatter, + thClass: ' semi-bold-12px__caps bootstrap-rounded-table__head_bg', + class: 'bootstrap-rounded-table__column-last', + tdClass: ' bootstrap-rounded-table__td', }, ], expandRowLabel: expandRowLabel, |