From 0a08f1e34ade3c3ebb2f553cc1758c56fbb9aee6 Mon Sep 17 00:00:00 2001
From: xiaoguo <xiaoguo75131@163.com>
Date: Wed, 1 May 2024 13:13:33 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=20=E7=94=A8=E6=B0=B4?=
 =?UTF-8?q?=E9=87=8F=E6=B2=A1=E6=9C=89=E8=AE=B0=E5=BD=95=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs
index 783260c..74596c7 100644
--- a/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs
+++ b/guidescreen/GuideScreen/GuideScreen.UI/FormScreen.cs
@@ -162,8 +162,9 @@ namespace GuideScreen.UI
                 //获取天气信息
                 await GetWeather();
 
-                //总用水量
-                lblWaterMeter.Text = plcController.GetWaterTotal().ToString();
+                //用水量
+                SetDayWarterAndelEctricity();
+
             }
             catch (Exception ex)
             {
@@ -813,7 +814,7 @@ namespace GuideScreen.UI
         {
             var count = toilets.Values.Sum();
             //每用次1.6升水
-            var value = Math.Round(count * 0.0016, 4);
+            var value = Convert.ToSingle(Math.Round(count * 0.0016, 4));
             var dayStr = value.ToString().Aggregate(string.Empty, (c, i) => c + i + " ");
             lblDayWarter.Text = $"今日用水量  {dayStr} 吨  ";