修改测试时间

BlankApp1/BlankApp1/ViewModels/BasicConfigViewModel/EditItemDetailViewModel.cs

@@ -616,11 +616,8 @@ namespace PLCTool.ViewModels.BasicConfigViewModel
                 }
                 //更新已有的测试项
                 GetExistSchs();
-                //清空已填写的内容
+                RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
 
-                BeforeConList = new ObservableCollection<BasPlcItemConfigDto>();
-                InConList = new ObservableCollection<BasPlcItemConfigDto>();
-                OutConList = new ObservableCollection<BasPlcItemConfigDto>();
             }
             catch (Exception ex)
             {

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -592,7 +592,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
 
             //输入项
             bool isAction = TestActionMethod();
-          
+            
             //输出项
             bool isJudgeResult = await TestJudgementMethod();
             //增加测试记录
@@ -1023,12 +1023,14 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 {
                                     ProVisibility = Visibility.Visible;
                                 }));
+                                //先延时，在读取，避免读取传感器刚开始的数据
+                                await Task.Delay(1000);
                                 readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
                                 if (readResult == item.PlcValue)
                                 {
                                     break;
                                 }
-                                await Task.Delay(1000);
+                              
                             }
                         });
                         //可能有多个条件判定的，第二次时间到了直接跳出延时，直接读取，不用在延时20s

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -50,7 +50,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
         private BizTestRecordDtlDto bizTestRecordDtlDto = new BizTestRecordDtlDto(); //测试方案明细表
         private const string TestMode = "手动测试";
 
-        private int delayTime = 20;
+        private int delayTime = 60;
         public ManualTestViewModel(IDialogService dialog, IEventAggregator aggregator, IOptionConfigService optionConfigService, IBasicPlcTestSchemeService basicPlcTestSchemeService, IBasicPlcTestSchemeDtlService basicPlcTestSchemeDtlService, IBizTestRecordService iBizTestRecordService, IBizTestRecordDtlService iBizTestRecordDtlService,IMapper mapper,ILogger logger)
         {
             _dialog = dialog;
@@ -576,7 +576,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 StartEnalbe = true;
                 return;
             }
-         
+           
             //输出项
             bool isJudgeResult=await TestJudgementMethod();
             if (!isJudgeResult)
@@ -1001,13 +1001,14 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 {
                                     ProVisibility = Visibility.Visible;
                                 }));
-
+                                //先延时，在读取，避免读取传感器刚开始的数据
+                                await Task.Delay(1000);
                                 readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
                                 if (readResult == item.PlcValue)
                                 {
                                     break;
                                 }
-                                await Task.Delay(1000);
+                                
                             }
                         });
                         //可能有多个条件判定的，第二次时间到了直接跳出延时，直接读取，不用在延时20s

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/RetryTestViewModel.cs

@@ -581,7 +581,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 StartEnalbe = true;
                 return;
             }
-
+           
             //输出项
             bool isJudgeResult = await TestJudgementMethod();
             if (!isJudgeResult)
@@ -1006,13 +1006,14 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 {
                                     ProVisibility = Visibility.Visible;
                                 }));
-
+                                //先延时，在读取，避免读取传感器刚开始的数据
+                                await Task.Delay(1000);
                                 readResult = PLCCom.GetInstance().ReadPlcObject(plcAddress, VarType.Bit);
                                 if (readResult == item.PlcValue)
                                 {
                                     break;
                                 }
-                                await Task.Delay(1000);
+                                
                             }
                         });
                         //可能有多个条件判定的，第二次时间到了直接跳出延时，直接读取，不用在延时20s

BlankApp1/BlankApp1/Views/MonitorManageView/PLCWriteView.xaml

@@ -17,7 +17,7 @@
     ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}"  RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}"  AlternationCount="2"
     ItemsSource="{Binding PLCItemList}"    >
             <DataGrid.Columns >
-                <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
+                <DataGridTextColumn Header="序号" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}"  />
                 <DataGridTextColumn Header="PLC变量编码" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                 <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
@@ -26,7 +26,7 @@
                     <DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
                             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                                <TextBox  Width="60" Text="{Binding PlcValue, Mode=OneWayToSource, UpdateSourceTrigger=LostFocus}"  HorizontalContentAlignment ="Left" Foreground="Black" Height="15" 
+                                <TextBox  Width="60" Text="{Binding PlcValue, Mode=OneWayToSource, UpdateSourceTrigger=LostFocus}"  HorizontalContentAlignment ="Left" Foreground="Black" Height="12" 
                                         Cursor="Hand" Margin="0,0,2,0" >
                                 </TextBox>
                                 <Button  Width="auto" Background="Transparent" HorizontalContentAlignment ="Left" Foreground="Black" Height="25" BorderThickness="0"