瀏覽代碼

修改自动测试

ltwork 1 年之前
父節點
當前提交
90c7909c9f
共有 1 個文件被更改,包括 12 次插入16 次删除
  1. 12 16
      BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

+ 12 - 16
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -659,32 +659,28 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     {
                         MessageBox.Show("前置项条件不满足,请确认前置条件!", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
 
-                        System.Windows.Application.Current.Dispatcher.Invoke((delegate
-                        {
+                        //System.Windows.Application.Current.Dispatcher.Invoke((delegate
+                        //{
                         
-                            StopOrContinueCont = "继续";
+                        //    StopOrContinueCont = "继续";
                             
                            
-                        }));
-                        m.Reset();  //阻塞线程
-                        m.WaitOne(); //当m等于true,才会往下执行,否则一直在此等待
-                        goto start;
+                        //}));
+                        //m.Reset();  //阻塞线程
+                        //m.WaitOne(); //当m等于true,才会往下执行,否则一直在此等待
+                        //goto start;
                     }
                   
                     //条件满足
                     SendLogToDis($"自动测试完成。方案名{ScheduleName},测试项{TestName}");
-                        _logger.LogInformation($"自动测试完成。方案名{ScheduleName},测试项{TestName}");
+                    _logger.LogInformation($"自动测试完成。方案名{ScheduleName},测试项{TestName}");
 
-
-                        await Task.Delay(2000);
-                        System.Windows.Application.Current.Dispatcher.Invoke((delegate
-                        {
+                    await Task.Delay(2000);
+                    System.Windows.Application.Current.Dispatcher.Invoke((delegate
+                    {
                             //listbox 的index+1
                             SelectItemIndex++;
-                        }));
-
-                    
-
+                    }));
 
                 }
                 System.Windows.Application.Current.Dispatcher.Invoke((delegate