diff options
| -rw-r--r-- | src/components/_sila/Global/Chart.vue | 22 | ||||
| -rw-r--r-- | src/views/_sila/Fans/Dynamic/FansDynamicPage.vue | 1 |
2 files changed, 17 insertions, 6 deletions
diff --git a/src/components/_sila/Global/Chart.vue b/src/components/_sila/Global/Chart.vue index d17a5042..d478e615 100644 --- a/src/components/_sila/Global/Chart.vue +++ b/src/components/_sila/Global/Chart.vue @@ -60,8 +60,13 @@ export default { let transform = filteredData.map((metric) => { let date = new Date(metric.Timestamp); - let time = - date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0'); + let time; + if (this.timeScale === 'hour') { + time = + date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0'); + } else { + time = date.getHours() + ':00'; + } return { ...metric, Timestamp: time, @@ -94,7 +99,7 @@ export default { return { name: key, - data: arr.slice(-60), + data: arr, color: this.colors[index], }; }); @@ -109,8 +114,13 @@ export default { let transform = filteredData.map((metric) => { let date = new Date(metric.Timestamp); - let time = - date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0'); + let time; + if (this.timeScale === 'hour') { + time = + date.getHours() + ':' + String(date.getMinutes()).padStart(2, '0'); + } else { + time = date.getHours() + ':00'; + } return { ...metric, Timestamp: time, @@ -123,7 +133,7 @@ export default { return rv; }, {}); - let timeArr = Object.keys(timeGroup).slice(-60); + let timeArr = Object.keys(timeGroup); return timeArr; }, diff --git a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue index 63698e88..06d66ec8 100644 --- a/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue +++ b/src/views/_sila/Fans/Dynamic/FansDynamicPage.vue @@ -46,6 +46,7 @@ <chart type="fans" :colors="colors" + :time-scale="timeScale" :data="filteredSensors" :warning="fanSpeedWarninig" :shutdown="fanSpeedShutdown" |