ltwork hai 1 ano
pai
achega
a0d2976c19

+ 7 - 0
BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -106,6 +106,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     m.Set();  //继续线程
                     StopOrContinueCont = "暂停";
                 }
+                else
+                {
+                    if (StopOrContinueCont == "测试完成")
+                    {
+                        RequestClose?.Invoke(new DialogResult(ButtonResult.OK));
+                    }
+                }
             }
           
         }

+ 1 - 1
BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml

@@ -8,7 +8,7 @@
              xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:prism="http://prismlibrary.com/" 
              BorderBrush="#CBCBCB" BorderThickness="1" 
-             Height="600" Width="1100"   >
+             Height="600" Width="1200"   >
     <UserControl.Resources>
         <Style TargetType="TextBlock" x:Key="textBlockStyle">
             <Setter Property="Width" Value="80"/>

+ 1 - 1
BlankApp1/BlankApp1/Views/BusinessManageView/ManualTestView.xaml

@@ -9,7 +9,7 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              BorderBrush="#CBCBCB" BorderThickness="1"
-             Height="600" Width="1100" >
+             Height="600" Width="1200" >
 
     <UserControl.Resources>
         <Style TargetType="TextBlock" x:Key="textBlockStyle">

+ 1 - 1
BlankApp1/BlankApp1/Views/BusinessManageView/RetryTestView.xaml

@@ -9,7 +9,7 @@
              xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
              xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
              BorderBrush="#CBCBCB" BorderThickness="1"
-             Height="600" Width="1050" >
+             Height="600" Width="1200" >
 
     <UserControl.Resources>
         <Style TargetType="TextBlock" x:Key="textBlockStyle">