diff options
| author | Anna Tsyganova <ATSyganova@IBS.RU> | 2022-08-01 16:43:47 +0300 |
|---|---|---|
| committer | Anna Tsyganova <ATSyganova@IBS.RU> | 2022-08-01 16:43:47 +0300 |
| commit | fbdb3b26678211a9cd7fb8683cf48b56d595604e (patch) | |
| tree | aa7a961bbc068beba33666f1a5ecc93413fa7fd2 | |
| parent | 9af6ad1ccd5d332142f6719ca8cf462c0084dfed (diff) | |
| parent | 351834d4d3e62ce863d1c377801db3382abd4d36 (diff) | |
| download | webui-vue-fbdb3b26678211a9cd7fb8683cf48b56d595604e.tar.xz | |
Merge branch 'sila-ui' of git.sila.ru:pub/openbmc/webui-vue into sila-ui
| -rw-r--r-- | src/views/_sila/Memory/Dynamic/MemoryTemp.vue | 88 | ||||
| -rw-r--r-- | src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue | 84 |
2 files changed, 84 insertions, 88 deletions
diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue index 277b537e..2e30683a 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue @@ -43,51 +43,49 @@ </b-button> </b-col> </b-row> - <b-col class="pl-4 pr-4"> - <chart - type="memory" - :colors="colors" - :time-scale="timeScale" - :data="filteredSensors" - :warning="warning" - :not-normal="notNormal" - :critical="critical" - ></chart> - <b-table - v-if="items && items.length > 0" - responsive="md" - show-empty - table-variant="accessory" - hover - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(name)="{ value, index }"> - <div - class="item-color" - :style="`background-color: ${colors[index]}`" - ></div> - {{ value }} - </template> - <template #cell(minDate)="{ value }"> - <span style="color: rgb(12, 28, 41)"> - {{ value.time }} - </span> - <span> - {{ value.date }} - </span> - </template> - <template #cell(maxDate)="{ value }"> - <span style="color: rgb(12, 28, 41)"> - {{ value.time }} - </span> - <span> - {{ value.date }} - </span> - </template> - </b-table> - </b-col> + <chart + type="memory" + :colors="colors" + :time-scale="timeScale" + :data="filteredSensors" + :warning="warning" + :not-normal="notNormal" + :critical="critical" + ></chart> + <b-table + v-if="items && items.length > 0" + responsive="md" + show-empty + table-variant="accessory" + hover + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(name)="{ value, index }"> + <div + class="item-color" + :style="`background-color: ${colors[index]}`" + ></div> + {{ value }} + </template> + <template #cell(minDate)="{ value }"> + <span style="color: rgb(12, 28, 41)"> + {{ value.time }} + </span> + <span> + {{ value.date }} + </span> + </template> + <template #cell(maxDate)="{ value }"> + <span style="color: rgb(12, 28, 41)"> + {{ value.time }} + </span> + <span> + {{ value.date }} + </span> + </template> + </b-table> </div> </template> <script> diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue index a7af65e6..77acc7bd 100644 --- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue +++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue @@ -22,49 +22,47 @@ </b-button> </b-col> </b-row> - <b-col class="pl-4 pr-4"> - <chart - type="motherboard" - :time-scale="timeScale" - :colors="colors" - :data="filteredSensors" - :warning="warning" - ></chart> - <b-table - v-if="items && items.length > 0" - responsive="md" - show-empty - table-variant="accessory" - hover - :items="items" - :fields="fields" - :empty-text="$t('global.table.emptyMessage')" - > - <template #cell(name)="{ value, index }"> - <div - class="item-color" - :style="`background-color: ${colors[index]}`" - ></div> - {{ value }} - </template> - <template #cell(minDate)="{ value }"> - <span style="color: rgb(12, 28, 41)"> - {{ value.time }} - </span> - <span> - {{ value.date }} - </span> - </template> - <template #cell(maxDate)="{ value }"> - <span style="color: rgb(12, 28, 41)"> - {{ value.time }} - </span> - <span> - {{ value.date }} - </span> - </template> - </b-table> - </b-col> + <chart + type="motherboard" + :time-scale="timeScale" + :colors="colors" + :data="filteredSensors" + :warning="warning" + ></chart> + <b-table + v-if="items && items.length > 0" + responsive="md" + show-empty + table-variant="accessory" + hover + :items="items" + :fields="fields" + :empty-text="$t('global.table.emptyMessage')" + > + <template #cell(name)="{ value, index }"> + <div + class="item-color" + :style="`background-color: ${colors[index]}`" + ></div> + {{ value }} + </template> + <template #cell(minDate)="{ value }"> + <span style="color: rgb(12, 28, 41)"> + {{ value.time }} + </span> + <span> + {{ value.date }} + </span> + </template> + <template #cell(maxDate)="{ value }"> + <span style="color: rgb(12, 28, 41)"> + {{ value.time }} + </span> + <span> + {{ value.date }} + </span> + </template> + </b-table> </div> </template> <script> |