gongqiuhong hace 1 año
padre
commit
1be6adce31

+ 2 - 1
XdCxRhDW.App/EditForms/TaskEditor.cs

@@ -375,7 +375,8 @@ namespace XdCxRhDW.App.EditForms
                 txtDetectionWay.Properties.Items.AddEnum<EnumDetectionWay>();
                 itemDetectionWay.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
             }
-            else {
+            else 
+            {
                 itemDetectionWay.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             }
         }

+ 1 - 1
XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -853,7 +853,7 @@ namespace XdCxRhDW.App.UserControl
                         dto.TaskName = tsk.TaskName;
                         dto.PosType = (EnumPosTypeDto)(int)tsk.PosType;
                         dto.SigType = (EnumSigTypeDto)(int)tsk.SigType;
-                        
+                        dto.DmcType = (DmcTypeDto)tsk.DetectionWay.Value;
                         dto.CapDir = tsk.CapDir;
                         dto.DateDirFormat = tsk.CapDirFormat;
                         var strs = tsk.HistoryFrequpMHz.Split(',');

+ 1 - 1
XdCxRhDW.Entity/ModelEnum.cs

@@ -175,6 +175,6 @@ namespace XdCxRhDW.Entity
         /// 能量检测
         /// </summary>
         [Display(Name = "能量检测")]
-        EnergyDetection=4,
+        Ky5758 = 4,
     }
 }

+ 1 - 1
XdCxRhDw.Dto/HistoryTaskProcessingDto.cs

@@ -56,6 +56,6 @@ namespace XdCxRhDW.Dto
         public EnumSigTypeDto SigType { get; set; }
 
         [Display(Name = "检测类型")]
-        public DmcTypeDto DmcType { get; set; }
+        public DmcTypeDto? DmcType { get; set; }
     }
 }