From 4c0b2ce14b299b3409dfee230a052979c2844de4 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期三, 01 九月 2021 15:17:14 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs | 26 +++++++++++++-------------
1 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
index d765641..b05eac1 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/PublicInterface.cs
@@ -949,16 +949,16 @@
text = Language.StringByID(StringId.pmyou);
}
break;
- case "(36,75]": {
+ case "(35,75]": {
text = Language.StringByID(StringId.pmliang);
} break;
- case "(76,115]": {
+ case "(75,115]": {
text = Language.StringByID(StringId.pmqingdu);
} break;
- case "(116,150]": {
+ case "(115,150]": {
text = Language.StringByID(StringId.pmzhongdu);
} break;
- case "(150,100000]": {
+ case "(151,100000]": {
text = Language.StringByID(StringId.pmzhongduwuran);
} break;
}
@@ -974,7 +974,7 @@
text = Language.StringByID(StringId.zhengchang) + ":0~1000PPM";
}
break;
- case "(1001,2000]":
+ case "(1000,2000]":
{
text = Language.StringByID(StringId.piangao) + ":1001~2000PPM";
}
@@ -996,12 +996,12 @@
text = Language.StringByID(StringId.zhengchang) + ":0~399PPB";
}
break;
- case "(400,699]":
+ case "(399,699]":
{
text = Language.StringByID(StringId.chaobiao) + ":400~699PPB";
}
break;
- case "(700,70000]":
+ case "(699,70000]":
{
text = Language.StringByID(StringId.yanzhong) + ":>700PPB";
}
@@ -1056,15 +1056,15 @@
}
else if (text == Language.StringByID(StringId.pmliang))
{
- value = "(36,75]";
+ value = "(35,75]";
}
else if (text == Language.StringByID(StringId.pmqingdu))
{
- value = "(76,115]";
+ value = "(75,115]";
}
else if (text == Language.StringByID(StringId.pmzhongdu))
{
- value = "(116,150]";
+ value = "(115,150]";
}
else if (text == Language.StringByID(StringId.pmzhongduwuran))
{
@@ -1080,7 +1080,7 @@
}
else if (text == Language.StringByID(StringId.piangao) + ":1001~2000PPM")
{
- value = "(1001,2000]";
+ value = "(1000,2000]";
}
else if (text == Language.StringByID(StringId.chaobiao) + ":>2000PPM")
{
@@ -1096,11 +1096,11 @@
}
else if (text == Language.StringByID(StringId.chaobiao) + ":400~699PPB")
{
- value = "(400,699]";
+ value = "(399,699]";
}
else if (text == Language.StringByID(StringId.yanzhong) + ":>700PPB")
{
- value = "(700,70000]";
+ value = "(699,70000]";
}
}
break;
--
Gitblit v1.8.0