diff options
author | Dixsie Wolmers <dixsie@ibm.com> | 2021-05-14 19:14:33 +0300 |
---|---|---|
committer | Dixsie Wolmers <dixsiew@gmail.com> | 2021-07-27 17:29:04 +0300 |
commit | 6b8aee9539765949712c72dd8bd02dc232c54a3a (patch) | |
tree | f9fa9b071d946b219af3c300f649f7f3eee29961 /src | |
parent | bc46814bd7b45792c92c76008849b2b312db6196 (diff) | |
download | webui-vue-6b8aee9539765949712c72dd8bd02dc232c54a3a.tar.xz |
Add hardware status power supply missing properties
Adds efficiency percent, identify LED, manufacturer, hardware type,
health and spare part number.
Adds section divider in expanded row.
Signed-off-by: Dixsie Wolmers <dixsie@ibm.com>
Change-Id: I74e146a233f5d3dda849db11e937cb9dea5bcbd7
Diffstat (limited to 'src')
-rw-r--r-- | src/store/modules/Health/PowerSupplyStore.js | 12 | ||||
-rw-r--r-- | src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue | 67 |
2 files changed, 56 insertions, 23 deletions
diff --git a/src/store/modules/Health/PowerSupplyStore.js b/src/store/modules/Health/PowerSupplyStore.js index cc82f2ef..f7be2809 100644 --- a/src/store/modules/Health/PowerSupplyStore.js +++ b/src/store/modules/Health/PowerSupplyStore.js @@ -14,13 +14,16 @@ const PowerSupplyStore = { const { EfficiencyPercent, FirmwareVersion, - IndicatorLED, + LocationIndicatorActive, MemberId, + Manufacturer, Model, + Name, PartNumber, PowerInputWatts, SerialNumber, - Status, + SparePartNumber, + Status = {}, } = powerSupply; return { id: MemberId, @@ -29,9 +32,12 @@ const PowerSupplyStore = { serialNumber: SerialNumber, efficiencyPercent: EfficiencyPercent, firmwareVersion: FirmwareVersion, - indicatorLed: IndicatorLED, + identifyLed: LocationIndicatorActive, + manufacturer: Manufacturer, model: Model, powerInputWatts: PowerInputWatts, + name: Name, + sparePartNumber: SparePartNumber, statusState: Status.State, }; }); diff --git a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue index d313197d..a3d07655 100644 --- a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue +++ b/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue @@ -55,28 +55,56 @@ <b-row> <b-col sm="6" xl="4"> <dl> - <!-- Efficiency percent --> - <dt>{{ $t('pageHardwareStatus.table.efficiencyPercent') }}:</dt> - <dd>{{ tableFormatter(item.efficiencyPercent) }}</dd> - <!-- Firmware version --> - <dt>{{ $t('pageHardwareStatus.table.firmwareVersion') }}:</dt> - <dd>{{ tableFormatter(item.firmwareVersion) }}</dd> - <!-- Indicator LED --> - <dt>{{ $t('pageHardwareStatus.table.indicatorLed') }}:</dt> - <dd>{{ tableFormatter(item.indicatorLed) }}</dd> + <!-- Name --> + <dt>{{ $t('pageHardwareStatus.table.name') }}:</dt> + <dd>{{ tableFormatter(item.name) }}</dd> + <!-- Part number --> + <dt>{{ $t('pageHardwareStatus.table.partNumber') }}:</dt> + <dd>{{ tableFormatter(item.partNumber) }}</dd> + <!-- Serial number --> + <dt>{{ $t('pageHardwareStatus.table.serialNumber') }}:</dt> + <dd>{{ tableFormatter(item.serialNumber) }}</dd> + <!-- Spare part number --> + <dt>{{ $t('pageHardwareStatus.table.sparePartNumber') }}:</dt> + <dd>{{ tableFormatter(item.sparePartNumber) }}</dd> + <!-- Model --> + <dt>{{ $t('pageHardwareStatus.table.model') }}:</dt> + <dd>{{ tableFormatter(item.model) }}</dd> </dl> </b-col> <b-col sm="6" xl="4"> <dl> - <!-- Model --> - <dt>{{ $t('pageHardwareStatus.table.model') }}:</dt> - <dd>{{ tableFormatter(item.model) }}</dd> - <!-- Power input watts --> - <dt>{{ $t('pageHardwareStatus.table.powerInputWatts') }}:</dt> - <dd>{{ tableFormatter(item.powerInputWatts) }}</dd> <!-- Status state --> <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt> <dd>{{ tableFormatter(item.statusState) }}</dd> + <!-- Status Health rollup state --> + <dt> + {{ $t('pageHardwareStatus.table.statusHealthRollup') }}: + </dt> + <dd>{{ tableFormatter(item.statusHealth) }}</dd> + <!-- Efficiency percent --> + <dt>{{ $t('pageHardwareStatus.table.efficiencyPercent') }}:</dt> + <dd>{{ tableFormatter(item.efficiencyPercent) }}</dd> + <!-- Power input watts --> + <dt>{{ $t('pageHardwareStatus.table.powerInputWatts') }}:</dt> + <dd>{{ tableFormatter(item.powerInputWatts) }}</dd> + </dl> + </b-col> + </b-row> + <div class="section-divider mb-3 mt-3"></div> + <b-row> + <b-col sm="6" xl="4"> + <dl> + <!-- Manufacturer --> + <dt>{{ $t('pageHardwareStatus.table.manufacturer') }}:</dt> + <dd>{{ tableFormatter(item.manufacturer) }}</dd> + </dl> + </b-col> + <b-col sm="6" xl="4"> + <dl> + <!-- Firmware version --> + <dt>{{ $t('pageHardwareStatus.table.firmwareVersion') }}:</dt> + <dd>{{ tableFormatter(item.firmwareVersion) }}</dd> </dl> </b-col> </b-row> @@ -133,16 +161,15 @@ export default { tdClass: 'text-nowrap', }, { - key: 'partNumber', - label: this.$t('pageHardwareStatus.table.partNumber'), + key: 'locationNumber', + label: this.$t('pageHardwareStatus.table.locationNumber'), formatter: this.tableFormatter, sortable: true, }, { - key: 'serialNumber', - label: this.$t('pageHardwareStatus.table.serialNumber'), + key: 'identifyLed', + label: this.$t('pageHardwareStatus.table.identifyLed'), formatter: this.tableFormatter, - sortable: true, }, ], searchFilter: searchFilter, |