|
@@ -432,6 +432,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
|
|
|
private void Start()
|
|
|
{
|
|
|
CancellationToken cancellationToken = tokensource.Token;
|
|
|
+ StartEnalbe = false;
|
|
|
Task.Run(async() => //模拟耗时任务
|
|
|
{
|
|
|
|
|
@@ -449,20 +450,26 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
|
|
|
{
|
|
|
continue;
|
|
|
}
|
|
|
+ //当前选择的项不在更新显示,更新后面的显示
|
|
|
+ if(selctStartDetailId!=schDetailId)
|
|
|
+ {
|
|
|
+ globalSchDetailId = schDetailId;
|
|
|
+
|
|
|
+ //更新下一个界面显示
|
|
|
+ int id = Convert.ToInt32(globalSchDetailId);
|
|
|
+ //界面显示
|
|
|
+ System.Windows.Application.Current.Dispatcher.Invoke((delegate
|
|
|
+ {
|
|
|
+ GetDetailInfo(id);
|
|
|
+ }));
|
|
|
+ }
|
|
|
|
|
|
- globalSchDetailId = schDetailId;
|
|
|
await ExecTest();
|
|
|
- //更新下一个界面显示
|
|
|
- int id = Convert.ToInt32(globalSchDetailId);
|
|
|
- //界面显示
|
|
|
- System.Windows.Application.Current.Dispatcher.Invoke((delegate
|
|
|
- {
|
|
|
- GetDetailInfo(id);
|
|
|
- }));
|
|
|
+
|
|
|
//最后一项必须要测试
|
|
|
if (globalSchDetailId == basicSchDtls.Max(x => x.scheme_dtl_id))
|
|
|
{
|
|
|
- await ExecTest();
|
|
|
+
|
|
|
MessageBox.Show("已是此测试方案最后一个测试项!", "确认", MessageBoxButton.OK, MessageBoxImage.Information);
|
|
|
|
|
|
}
|
|
@@ -1247,6 +1254,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
|
|
|
get { return stopOrContinueCont; }
|
|
|
set { stopOrContinueCont = value; RaisePropertyChanged(); }
|
|
|
}
|
|
|
+
|
|
|
+ private bool startEnalbe = true;
|
|
|
+ public bool StartEnalbe
|
|
|
+ {
|
|
|
+ get { return startEnalbe; }
|
|
|
+ set { startEnalbe = value; RaisePropertyChanged(); }
|
|
|
+ }
|
|
|
|
|
|
#endregion
|
|
|
|