From c877bc16eb02df246e48377101af0fa5ec626c14 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期一, 23 八月 2021 10:00:49 +0800
Subject: [PATCH] Merge branch 'WJC' into wxr7
---
HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
index 22c90d5..8091f6f 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/InpOrOutLogicMethod.cs
@@ -1103,8 +1103,20 @@
//鐢╯id鎵惧埌瀹夐槻锛�
var security = LogicMethod.CurrLogicMethod.GetSecurity(outputTarget.sid);
targetView.btnIcon.UnSelectedImagePath = "LogicIcon/security.png";
+ targetView.btnDelay.Visible = false;
//鏄剧ず瀹夐槻鍚嶇О
- stateStr = security.name;
+ targetView.btnText.Text = security.name;
+ string value = GetKeyValue("security", dicList);
+ if (value == "enable")
+ {
+ stateStr = Language.StringByID(StringId.bufang);
+
+ }
+ else
+ {
+ stateStr = Language.StringByID(StringId.chefang);
+ }
+
}
break;
case "4":
@@ -1119,9 +1131,9 @@
break;
}
- if (outputTarget.target_type == "1")
+ if (outputTarget.target_type == "1" || outputTarget.target_type == "3")
{
- targetView.btnState.Text =new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
+ targetView.btnState.Text = new InpOrOutLogicMethod { }.GetTimeText(outputTarget.delay) + stateStr;
}
else
{
@@ -1160,8 +1172,8 @@
break;
case "3":
{
- AddTarget addTarget = new AddTarget();
- addTarget.SecurityMethod(thisView, edit, indexVulae);
+ Security security = new Security();
+ security.SecurityMethod(thisView, "", edit, indexVulae);
}
break;
case "4":
--
Gitblit v1.8.0