From adf7df175e590b7d9e0f33c0c2ea1d2897da6301 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 29 三月 2023 14:33:12 +0800
Subject: [PATCH] Merge branch 'dev-cqy（1.5.9）' into wjc
---
HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs
index e4a7974..c26b483 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Electrical/SocketPage_CumulativePowerConsumption.cs
@@ -136,7 +136,10 @@
TextAlignment = TextAlignment.CenterLeft,
TextID = StringId.RealTimePowerConsumption,
};
- btnRealTimeData.Text = Language.StringByID(StringId.RealTimePowerConsumption).Replace("{0}", function.GetAttrState("active_power"));
+ double realTimePower = 0;
+ double.TryParse(function.GetAttrState("active_power"), out realTimePower);
+ realTimePower /= 1000;
+ btnRealTimeData.Text = Language.StringByID(StringId.RealTimePowerConsumption).Replace("{0}", realTimePower.ToString());
generalTableView.AddChidren(btnRealTimeData);
--
Gitblit v1.8.0