From 0051efe22d4fb0b298a97ba08213a246f4ea40dd Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期五, 27 八月 2021 14:23:35 +0800
Subject: [PATCH] 1
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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..e108493 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -713,9 +713,9 @@
case "tvoc":
{
list = new List<string> {
- Language.StringByID(StringId.zhengchang)+ ":0~399PPB",
- Language.StringByID(StringId.chaobiao)+ ":400~699PPB",
- Language.StringByID(StringId.yanzhong)+":>700PPB",
+ Language.StringByID(StringId.zhengchang)+ ":0~399mg/m3",
+ Language.StringByID(StringId.chaobiao)+ ":400~699mg/m3",
+ Language.StringByID(StringId.yanzhong)+":>700mg/m3",
};
}
break;
@@ -727,7 +727,6 @@
};
}
break;
-
}
return list;
}
@@ -986,15 +985,15 @@
if (intValue >=1 && intValue <= 3)
{
- text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
+ text = Language.StringByID(StringId.zhengchang) + ":0~399mg/m3";
}
else if (intValue >=4 && intValue<=6)
{
- text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
+ text = Language.StringByID(StringId.chaobiao) + ":400~699mg/m3";
}
else if (intValue >= 7 && intValue <= 9)
{
- text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
+ text = Language.StringByID(StringId.yanzhong) + ":>700mg/m3";
}
}
break;
@@ -1055,15 +1054,15 @@
break;
case "tvoc":
{
- if (text == Language.StringByID(StringId.zhengchang) + ":0~399PPB")
+ if (text == Language.StringByID(StringId.zhengchang) + ":0~399mg/m3")
{
value = "2";
}
- else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB")
+ else if (text == Language.StringByID(StringId.chaobiao) + ":400~699mg/m3")
{
value = "5";
}
- else if (text == Language.StringByID(StringId.yanzhong) +":>700PPB")
+ else if (text == Language.StringByID(StringId.yanzhong) + ":>700mg/m3")
{
value = "8";
}
--
Gitblit v1.8.0