From b847c06d8617efb2cbbad6f11b0344b779138e92 Mon Sep 17 00:00:00 2001
From: wxr <wxr@hdlchina.com.cn>
Date: 星期一, 14 十月 2024 18:03:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wjc' into feature/v2.7_迭代
---
HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
index fe07f72..306332d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Acst/WaterHeaterJinmaoPage.cs
@@ -673,7 +673,7 @@
TextAlignment = TextAlignment.CenterRight,
TextSize = 14,
TextColor = CSS_Color.FirstLevelTitleColor,
- Text = (volume - recyclVolume) + "t"
+ Text = Math.Round((volume - recyclVolume),1) + "t"
};
flowView.AddChidren(flow_ElectricDriveValuesButton);
@@ -1282,7 +1282,7 @@
{
flow_ElectricDriveProgressButton.Text = ((int)(100 - recyclVolumePercent)) + "%";
}
- flow_ElectricDriveValuesButton.Text = (((int)(volume * 100) - (int)(recyclVolume * 100)) / 100.0) + "t";
+ flow_ElectricDriveValuesButton.Text = Math.Round((volume - recyclVolume), 1) + "t";//(((int)(volume * 100) - (int)(recyclVolume * 100)) / 100.0) + "t";
}
/// <summary>
--
Gitblit v1.8.0