diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/components/_sila/Global/Chart.vue | 8 | ||||
| -rw-r--r-- | src/components/_sila/Global/TableDatePicker.vue | 2 | ||||
| -rw-r--r-- | src/views/_sila/Fans/Dynamic/FanSpeed.vue | 4 | ||||
| -rw-r--r-- | src/views/_sila/Memory/Dynamic/MemoryTemp.vue | 4 | ||||
| -rw-r--r-- | src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue | 4 | ||||
| -rw-r--r-- | src/views/_sila/Processors/Dynamic/CpuPower.vue | 4 | ||||
| -rw-r--r-- | src/views/_sila/Processors/Dynamic/CpuTemp.vue | 4 |
7 files changed, 23 insertions, 7 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 > diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue index 5cb23218..a13a39ea 100644 --- a/src/views/_sila/Fans/Dynamic/FanSpeed.vue +++ b/src/views/_sila/Fans/Dynamic/FanSpeed.vue @@ -37,7 +37,6 @@ ></chart> <b-table - v-if="items && items.length > 0" responsive="md" show-empty table-variant="accessory" @@ -45,6 +44,7 @@ :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" + :bisy="isBisy" > <template #cell(name)="{ value, index }"> <div @@ -99,6 +99,7 @@ export default { return { warning: 2450, shutdown: 3150, + isBisy: true, fields: [ { key: 'name', @@ -220,6 +221,7 @@ export default { this.startLoader(); this.$store.dispatch('fan/getFansDynamic', payload).finally(() => { this.endLoader(); + this.isBisy = false; }); }, }, diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue index ef60a7e0..74c78d33 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue @@ -53,7 +53,6 @@ :critical="critical" ></chart> <b-table - v-if="items && items.length > 0" responsive="md" show-empty table-variant="accessory" @@ -61,6 +60,7 @@ :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" + :busy="isBisy" > <template #cell(name)="{ value, index }"> <div @@ -111,6 +111,7 @@ export default { warning: 72, notNormal: 44, critical: 55, + isBusy: true, fields: [ { key: 'name', @@ -188,6 +189,7 @@ export default { this.startLoader(); this.$store.dispatch('memory/getMemoryDynamic', payload).finally(() => { this.endLoader(); + this.isBusy = false; }); }, }, diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue index 3f70bd20..0db21e48 100644 --- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue +++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue @@ -30,7 +30,6 @@ :warning="warning" ></chart> <b-table - v-if="items && items.length > 0" responsive="md" show-empty table-variant="accessory" @@ -38,6 +37,7 @@ :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" + :busy="isBisy" > <template #cell(name)="{ value, index }"> <div @@ -86,6 +86,7 @@ export default { data() { return { warning: 72, + isBisy: true, fields: [ { key: 'name', @@ -165,6 +166,7 @@ export default { .dispatch('motherboard/getMotherboardDynamic', payload) .finally(() => { this.endLoader(); + this.isBisy = false; }); }, }, diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue index 7ca9e19b..d0478fa7 100644 --- a/src/views/_sila/Processors/Dynamic/CpuPower.vue +++ b/src/views/_sila/Processors/Dynamic/CpuPower.vue @@ -40,7 +40,6 @@ :shutdown="+shutdown" ></chart> <b-table - v-if="items && items.length > 0" responsive="md" show-empty table-variant="accessory" @@ -48,6 +47,7 @@ :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" + :busy="isBisy" > <template #cell(name)="{ value, index }"> <div @@ -100,6 +100,7 @@ export default { return { warning: 66, shutdown: 88, + isBisy: true, fields: [ { key: 'name', @@ -163,6 +164,7 @@ export default { .dispatch('processors/getCpuPowerDynamic', payload) .finally(() => { this.endLoader(); + this.isBisy = false; }); }, }, diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue index e879cca8..686b9505 100644 --- a/src/views/_sila/Processors/Dynamic/CpuTemp.vue +++ b/src/views/_sila/Processors/Dynamic/CpuTemp.vue @@ -47,7 +47,6 @@ :critical="+critical" ></chart> <b-table - v-if="items && items.length > 0" responsive="md" show-empty table-variant="accessory" @@ -55,6 +54,7 @@ :items="items" :fields="fields" :empty-text="$t('global.table.emptyMessage')" + :busy="isBisy" > <template #cell(name)="{ value, index }"> <div @@ -108,6 +108,7 @@ export default { warning: 72, notNormal: 44, critical: 55, + isBusy: true, fields: [ { key: 'name', @@ -192,6 +193,7 @@ export default { .dispatch('processors/getCpuTempDynamic', payload) .finally(() => { this.endLoader(); + this.isBusy = false; }); }, }, |