From 299f4b1218c0d3721aa92bf091950d6708942583 Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期六, 28 八月 2021 15:45:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/newBranch1' into WJC
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index fce29b5..677aeed 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -719,6 +719,15 @@
};
}
break;
+ case "tvoc":
+ {
+ list = new List<string> {
+ Language.StringByID(StringId.zhengchang)+ ":0~399PPB",
+ Language.StringByID(StringId.chaobiao)+ ":400~699PPB",
+ Language.StringByID(StringId.yanzhong)+":>700PPB",
+ };
+ }
+ break;
case "security":
{
list = new List<string> {
@@ -727,7 +736,6 @@
};
}
break;
-
}
return list;
}
@@ -1063,7 +1071,7 @@
{
value = "5";
}
- else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
+ else if (text == Language.StringByID(StringId.yanzhong) + ":>700PPB")
{
value = "8";
}
--
Gitblit v1.8.0