|
@@ -1065,9 +1065,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
|
|
});
|
|
});
|
|
ProVisibility = Visibility.Hidden;
|
|
ProVisibility = Visibility.Hidden;
|
|
//弹出确认的对话框
|
|
//弹出确认的对话框
|
|
|
|
+ string finalJsonStr = ModelToJsonToStr(SelectOutJudge, OutSelectLogic, OutDetail, OutConList);
|
|
|
|
+ //json字符串
|
|
|
|
+ bizTestRecordDtlDto.JudgementResultFinal = finalJsonStr;
|
|
MessageBoxResult boxResult = MessageBox.Show(OutDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
|
|
MessageBoxResult boxResult = MessageBox.Show(OutDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
|
|
if (boxResult == MessageBoxResult.OK)
|
|
if (boxResult == MessageBoxResult.OK)
|
|
{
|
|
{
|
|
|
|
+
|
|
bizTestRecordDtlDto.JudgementResult = "通过";
|
|
bizTestRecordDtlDto.JudgementResult = "通过";
|
|
StepIndex = 3;
|
|
StepIndex = 3;
|
|
}
|
|
}
|
|
@@ -1097,6 +1101,9 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
|
|
}
|
|
}
|
|
});
|
|
});
|
|
ProVisibility = Visibility.Hidden;
|
|
ProVisibility = Visibility.Hidden;
|
|
|
|
+ string finalJsonStr2 = ModelToJsonToStr(SelectOutJudge, OutSelectLogic, OutDetail, OutConList);
|
|
|
|
+ //json字符串
|
|
|
|
+ bizTestRecordDtlDto.JudgementResultFinal = finalJsonStr2;
|
|
bizTestRecordDtlDto.JudgementResult = "通过";
|
|
bizTestRecordDtlDto.JudgementResult = "通过";
|
|
StepIndex = 3;
|
|
StepIndex = 3;
|
|
break;
|
|
break;
|