Fixed problem that charts are not shown after page refresh.

This commit is contained in:
Ralf Bauer 2023-06-03 12:35:24 +02:00
parent ccc9d55e38
commit 6d52b7f701
4 changed files with 84 additions and 69 deletions

View File

@ -1,15 +1,17 @@
<template> <template>
<div class="card" :class="{}"> <div class="card" :class="{}">
<div v-if="dataBase.valid_data">
<div class="card-header"> <div class="card-header">
{{ $t('chart.LastDay') }} {{ $t('chart.LastDay') }}
</div> </div>
<GoogleChart /> <GoogleChart />
</div> </div>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { authHeader, handleResponse } from '@/utils/authentication'; import { defineComponent, type PropType, h } from 'vue';
import { defineComponent, h } from 'vue'; import type { DatabaseStatus } from "@/types/DatabaseStatus";
import { GChart } from 'vue-google-charts'; import { GChart } from 'vue-google-charts';
//import { DatetimeFormat } from 'vue-i18n'; //import { DatetimeFormat } from 'vue-i18n';
@ -33,6 +35,9 @@ export default defineComponent({
components: { components: {
GChart, GChart,
}, },
props: {
dataBase: { type: Object as PropType<DatabaseStatus>, required: true },
},
setup() { setup() {
return () => return () =>
h(GChart, { h(GChart, {
@ -41,20 +46,17 @@ export default defineComponent({
type type
}); });
}, },
mounted() { beforeMount() {
this.drawChart() this.drawChart()
}, },
methods: { methods: {
drawChart() { drawChart() {
fetch("/api/database", { headers: authHeader() })
.then((response) => handleResponse(response, this.$emitter, this.$router))
.then((energy) => {
var end = new Date() var end = new Date()
var start = new Date() var start = new Date()
var interval = 1 // number of days to show in the chart var interval = 1 // number of days to show in the chart
start.setDate(end.getDate() - interval) start.setDate(end.getDate() - interval)
start.setHours(start.getHours() - 2) start.setHours(start.getHours() - 2)
const energy = this.dataBase.values
var old_energy = energy[0][4] var old_energy = energy[0][4]
data = [['Time', 'Energy']]; data = [['Time', 'Energy']];
energy.forEach((x: any[]) => { energy.forEach((x: any[]) => {
@ -70,7 +72,6 @@ export default defineComponent({
// pattern: "dd.MM.YY HH:mm" // pattern: "dd.MM.YY HH:mm"
// }); // });
// date_formatter.format(data, 0); // date_formatter.format(data, 0);
});
} }
} }
}); });

View File

@ -1,14 +1,16 @@
<template> <template>
<div class="card" :class="{}"> <div class="card" :class="{}">
<div v-if="dataBase.valid_data">
<div class="card-header"> <div class="card-header">
</div> </div>
<GoogleChart /> <GoogleChart />
</div> </div>
</div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { authHeader, handleResponse } from '@/utils/authentication'; import { defineComponent, type PropType, h } from 'vue';
import { defineComponent, h } from 'vue'; import type { DatabaseStatus } from "@/types/DatabaseStatus";
import { GChart } from 'vue-google-charts'; import { GChart } from 'vue-google-charts';
//import { DatetimeFormat } from 'vue-i18n'; //import { DatetimeFormat } from 'vue-i18n';
@ -30,6 +32,9 @@ export default defineComponent({
components: { components: {
GChart, GChart,
}, },
props: {
dataBase: { type: Object as PropType<DatabaseStatus>, required: true },
},
setup() { setup() {
return () => return () =>
h(GChart, { h(GChart, {
@ -41,14 +46,11 @@ export default defineComponent({
} }
}); });
}, },
mounted() { beforeMount() {
this.drawChart() this.drawChart()
}, },
methods: { methods: {
drawChart() { drawChart() {
fetch("/api/database", { headers: authHeader() })
.then((response) => handleResponse(response, this.$emitter, this.$router))
.then((energy) => {
data = [[{ data = [[{
type: 'date', type: 'date',
id: 'Date' id: 'Date'
@ -57,11 +59,12 @@ export default defineComponent({
type: 'number', type: 'number',
id: 'Energy' id: 'Energy'
}]] }]]
var d : Date var d: Date
var a : any var a: any
const energy = this.dataBase.values
var old_energy = energy[0][4] var old_energy = energy[0][4]
var old_day = energy[0][2] var old_day = energy[0][2]
var last_energy : number var last_energy: number
energy.forEach((x: any[]) => { energy.forEach((x: any[]) => {
if (x[2] != old_day) { if (x[2] != old_day) {
data.push(a) data.push(a)
@ -78,7 +81,6 @@ export default defineComponent({
// pattern: "dd.MM.YY HH:mm" // pattern: "dd.MM.YY HH:mm"
// }); // });
// date_formatter.format(data, 0); // date_formatter.format(data, 0);
});
} }
} }
}); });

View File

@ -0,0 +1,4 @@
export interface DatabaseStatus {
valid_data: boolean;
values: [];
}

View File

@ -16,8 +16,8 @@
</button> </button>
</div> </div>
</div> </div>
<BarChart /> <BarChart v-bind:dataBase="dataBase" dataLoading="dataLoading" />
<CalendarChart /> <CalendarChart v-bind:dataBase="dataBase" />
<div class="tab-content" id="v-pills-tabContent" :class="{ <div class="tab-content" id="v-pills-tabContent" :class="{
'col-sm-9 col-md-10': inverterData.length > 1, 'col-sm-9 col-md-10': inverterData.length > 1,
@ -338,6 +338,7 @@ import InverterChannelInfo from "@/components/InverterChannelInfo.vue";
import BarChart from "@/components/BarChart.vue"; import BarChart from "@/components/BarChart.vue";
import CalendarChart from "@/components/CalendarChart.vue"; import CalendarChart from "@/components/CalendarChart.vue";
import InverterTotalInfo from '@/components/InverterTotalInfo.vue'; import InverterTotalInfo from '@/components/InverterTotalInfo.vue';
import type { DatabaseStatus } from '@/types/DatabaseStatus';
import type { DevInfoStatus } from '@/types/DevInfoStatus'; import type { DevInfoStatus } from '@/types/DevInfoStatus';
import type { EventlogItems } from '@/types/EventlogStatus'; import type { EventlogItems } from '@/types/EventlogStatus';
import type { LimitConfig } from '@/types/LimitConfig'; import type { LimitConfig } from '@/types/LimitConfig';
@ -396,6 +397,7 @@ export default defineComponent({
eventLogLoading: true, eventLogLoading: true,
devInfoView: {} as bootstrap.Modal, devInfoView: {} as bootstrap.Modal,
devInfoList: {} as DevInfoStatus, devInfoList: {} as DevInfoStatus,
dataBase: {} as DatabaseStatus,
devInfoLoading: true, devInfoLoading: true,
limitSettingView: {} as bootstrap.Modal, limitSettingView: {} as bootstrap.Modal,
@ -486,8 +488,14 @@ export default defineComponent({
.then((response) => handleResponse(response, this.$emitter, this.$router)) .then((response) => handleResponse(response, this.$emitter, this.$router))
.then((data) => { .then((data) => {
this.liveData = data; this.liveData = data;
fetch("/api/database", { headers: authHeader() })
.then((response) => handleResponse(response, this.$emitter, this.$router))
.then((data) => {
this.dataBase.values = data;
this.dataBase.valid_data = true;
this.dataLoading = false; this.dataLoading = false;
}); });
});
}, },
initSocket() { initSocket() {
console.log("Starting connection to WebSocket Server"); console.log("Starting connection to WebSocket Server");