diff --git a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue index fab8905e44..2f18d52c06 100644 --- a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue +++ b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMArc.vue @@ -33,7 +33,7 @@ :transform="'translate(' + path.centroid(consumer) + ')'" > @@ -84,7 +84,7 @@ function strokeColor(d: PieArcDatum, i: number): string { : d.data.color } const summarizedPower = computed (() => { - return props.plotdata.reduce((sum, item) => sum + item.power, 0) + return props.plotdata.reduce((sum, item) => sum + Math.abs(item.power), 0) }) diff --git a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMSourceArc.vue b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMSourceArc.vue index 354fc41150..e1a540c719 100755 --- a/packages/modules/web_themes/colors/source/src/components/powerMeter/PMSourceArc.vue +++ b/packages/modules/web_themes/colors/source/src/components/powerMeter/PMSourceArc.vue @@ -55,15 +55,15 @@ const invertersToShow = computed(() => }) : [sourceSummary.pv], ) -const batteriesToShow = computed(() => - batteries.value.size > 1 +const batteriesToShow = computed(() => { + return batteries.value.size > 1 ? [...batteries.value.values()] .filter((b) => b.power < 0) .sort((a, b) => { return a.power - b.power }) - : [sourceSummary.batOut], -) + : [sourceSummary.batOut] +}) watchEffect(() => { let currentMax =