调整节能属性上传

BLV_Studio/Test/GridTest/ReportingScenario.vb

@@ -1,4 +1,5 @@
-Imports FlexCell
+Imports BLV_Studio.TableInteraction
+Imports FlexCell
 Public Class ReportingScenario
 
 
@@ -56,9 +57,13 @@ Public Class ReportingScenario
 
 
 #Region "数据处理"
-    Public Function getDateDisposeRuning() As List(Of MDevNodeMessage)
-        Return DateDisposeRuning(Tgrd, TDevicemodel)
+    Public Function getDateDisposeRuning(Optional hide As Boolean = False) As List(Of MDevNodeMessage)
+        Return DateDisposeRuning(Tgrd, TDevicemodel, hide)
     End Function
+
+
+
+
     Public Function getDevloop() As Dictionary(Of String, String)
         Dim dic As New Dictionary(Of String, String)
         Dim devAddr, NodeLoop As String
@@ -79,9 +84,9 @@ Public Class ReportingScenario
             Next
 
         Next
-        Return Dic
+        Return dic
     End Function
-    Public Function DateDisposeRuning(_grd As FlexCell.Grid， _Devicemodel As Dictionary(Of String， DeviceModel)) As List(Of MDevNodeMessage)
+    Public Function DateDisposeRuning(_grd As FlexCell.Grid， _Devicemodel As Dictionary(Of String， DeviceModel)， Optional hide As Boolean = False) As List(Of MDevNodeMessage)
         If IsNothing(_grd) Then Return Nothing
         Dim ACtabRange As CtabRange
         Dim rt As New RoomTypeConfig(RoomTypeID)
@@ -149,7 +154,9 @@ Public Class ReportingScenario
                                     End If
                                     If DevNode.Name.ToUpper.Equals(NCtabRange.devname.ToUpper) Then '找到当前设备的当前节点
                                         For k = NCtabRange.fc To NCtabRange.lc  '遍历当前节点下属回路集合
-                                            If _grd.Column(k).Visible = True Then   '过滤隐藏的回路
+                                            '判断是否过滤隐藏回路
+
+                                            If _grd.Column(k).Visible = True OrElse hide Then   '过滤隐藏的回路
                                                 NodeLoopname = _grd.Cell(TableInteraction.TableRowNumber.FunctionChildNodeAnother, k).Text.Replace(vbLf, "").Replace(vbCr， "").Replace(":"， "").Replace("\"， "").Replace("/"， "").Replace("|"， "").Replace("'", "").Replace("'", "").Replace("?", "").Replace("!", "").Replace("`", "")
                                                 If DevNode.Nodes.Count = 1 Then
                                                     NodeLoop = 0