summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/assets/styles/bmc/_sila/_forms.scss8
-rw-r--r--src/components/_sila/Global/Chart.vue8
-rw-r--r--src/components/_sila/Global/TableDatePicker.vue2
-rw-r--r--src/layouts/_sila/LoginLayout.vue2
-rw-r--r--src/views/_sila/Fans/Dynamic/FanSpeed.vue4
-rw-r--r--src/views/_sila/Memory/Dynamic/MemoryTemp.vue4
-rw-r--r--src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue4
-rw-r--r--src/views/_sila/Processors/Dynamic/CpuPower.vue4
-rw-r--r--src/views/_sila/Processors/Dynamic/CpuTemp.vue4
9 files changed, 32 insertions, 8 deletions
diff --git a/src/assets/styles/bmc/_sila/_forms.scss b/src/assets/styles/bmc/_sila/_forms.scss
index 1539c96a..aec35370 100644
--- a/src/assets/styles/bmc/_sila/_forms.scss
+++ b/src/assets/styles/bmc/_sila/_forms.scss
@@ -43,6 +43,10 @@ div:not(.search-global) > .form-group {
background-color: $gray-5;
border: none;
}
+ & .custom-select:disabled,
+ .form-control:disabled {
+ position: initial;
+ }
& .input-group-text {
border: none;
background-color: $gray-5;
@@ -164,6 +168,10 @@ div:not(.search-global) > .form-group {
vertical-align: sub;
}
+.custom-radio > .custom-control-label::before {
+ margin-top: -5px;
+}
+
.custom-checkbox .custom-control-input:checked ~ .custom-control-label::after,
.custom-checkbox
.custom-control-input:indeterminate
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/layouts/_sila/LoginLayout.vue b/src/layouts/_sila/LoginLayout.vue
index 5e064a48..a3773d58 100644
--- a/src/layouts/_sila/LoginLayout.vue
+++ b/src/layouts/_sila/LoginLayout.vue
@@ -52,7 +52,7 @@ export default {
width: 45vw;
}
}
-@media (max-width: 750px) {
+@include media-breakpoint-down(sm) {
.login-aside {
display: none;
}
diff --git a/src/views/_sila/Fans/Dynamic/FanSpeed.vue b/src/views/_sila/Fans/Dynamic/FanSpeed.vue
index 5cb23218..6d76afe1 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="isBusy"
>
<template #cell(name)="{ value, index }">
<div
@@ -99,6 +99,7 @@ export default {
return {
warning: 2450,
shutdown: 3150,
+ isBusy: true,
fields: [
{
key: 'name',
@@ -220,6 +221,7 @@ export default {
this.startLoader();
this.$store.dispatch('fan/getFansDynamic', payload).finally(() => {
this.endLoader();
+ this.isBusy = false;
});
},
},
diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue
index ef60a7e0..7d143beb 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="isBusy"
>
<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..9f8d41cb 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="isBusy"
>
<template #cell(name)="{ value, index }">
<div
@@ -86,6 +86,7 @@ export default {
data() {
return {
warning: 72,
+ isBusy: true,
fields: [
{
key: 'name',
@@ -165,6 +166,7 @@ export default {
.dispatch('motherboard/getMotherboardDynamic', payload)
.finally(() => {
this.endLoader();
+ this.isBusy = false;
});
},
},
diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue
index 7ca9e19b..732ddd09 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="isBusy"
>
<template #cell(name)="{ value, index }">
<div
@@ -100,6 +100,7 @@ export default {
return {
warning: 66,
shutdown: 88,
+ isBusy: true,
fields: [
{
key: 'name',
@@ -163,6 +164,7 @@ export default {
.dispatch('processors/getCpuPowerDynamic', payload)
.finally(() => {
this.endLoader();
+ this.isBusy = false;
});
},
},
diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue
index e879cca8..ebe3e22a 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="isBusy"
>
<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;
});
},
},
generated by cgit v1.2.3 (git 2.39.0) at 2024-07-03 13:53:55 +0300