From b8c54a7e4048317fc0f33c63a802d60396f82eb0 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 07 十二月 2022 17:31:59 +0800
Subject: [PATCH] 2022年12月07日17:31:56
---
HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
index 2e237f6..6094f4a 100644
--- a/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
+++ b/HDL_ON/UI/UI2/3-Intelligence/Automation/ConditionDeviceFunList.cs
@@ -466,7 +466,7 @@
};
}
break;
- //pm210
+ //pm10
case SPK.SensorPm10:
{
///pm210
@@ -647,7 +647,7 @@
Input inputDevice = new Input();
inputDevice.condition_type = "3";
inputDevice.sid = device.sid;
- inputDevice.condition = dicSateteList;
+ inputDevice.condition.AddRange(dicSateteList);
if (device.spk == SPK.doorgate)
{
//鍙瀵硅
@@ -928,7 +928,7 @@
if (inputs.condition.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = inputs.condition;
+ dicSateteList.AddRange(inputs.condition);
}
}
new LogicView.TipPopView { }.InputBox(textInt, stateValue, (value) =>
@@ -990,7 +990,7 @@
if (inputs.condition.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = inputs.condition;
+ dicSateteList.AddRange(inputs.condition);
}
}
PublicInterface view = new PublicInterface();
@@ -1016,6 +1016,7 @@
case SPK.SensorPm25:
case SPK.SensorTVOC:
case SPK.SensorHcho:
+ case SPK.SensorPm10:
{
if (!Is_SpkAttribute(key))
{
@@ -1091,7 +1092,7 @@
if (dicList.Count != 0)
{
//鏈夋暟鎹噸鏂拌祴鍊�
- dicSateteList = dicList;
+ dicSateteList.AddRange(dicList);
}
InpOrOutLogicMethod.Current.EditDeviceState(device, dicList, button1, button2, button3, button4);
}
--
Gitblit v1.8.0