diff options
| author | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-10 15:46:55 +0300 |
|---|---|---|
| committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-08-10 15:46:55 +0300 |
| commit | 40a0def4ef50703b17d560895a5167fa1cb435e2 (patch) | |
| tree | d7dc68e3d56505a9c89744ec656414374a60cba4 /src/components | |
| parent | b4d1fb8b8e6e6cdb7be76a2d4fa0d2b9a84f3ba2 (diff) | |
| parent | 40edc2d8ca00c2820161c84d564853942201ceed (diff) | |
| download | webui-vue-40a0def4ef50703b17d560895a5167fa1cb435e2.tar.xz | |
Merge branch 'sila' of git.sila.ru:pub/openbmc/webui-vue into sila
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/_sila/Global/Chart.vue | 8 | ||||
| -rw-r--r-- | src/components/_sila/Global/TableDatePicker.vue | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue index 63f1f0a9..d6ea2492 100644 --- a/src/components/_sila/Global/Chart.vue +++ b/src/components/_sila/Global/Chart.vue @@ -133,8 +133,12 @@ export default { color: this.colors[index], }; }); - - return metricArr; + return metricArr.length > 0 + ? metricArr + : [ + { color: '', data: [], name: '' }, + { color: '', data: [], name: '' }, + ]; }, metricTime() { diff --git a/src/components/_sila/Global/TableDatePicker.vue b/src/components/_sila/Global/TableDatePicker.vue index 397c507f..307389a1 100644 --- a/src/components/_sila/Global/TableDatePicker.vue +++ b/src/components/_sila/Global/TableDatePicker.vue @@ -2,11 +2,13 @@ <b-col class="d-flex align-items-center date-picker"> <span :class="{ 'switch-active': timeScale === 'hour' }" + style="cursor: pointer" @click="switchTimeScale('hour')" >{{ $t('global.datePicker.lastHour') }}</span > <span :class="{ 'switch-active': timeScale === 'day' }" + style="cursor: pointer" @click="switchTimeScale('day')" >{{ $t('global.datePicker.lastDay') }}</span > |