+
@@ -41,25 +42,42 @@ export default {
}
},
renderChart() {
+ const type = this.type
const data = this.data.map(({ date, value }) => ({ x: date * 1000, y: value }))
Highcharts.chart(this.$refs.chart, {
- chart: {
- styledMode: true
- },
+ chart: { styledMode: true },
+ title: { text: '' },
+ legend: { enabled: false },
plotOptions: {
series: {
- animation: false
+ animation: false,
+ marker: { enabled: false }
}
},
xAxis: {
- type: 'datetime'
+ type: 'datetime',
+ dateTimeLabelFormats: {
+ millisecond: '%H:%M:%S.%L',
+ second: '%H:%M:%S',
+ minute: '%H:%M',
+ hour: '%H:%M',
+ day: '%e %b',
+ week: '%e %b',
+ month: '%b \'%y',
+ year: '%Y'
+ }
},
- series: [{
- data
- }],
- credits: {
- enabled: false
- }
+ yAxis: {
+ labels: {
+ formatter() {
+ const suffix = type === 'temperature' ? '°C' : '%'
+ return this.value + suffix
+ }
+ },
+ title: { enabled: false }
+ },
+ series: [{ data }],
+ credits: { enabled: false }
})
}
},
@@ -79,17 +97,35 @@ export default {
diff --git a/src/components/Loader.vue b/src/components/Loader.vue
index a5de830..e3a638b 100644
--- a/src/components/Loader.vue
+++ b/src/components/Loader.vue
@@ -21,10 +21,10 @@
width: 51px;
height: 51px;
margin: 6px;
- border: 6px solid $grey;
+ border: 6px solid $border;
border-radius: 50%;
animation: lds-ring 0.8s cubic-bezier(0.5, 0, 0.5, 1) infinite;
- border-color: $grey transparent transparent transparent;
+ border-color: $border transparent transparent transparent;
}
.lds-ring div:nth-child(1) {
animation-delay: -0.3s;
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index d0b2e70..ea188ef 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -44,7 +44,7 @@ export default {
}
},
mounted() {
- if (!this.activeType.label) {
+ if (!this.activeType) {
this.$emit('setType', this.navTypes[0])
}
},
diff --git a/src/components/TimeWindows.vue b/src/components/TimeWindows.vue
index 92d2a1d..26e0c35 100644
--- a/src/components/TimeWindows.vue
+++ b/src/components/TimeWindows.vue
@@ -15,7 +15,11 @@