From 60da695475d1853a32aa75ca71de421b70b51fa8 Mon Sep 17 00:00:00 2001 From: Vitalii Lysak Date: Tue, 26 Jul 2022 17:24:02 +0300 Subject: clean code for cpu dynamic --- src/components/_sila/Global/Chart.vue | 66 ++++--- src/store/modules/HardwareStatus/ProcessorStore.js | 8 +- src/views/_sila/Processors/Dynamic/CpuPower.vue | 164 ++++++++++++++++ src/views/_sila/Processors/Dynamic/CpuTemp.vue | 192 +++++++++++++++++++ src/views/_sila/Processors/Dynamic/Power.vue | 163 ---------------- .../Processors/Dynamic/ProcessorsDynamicPage.vue | 209 +-------------------- 6 files changed, 411 insertions(+), 391 deletions(-) create mode 100644 src/views/_sila/Processors/Dynamic/CpuPower.vue create mode 100644 src/views/_sila/Processors/Dynamic/CpuTemp.vue delete mode 100644 src/views/_sila/Processors/Dynamic/Power.vue diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue index 8cee2497..e0dfd952 100644 --- a/src/components/_sila/Global/Chart.vue +++ b/src/components/_sila/Global/Chart.vue @@ -50,6 +50,27 @@ export default { yMax: null, minTickInterval: null, plotBands: null, + plotLines: [ + { + color: '#E11717', + dashStyle: 'solid', + value: this.warning, + zIndex: '1000', + width: 2, + label: { + text: 'Пороговое значение предупреждения', + align: 'right', + style: { + fontFamily: 'Inter, sans-serif', + fontSize: '12px', + fontStyle: 'normal', + fontWeight: '400', + lineHeight: '16px', + color: '#0C1C2999', + }, + }, + }, + ], }; }, computed: { @@ -152,27 +173,7 @@ export default { minRange: this.minRange, minTickInterval: this.minTickInterval, minorGridLineColor: '#1A3E5B1A', - plotLines: [ - { - color: '#E11717', - dashStyle: 'solid', - value: this.warning, - zIndex: '1000', - width: 2, - label: { - text: 'Пороговое значение предупреждения', - align: 'right', - style: { - fontFamily: 'Inter, sans-serif', - fontSize: '12px', - fontStyle: 'normal', - fontWeight: '400', - lineHeight: '16px', - color: '#0C1C2999', - }, - }, - }, - ], + plotLines: this.plotLines, plotBands: this.plotBands, }, series: this.metricData.map((item) => ({ @@ -266,6 +267,29 @@ export default { this.yMax = 100; this.minTickInterval = 25; break; + case 'power': + this.categories = this.setCategories(101, 'Вт'); + this.yMax = 100; + this.minTickInterval = 25; + this.plotLines.push({ + color: '#1A3E5B', + dashStyle: 'solid', + value: this.shutdown, + width: 2, + label: { + text: 'Пороговое значения отказ', + align: 'right', + style: { + fontFamily: 'Inter', + fontSize: '12px', + fontStyle: 'normal', + fontWeight: '400', + lineHeight: '16px', + color: '#0C1C2999', + }, + }, + }); + break; } }, setCategories(count, desc) { diff --git a/src/store/modules/HardwareStatus/ProcessorStore.js b/src/store/modules/HardwareStatus/ProcessorStore.js index 5d014ab9..ddf9db4a 100644 --- a/src/store/modules/HardwareStatus/ProcessorStore.js +++ b/src/store/modules/HardwareStatus/ProcessorStore.js @@ -4,16 +4,16 @@ import i18n from '@/i18n'; const ProcessorStore = { namespaced: true, state: { - processors: [], + cpuTemp: [], cpuPower: [], }, getters: { - processors: (state) => state.processors, + cpuTemp: (state) => state.cpuTemp, cpuPower: (state) => state.cpuPower, }, mutations: { setProcessorsInfo: (state, data) => { - state.processors = data.map((processor) => { + state.cpuTemp = data.map((processor) => { const { Id, Status = {}, @@ -63,7 +63,7 @@ const ProcessorStore = { }, setProcessorsDynamic: (state, data) => { - state.processors = data; + state.cpuTemp = data; }, setCpuPowerDynamic: (state, data) => { state.cpuPower = data; diff --git a/src/views/_sila/Processors/Dynamic/CpuPower.vue b/src/views/_sila/Processors/Dynamic/CpuPower.vue new file mode 100644 index 00000000..dffea20f --- /dev/null +++ b/src/views/_sila/Processors/Dynamic/CpuPower.vue @@ -0,0 +1,164 @@ + + diff --git a/src/views/_sila/Processors/Dynamic/CpuTemp.vue b/src/views/_sila/Processors/Dynamic/CpuTemp.vue new file mode 100644 index 00000000..671b3d7b --- /dev/null +++ b/src/views/_sila/Processors/Dynamic/CpuTemp.vue @@ -0,0 +1,192 @@ + + diff --git a/src/views/_sila/Processors/Dynamic/Power.vue b/src/views/_sila/Processors/Dynamic/Power.vue deleted file mode 100644 index 4f486f6b..00000000 --- a/src/views/_sila/Processors/Dynamic/Power.vue +++ /dev/null @@ -1,163 +0,0 @@ - - diff --git a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue index 24163bcc..e2e1505c 100644 --- a/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue +++ b/src/views/_sila/Processors/Dynamic/ProcessorsDynamicPage.vue @@ -6,235 +6,38 @@ :time-scale="timeScale" style="margin: -2rem -2rem 0 -2rem" /> - - - - - - - - - - - - - - - - - - - - - - - - {{ 'Сохранить' }} - - - - - - - - - - - - - + +