From 592974441a4df95fffd9167c90192da1a390b1c2 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 06 六月 2023 11:51:12 +0800
Subject: [PATCH] Merge branch 'Dev-Branch'
---
HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
index bbbea86..e043cf8 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/Logic.cs
@@ -26,9 +26,13 @@
/// </summary>
public string sid = "";
/// <summary>
+ /// 鏄惁鍏佽鍒犻櫎(false=鍙互鍒犻櫎)
+ /// </summary>
+ public bool tag = false;
+ /// <summary>
/// 閫昏緫鍚嶇О
/// </summary>
- public string name = "鑷姩鍖�";
+ public string name = "";
/// <summary>
/// 閫昏緫鏉′欢鍏崇郴锛堜笌and:锛屾垨:or锛�
/// </summary>
@@ -94,9 +98,18 @@
/// 鏌愪釜閫昏緫/鍦烘櫙鐨勮緭鍑烘潯浠�=7;
/// 鍦扮悊鍥存爮=8;
/// 绌烘皵璐ㄩ噺=9(搴熷純);
+ /// 鍙瀵硅=9;
/// 鍦烘櫙=10;
/// </summary>
public string condition_type = "";
+ /// <summary>
+ /// condition_type=9鏃朵娇鐢�
+ /// </summary>
+ public string identifier = "";
+ /// <summary>
+ /// 浜轰綋绉诲姩浼犳劅鍣紙甯︽寔缁椂闂达級
+ /// </summary>
+ public string hold_time = "";
public List<Dictionary<string, string>> condition = new List<Dictionary<string, string>>();
/// <summary>
/// 鍦扮悊鍥存爮閰嶇疆
@@ -159,7 +172,7 @@
/// <summary>
/// 閫氱煡鍐呭
/// </summary>
- public string noticeContent = "鑷姩鍖栧凡缁忔墽琛�";//string.Empty;
+ public string noticeContent = Shared.Language.StringByID(StringId.Automation)+ Shared.Language.StringByID(StringId.yizhixing); //string.Empty;
}
/// <summary>
/// 鎺ㄩ�侀厤缃�
--
Gitblit v1.8.0