From 49248e3bdff0458f8f6f4156d1425bd6f6074e32 Mon Sep 17 00:00:00 2001
From: lss <lsc@hdlchina.com.cn>
Date: 星期二, 17 五月 2022 13:17:21 +0800
Subject: [PATCH] Merge branch 'dev' into lss
---
HDL_ON/Entity/Function/SecurityAlarm.cs | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/HDL_ON/Entity/Function/SecurityAlarm.cs b/HDL_ON/Entity/Function/SecurityAlarm.cs
index fa1a558..4ff0b58 100644
--- a/HDL_ON/Entity/Function/SecurityAlarm.cs
+++ b/HDL_ON/Entity/Function/SecurityAlarm.cs
@@ -474,11 +474,11 @@
{
/// <summary>
/// 鎺у埗鐩爣绫诲瀷
- /// 0:璁惧
- /// 1:鍦烘櫙
- /// 2:鑷姩鍖�
+ /// 1:璁惧
+ /// 2:鍦烘櫙
+ /// 3:鑷姩鍖�
/// </summary>
- public string target_type = "0";
+ public string target_type = "1";
/// <summary>
/// 杈撳嚭鐩爣鐨剆id
/// </summary>
@@ -600,7 +600,7 @@
public string StateText()
{
string text = "";
- if (target_type == "0")
+ if (target_type == "1")
{
switch (spk)
{
@@ -635,7 +635,7 @@
}
break;
}
- }else if(target_type == "1")
+ }else if(target_type == "2")
{
text = Language.StringByID(StringId.Open);
}
--
Gitblit v1.8.0