diff options
author | Dixsie Wolmers <dixsie@ibm.com> | 2020-02-13 22:29:40 +0300 |
---|---|---|
committer | Gunnar Mills <gmills@us.ibm.com> | 2020-02-25 01:50:31 +0300 |
commit | 9d40e308fb33d5cef91deb8d78451ab021614898 (patch) | |
tree | 08a2c0b46fecb551bb95becc5138e2803486cef5 /src/views/Overview/Overview.vue | |
parent | 0e893f03bbcb2fa2cc6ce128091ba68b8ea93e8f (diff) | |
download | webui-vue-9d40e308fb33d5cef91deb8d78451ab021614898.tar.xz |
Update overview events table and overview network layout
- Convert events list group to bootstrap table
- Add ethernet interfaces to overview using redfish
Signed-off-by: Dixsie Wolmers <dixsie@ibm.com>
Change-Id: I633f03ba4a65358861664a869b35adf5358c45e6
Diffstat (limited to 'src/views/Overview/Overview.vue')
-rw-r--r-- | src/views/Overview/Overview.vue | 73 |
1 files changed, 35 insertions, 38 deletions
diff --git a/src/views/Overview/Overview.vue b/src/views/Overview/Overview.vue index 9fbc0dd5..17d66849 100644 --- a/src/views/Overview/Overview.vue +++ b/src/views/Overview/Overview.vue @@ -5,11 +5,32 @@ <overview-quick-links /> </div> <b-row> - <b-col lg="8" sm="12"> + <b-col> <page-section :section-title="$t('overview.sectionTitle.serverInformation')" > <b-row> + <b-col> + <dl> + <dt>Firmware version</dt> + <dd>{{ bmcActiveVersion }}</dd> + </dl> + </b-col> + </b-row> + </page-section> + <b-row> + <b-col> + <page-section + :section-title="$t('overview.sectionTitle.networkInformation')" + > + <overview-network /> + </page-section> + </b-col> + </b-row> + </b-col> + <b-col> + <page-section section-title="Server information"> + <b-row> <b-col sm="6"> <dl> <dt>{{ $t('overview.model') }}</dt> @@ -37,36 +58,6 @@ </b-row> </page-section> <page-section - :section-title="$t('overview.sectionTitle.bmcInformation')" - > - <b-row> - <b-col sm="6"> - <dl> - <dt>{{ $t('overview.hostname') }}</dt> - <dd>{{ hostName }}</dd> - </dl> - </b-col> - <b-col sm="6"> - <dl> - <dt>{{ $t('overview.macAddress') }}</dt> - <dd>{{ macAddress }}</dd> - </dl> - </b-col> - <b-col sm="6"> - <dl> - <dt>{{ $t('overview.ipAddress') }}</dt> - <dd v-for="ip in ipAddress" :key="ip.id">{{ ip }}</dd> - </dl> - </b-col> - <b-col sm="6"> - <dl> - <dt>{{ $t('overview.firmwareVersion') }}</dt> - <dd>{{ bmcActiveVersion }}</dd> - </dl> - </b-col> - </b-row> - </page-section> - <page-section :section-title="$t('overview.sectionTitle.powerConsumption')" > <b-row> @@ -74,7 +65,7 @@ <dl> <dt>{{ $t('overview.powerConsumption') }}</dt> <dd v-if="!powerConsumption"> - {{ $t('overview.state.notAvailable') }} + {{ $t('global.state.notAvailable') }} </dd> <dd v-else>{{ powerConsumption }} W</dd> </dl> @@ -83,7 +74,7 @@ <dl> <dt>{{ $t('overview.powerCap') }}</dt> <dd v-if="powerCapData">{{ powerCapData }} W</dd> - <dd v-else>{{ $t('overview.state.notEnabled') }}</dd> + <dd v-else>{{ $t('global.state.notEnabled') }}</dd> </dl> </b-col> </b-row> @@ -101,14 +92,17 @@ <script> import OverviewQuickLinks from './OverviewQuickLinks'; import OverviewEvents from './OverviewEvents'; +import OverviewNetwork from './OverviewNetwork'; import PageTitle from '../../components/Global/PageTitle'; import PageSection from '../../components/Global/PageSection'; import { mapState } from 'vuex'; + export default { name: 'Overview', components: { OverviewQuickLinks, OverviewEvents, + OverviewNetwork, PageTitle, PageSection }, @@ -120,9 +114,7 @@ export default { hostActiveVersion: state => state.firmware.hostActiveVersion, bmcActiveVersion: state => state.firmware.bmcActiveVersion, powerConsumption: state => state.powerConsumption.powerConsumption, - powerCapData: state => state.powerCap.powerCapData, - ipAddress: state => state.networkSettings.ipAddress, - macAddress: state => state.networkSettings.macAddress + powerCapValue: state => state.powerCap.powerCapValue }), created() { this.getOverviewInfo(); @@ -134,7 +126,6 @@ export default { this.$store.dispatch('firmware/getFirmwareInfo'); this.$store.dispatch('powerConsumption/getPowerData'); this.$store.dispatch('powerCap/getPowerCapData'); - this.$store.dispatch('networkSettings/getNetworkData'); } } }; @@ -143,6 +134,12 @@ export default { <style lang="scss" scoped> .quicklinks-section { margin-bottom: $spacer * 2; - margin-left: -1rem; + margin-left: $spacer * -1; +} + +dd { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } </style> |