From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
index 967b540..2b41c7d 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/EnvironmentalScience/A_EnvironmentalDataCenter.cs
@@ -713,7 +713,7 @@
sensorSPK = showList[0].spk;
foreach (var s in showList)
{
- assembleValues += Convert.ToDouble(s.GetAttrState("value"));
+ assembleValues += Convert.ToDouble(s.GetAttrState("value").Replace(",", "."));
}
@@ -892,7 +892,7 @@
switch (sensorSPK)
{
case SPK.SensorPm25:
- btnTitle.Text = "PM2.5(ug/m虏)";
+ btnTitle.Text = "PM2.5(ug/m鲁)";
break;
case SPK.SensorTemperature:
btnTitle.Text = Language.StringByID(StringId.Temp) + "(掳C)";
@@ -1011,7 +1011,7 @@
assembleValues = 0;
foreach (var s in sensorList)
{
- assembleValues += Convert.ToDouble(s.GetAttrState("value"));
+ assembleValues += Convert.ToDouble(s.GetAttrState("value").Replace(",", "."));
}
}
--
Gitblit v1.8.0