diff --git a/webapp/src/components/InverterTotalInfo.vue b/webapp/src/components/InverterTotalInfo.vue index 678312d5..a000db2b 100644 --- a/webapp/src/components/InverterTotalInfo.vue +++ b/webapp/src/components/InverterTotalInfo.vue @@ -89,9 +89,9 @@ -
+
-
+
{{ $t('invertertotalinfo.BatterySoc') }}
@@ -105,12 +105,40 @@
+
+
+
{{ $t('invertertotalinfo.HomePower') }}
+
+

+ {{ $n(powerMeterData.Power.v, 'decimal', { + minimumFractionDigits: powerMeterData.Power.d, + maximumFractionDigits: powerMeterData.Power.d + }) }} + {{ powerMeterData.Power.u }} +

+
+
+
+
+
+
{{ $t('invertertotalinfo.HuaweiPower') }}
+
+

+ {{ $n(huaweiData.Power.v, 'decimal', { + minimumFractionDigits: huaweiData.Power.d, + maximumFractionDigits: huaweiData.Power.d + }) }} + {{ huaweiData.Power.u }} +

+
+
+
\ No newline at end of file diff --git a/webapp/src/locales/de.json b/webapp/src/locales/de.json index 2597e925..3ad1e1fc 100644 --- a/webapp/src/locales/de.json +++ b/webapp/src/locales/de.json @@ -338,7 +338,9 @@ "MpptTotalYieldTotal": "MPPT Gesamtertrag Insgesamt", "MpptTotalYieldDay": "MPPT Gesamtertrag Heute", "MpptTotalPower": "MPPT Gesamtleistung", - "BatterySoc": "Ladezustand" + "BatterySoc": "Ladezustand", + "HomePower": "Leistung / Netz", + "HuaweiPower": "Huawei AC Leistung" }, "inverterchannelproperty": { "Power": "Leistung", diff --git a/webapp/src/locales/en.json b/webapp/src/locales/en.json index dca432a8..9b21305a 100644 --- a/webapp/src/locales/en.json +++ b/webapp/src/locales/en.json @@ -338,7 +338,9 @@ "MpptTotalYieldTotal": "MPPT Total Yield Total", "MpptTotalYieldDay": "MPPT Total Yield Day", "MpptTotalPower": "MPPT Total Power", - "BatterySoc": "State of charge" + "BatterySoc": "State of charge", + "HomePower": "Grid Power", + "HuaweiPower": "Huawei AC Power" }, "inverterchannelproperty": { "Power": "Power", diff --git a/webapp/src/locales/fr.json b/webapp/src/locales/fr.json index d7110822..bc44e1ab 100644 --- a/webapp/src/locales/fr.json +++ b/webapp/src/locales/fr.json @@ -337,7 +337,9 @@ "MpptTotalYieldTotal": "MPPT rendement total", "MpptTotalYieldDay": "MPPT rendement du jour", "MpptTotalPower": "MPPT puissance de l'installation", - "BatterySoc": "State of charge" + "BatterySoc": "State of charge", + "HomePower": "Grid Power", + "HuaweiPower": "Huawei AC Power" }, "inverterchannelproperty": { "Power": "Puissance", diff --git a/webapp/src/types/LiveDataStatus.ts b/webapp/src/types/LiveDataStatus.ts index a6fdac2e..a64e681a 100644 --- a/webapp/src/types/LiveDataStatus.ts +++ b/webapp/src/types/LiveDataStatus.ts @@ -54,6 +54,7 @@ export interface Vedirect { export interface Huawei { enabled: boolean; + Power: ValueObject; } export interface Battery { @@ -61,6 +62,11 @@ export interface Battery { soc: ValueObject; } +export interface PowerMeter { + enabled: boolean; + Power: ValueObject; +} + export interface LiveData { inverters: Inverter[]; total: Total; @@ -68,4 +74,5 @@ export interface LiveData { vedirect: Vedirect; huawei: Huawei; battery: Battery; + power_meter: PowerMeter; } diff --git a/webapp/src/views/HomeView.vue b/webapp/src/views/HomeView.vue index 96599f04..f5128178 100644 --- a/webapp/src/views/HomeView.vue +++ b/webapp/src/views/HomeView.vue @@ -1,7 +1,7 @@