diff options
| author | Vitalii Lysak <v.lysak@dunice.net> | 2022-09-08 15:35:43 +0300 |
|---|---|---|
| committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-09-08 15:35:43 +0300 |
| commit | fd00b8d6a01dce5051f6b7c5d08fc07a43bcf03c (patch) | |
| tree | 1263f991cb611e7df05dfba2f4df060ec7a74cce | |
| parent | faf1dc6e9b2e414a0ad25f3e0bdc4d74de054c17 (diff) | |
| parent | 5f5d04c90c06bc7ccdf6c981d9c8de3199266f49 (diff) | |
| download | webui-vue-fd00b8d6a01dce5051f6b7c5d08fc07a43bcf03c.tar.xz | |
Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila
| -rw-r--r-- | src/views/_sila/Overview/OverviewQuickLinks.vue | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/src/views/_sila/Overview/OverviewQuickLinks.vue b/src/views/_sila/Overview/OverviewQuickLinks.vue index ad82ee6f..ca069fe0 100644 --- a/src/views/_sila/Overview/OverviewQuickLinks.vue +++ b/src/views/_sila/Overview/OverviewQuickLinks.vue @@ -5,7 +5,11 @@ <dl> <dt>{{ $t('pageOverview.bmcTime') }}</dt> <dd v-if="liveBmcTime" data-test-id="overviewQuickLinks-text-bmcTime"> - {{ liveBmcTime | formatDate }} {{ liveBmcTime | formatTime }} + {{ liveBmcTime | formatDate }} + <span style="display: inline-block; width: 68px">{{ + liveClock + }}</span> + {{ isUtcDisplay ? $t('pageProfileSettings.UTC') : timezone }} </dd> <dd v-else>--</dd> </dl> @@ -28,13 +32,14 @@ <script> import ArrowRight16 from '@carbon/icons-vue/es/arrow--right/16'; import BVToastMixin from '@/components/_sila/Mixins/BVToastMixin'; +import LocalTimezoneLabelMixin from '@/components/_sila/Mixins/LocalTimezoneLabelMixin'; export default { name: 'QuickLinks', components: { IconArrowRight: ArrowRight16, }, - mixins: [BVToastMixin], + mixins: [BVToastMixin, LocalTimezoneLabelMixin], computed: { liveBmcTime() { if (!this.$store.getters['global/liveBmcTime']) { @@ -42,6 +47,15 @@ export default { } return new Date(this.$store.getters['global/liveBmcTime']); }, + liveClock() { + return this.$store.getters['global/liveClock']; + }, + timezone() { + return this.localOffset(); + }, + isUtcDisplay() { + return this.$store.getters['global/isUtcDisplay']; + }, }, created() { Promise.all([this.$store.dispatch('global/getBmcTime')]).finally(() => { |