patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: copy OnBattery-specific data from live view websocket (#696)

Browse Source 
closes #685.
closes #682.
This commit is contained in:
Bernhard Kirchen 2024-02-29 17:09:18 +01:00 committed by GitHub
parent c72ae561c7
commit c560d1d90e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webapp/src/components/InverterTotalInfo.vue
View File

@ -123,8 +123,8 @@ export default defineComponent({
totalData: { type: Object as PropType<Total>, required: true }, totalData: { type: Object as PropType<Total>, required: true },
totalVeData: { type: Object as PropType<Vedirect>, required: true }, totalVeData: { type: Object as PropType<Vedirect>, required: true },
totalBattData: { type: Object as PropType<Battery>, required: true }, totalBattData: { type: Object as PropType<Battery>, required: true },
powerMeterData: { type: Object as PropType<Huawei>, required: true }, powerMeterData: { type: Object as PropType<PowerMeter>, required: true },
huaweiData: { type: Object as PropType<PowerMeter>, required: true }, huaweiData: { type: Object as PropType<Huawei>, required: true },
}, },
}); });
</script> </script>

4
webapp/src/views/HomeView.vue
View File

@ -463,6 +463,10 @@ export default defineComponent({
const newData = JSON.parse(event.data); const newData = JSON.parse(event.data);
Object.assign(this.liveData.total, newData.total); Object.assign(this.liveData.total, newData.total);
Object.assign(this.liveData.hints, newData.hints); Object.assign(this.liveData.hints, newData.hints);
Object.assign(this.liveData.vedirect, newData.vedirect);
Object.assign(this.liveData.huawei, newData.huawei);
Object.assign(this.liveData.battery, newData.battery);
Object.assign(this.liveData.power_meter, newData.power_meter);
const foundIdx = this.liveData.inverters.findIndex((element) => element.serial == newData.inverters[0].serial); const foundIdx = this.liveData.inverters.findIndex((element) => element.serial == newData.inverters[0].serial);
if (foundIdx == -1) { if (foundIdx == -1) {