diff options
Diffstat (limited to 'src/views')
-rw-r--r-- | src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue | 15 | ||||
-rw-r--r-- | src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue | 48 | ||||
-rw-r--r-- | src/views/_sila/Memory/Dynamic/MemoryTemp.vue | 7 | ||||
-rw-r--r-- | src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue | 7 | ||||
-rw-r--r-- | src/views/_sila/Processors/Dynamic/CpuTemp.vue | 7 |
5 files changed, 74 insertions, 10 deletions
diff --git a/src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue b/src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue index 018e19a1..07c6618c 100644 --- a/src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue +++ b/src/views/_sila/Fans/Dynamic/FanSpeedCpu.vue @@ -42,7 +42,8 @@ :time-scale="timeScale" :data="filteredForChart" :warning="warningLimit" - :shutdown="shutdownLimit" + :critical="criticalLimit" + :max="maxLimit" ></chart> <b-table @@ -112,7 +113,7 @@ export default { data() { return { warning: null, - shutdown: null, + critical: null, isBusy: true, fields: [ { @@ -189,7 +190,7 @@ export default { })?.UpperThresholdNonCritical; }, - shutdownLimit() { + criticalLimit() { return this.limits.find((limit) => { return ( limit?.UpperThresholdCritical && this.groups.includes(limit.MemberId) @@ -197,6 +198,12 @@ export default { })?.UpperThresholdCritical; }, + maxLimit() { + return this.limits.find((limit) => { + return limit?.MaxReadingRange; + })?.MaxReadingRange; + }, + allSensors() { return this.timeScale === 'hour' ? this.$store.getters['fan/fansLastHour'] @@ -274,7 +281,7 @@ export default { this.$store.dispatch('fan/getFansDynamic', payload).finally(() => { this.$store.dispatch('fan/getLimits').finally(() => { this.warning = this.warningLimit; - this.shutdown = this.shutdownLimit; + this.critical = this.criticalLimit; this.endLoader(); this.isBusy = false; }); diff --git a/src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue b/src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue index 06f4dd14..bcf0b375 100644 --- a/src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue +++ b/src/views/_sila/Fans/Dynamic/FanSpeedSystem.vue @@ -42,7 +42,8 @@ :time-scale="timeScale" :data="filteredForChart" :warning="warning" - :shutdown="shutdown" + :critical="critical" + :max="maxLimit" ></chart> <b-table @@ -96,7 +97,7 @@ import LoadingBarMixin from '@/components/_sila/Mixins/LoadingBarMixin'; import TableFilterMixin from '@/components/_sila/Mixins/TableFilterMixin'; import Collapse from '@/components/_sila/Global/Collapse'; -import { getItems } from '@/utilities/_sila/metricProperties'; +import { getGroups, getItems } from '@/utilities/_sila/metricProperties'; import { fanFilter } from '@/utilities/_sila/psuFilter'; export default { @@ -110,8 +111,8 @@ export default { }, data() { return { - warning: 8900, - shutdown: 9500, + warning: null, + critical: null, isBusy: true, fields: [ { @@ -151,6 +152,10 @@ export default { }, computed: { + groups() { + return getGroups(this.filteredSensors); + }, + items() { const allArr = getItems(this.filteredSensors); @@ -172,6 +177,33 @@ export default { }); }, + limits() { + return this.$store.getters['fan/limits']; + }, + + warningLimit() { + return this.limits.find((limit) => { + return ( + limit?.UpperThresholdNonCritical && + this.groups.includes(limit.MemberId) + ); + })?.UpperThresholdNonCritical; + }, + + criticalLimit() { + return this.limits.find((limit) => { + return ( + limit?.UpperThresholdCritical && this.groups.includes(limit.MemberId) + ); + })?.UpperThresholdCritical; + }, + + maxLimit() { + return this.limits.find((limit) => { + return limit?.MaxReadingRange; + })?.MaxReadingRange; + }, + allSensors() { return this.timeScale === 'hour' ? this.$store.getters['fan/fansLastHour'] @@ -239,8 +271,12 @@ export default { this.startLoader(); this.$store.dispatch('fan/getFansDynamic', payload).finally(() => { - this.endLoader(); - this.isBusy = false; + this.$store.dispatch('fan/getLimits').finally(() => { + this.warning = this.warningLimit; + this.critical = this.criticalLimit; + this.endLoader(); + this.isBusy = false; + }); }); }, }, diff --git a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue index 2c890862..ce9ac25a 100644 --- a/src/views/_sila/Memory/Dynamic/MemoryTemp.vue +++ b/src/views/_sila/Memory/Dynamic/MemoryTemp.vue @@ -70,6 +70,7 @@ :data="filteredSensors" :warning="warningLimit" :critical="criticalLimit" + :max="maxLimit" ></chart> <b-table responsive="md" @@ -217,6 +218,12 @@ export default { })?.UpperThresholdCritical; }, + maxLimit() { + return this.limits.find((limit) => { + return limit?.MaxReadingRangeTemp; + })?.MaxReadingRangeTemp; + }, + allSensors() { return this.timeScale === 'hour' ? this.$store.getters['memory/dimmsLastHour'] diff --git a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue index 6d4c15b7..610af549 100644 --- a/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue +++ b/src/views/_sila/Motherboard/Dynamic/MotherboardTemp.vue @@ -48,6 +48,7 @@ :colors="colors" :data="filteredSensors" :warning="warningLimit" + :max="maxLimit" ></chart> <b-table responsive="md" @@ -183,6 +184,12 @@ export default { })?.UpperThresholdNonCritical; }, + maxLimit() { + return this.limits.find((limit) => { + return limit?.MaxReadingRangeTemp; + })?.MaxReadingRangeTemp; + }, + allSensors() { return this.timeScale === 'hour' ? this.$store.getters['motherboard/motherboardLastHour'] diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue index 840034a3..0f90341b 100644 --- a/src/views/_sila/Processors/Dynamic/CpuTemp.vue +++ b/src/views/_sila/Processors/Dynamic/CpuTemp.vue @@ -75,6 +75,7 @@ :colors="colors" :warning="warningLimit" :critical="criticalLimit" + :max="maxLimit" ></chart> <b-table responsive="md" @@ -227,6 +228,12 @@ export default { })?.UpperThresholdCritical; }, + maxLimit() { + return this.limits.find((limit) => { + return limit?.MaxReadingRangeTemp; + })?.MaxReadingRangeTemp; + }, + allSensors() { return this.timeScale === 'hour' ? this.$store.getters['processors/cpuTempLastHour'] |