From 39b372018db4bfeabcc7628b53e9156d7ff4ca3c Mon Sep 17 00:00:00 2001
From: wells.liu <wells.liu@broconcentric.com>
Date: 星期三, 08 七月 2020 15:17:35 +0800
Subject: [PATCH] 数据查询 界面设计 + excel导出帮助类
---
src/Bro.Process/ProcessConfig.cs | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/Bro.Process/ProcessConfig.cs b/src/Bro.Process/ProcessConfig.cs
index dcff227..1dc98f4 100644
--- a/src/Bro.Process/ProcessConfig.cs
+++ b/src/Bro.Process/ProcessConfig.cs
@@ -66,7 +66,7 @@
[Description("榛樿鎿嶄綔閰嶇疆闆嗗悎")]
[DisplayName("榛樿鎿嶄綔閰嶇疆")]
[TypeConverter(typeof(CollectionCountConvert))]
- [Editor(typeof(ComplexCollectionEditor<SimpleMonitorSet>), typeof(UITypeEditor))]
+ [Editor(typeof(ComplexCollectionEditor<MonitorSetBase>), typeof(UITypeEditor))]
public List<IMonitorSet> MonitorSetCollection { get; set; } = new List<IMonitorSet>();
public virtual List<IInitialConfig> GetAllDeviceInitialConfigs()
@@ -75,6 +75,7 @@
configs.AddRange(CameraConfigCollection);
configs.AddRange(PLCConfigCollection);
+ configs.AddRange(DeviceConfigs);
return configs;
}
--
Gitblit v1.8.0