diff options
author | Vitalii Lysak <v.lysak@dunice.net> | 2022-07-25 16:09:24 +0300 |
---|---|---|
committer | Vitalii Lysak <v.lysak@dunice.net> | 2022-07-25 16:09:24 +0300 |
commit | d3edcc3990d5760404cf5b78d12cfa5a70310908 (patch) | |
tree | c7c0fafb4f0bc8a91f08fc007745cdc1f2fd6f17 /src/views/_sila/Memory/Dynamic | |
parent | 3f7d5c4d3c5a0e80fe34a728c2a3634c07069f0d (diff) | |
parent | 1cef25c52939c8d24e4146056b718e688df583ae (diff) | |
download | webui-vue-d3edcc3990d5760404cf5b78d12cfa5a70310908.tar.xz |
resolve conflicts
Diffstat (limited to 'src/views/_sila/Memory/Dynamic')
-rw-r--r-- | src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue | 88 |
1 files changed, 45 insertions, 43 deletions
diff --git a/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue index 89d2bfe1..f635e307 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryDynamicPage.vue @@ -14,7 +14,7 @@ <img src="@/assets/images/_sila/collapsed/temperature.svg" /> {{ $t('pageMemory.temperature') }} </b-button> - <b-row class="align-items-end p-2"> + <b-row class="align-items-end p-4"> <b-col xs="12" md="6" lg="3" class="pt-2"> <b-form-group :label="$t('pageMemory.labels.notNormal')"> <b-form-input @@ -53,48 +53,50 @@ </b-button> </b-col> </b-row> - <chart - type="memory" - :colors="colors" - :data="filteredSensors" - :warning="temperatureWarning" - :non-normal="temperatureNonNormal" - :critical-start="temperatureCriticalStart" - ></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 class="pl-4 pr-4"> + <chart + type="memory" + :colors="colors" + :data="filteredSensors" + :warning="temperatureWarning" + :non-normal="temperatureNonNormal" + :critical-start="temperatureCriticalStart" + ></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> </div> </b-container> </template> |