From 4334cb1ef3da277ecd897a393b1f9def25d74949 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期三, 01 九月 2021 14:52:34 +0800
Subject: [PATCH] 2021-9-1-1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 4 ++--
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index a6dc46d..4a53bf1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -364,7 +364,7 @@
{
///hcho
LogicView.FunTypeView hchoView = new LogicView.FunTypeView();
- hchoView.btnText.TextID = StringId.tvoc;
+ hchoView.btnText.TextID = StringId.Formaldehyde;
fLayout.AddChidren(hchoView.FLayoutView());
///hcho鐐瑰嚮浜嬩欢
hchoView.btnClick.MouseUpEventHandler += (sender, e) =>
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 4b137f1..b979155 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -719,7 +719,7 @@
break;
case "hcho":
{
- conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.tvoc, indexVulae, true, stateValue);
+ conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
}
break;
}
@@ -2257,7 +2257,7 @@
break;
case "hcho":
{
- conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.tvoc, indexVulae, true, stateValue);
+ conditionDeviceFunList.PmCo2TvocAction(thisView, device, "hcho", StringId.Formaldehyde, indexVulae, true, stateValue);
}
break;
}
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index edb2001..d765641 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -1019,7 +1019,7 @@
text = Language.StringByID(StringId.youxiu) + ":(0~0.08mg/m3)";
}
break;
- case "(0.09,0.1]":
+ case "(0.08,0.1]":
{
text = Language.StringByID(StringId.lianghao) + ":(0.09~0.1mg/m3)";
}
@@ -1112,7 +1112,7 @@
}
else if (text == Language.StringByID(StringId.lianghao) + ":(0.09~0.1mg/m3)")
{
- value = "(0.09,0.1]";
+ value = "(0.08,0.1]";
}
else if (text == Language.StringByID(StringId.chaobiao) + ":>(0.1mg/m3)")
{
--
Gitblit v1.8.0