修改合格为通过

BlankApp1/BlankApp1/App.config

@@ -3,7 +3,7 @@
 	<appSettings>
 		<!--连接字符串 SQL Server-->
 		<add key="MySql" value="Data Source=localhost;Database=plc_point_db;User Id='root';Password='Lt,100186';port=3306;charset=utf8mb4;"/>
-		<add key="PLCIp" value="192.168.0.20"/>
+		<add key="PLCIp" value="192.168.250.1"/>
 		<add key="PLCPort" value="9600"/>
 
 	</appSettings>

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/AutoTestViewModel.cs

@@ -321,94 +321,139 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             int beforeResult = 0;
             int inResult = 0;
             int outResult = 0;
-            if (SelectLogic == "OR")
+            if (BeforeConList.Count == 0)
             {
-                var find = BeforeConList.FirstOrDefault(x => x.TestResult == "合格");
-                if (find != null)
-                {
-                    beforeResult = 1;
-                }
+                beforeResult = 1;
             }
             else
             {
-                if (SelectLogic == "AND" || SelectLogic == "ONLY")
+                if (SelectLogic == "OR")
                 {
-                    var find = BeforeConList.FirstOrDefault(x => x.TestResult == "不合格");
+                    var find = BeforeConList.FirstOrDefault(x => x.TestResult == "通过");
                     if (find != null)
+                    {
+                        beforeResult = 1;
+                    }
+                    else
                     {
                         beforeResult = 0;
                     }
                 }
                 else
                 {
-                    if (SelectLogic == "NULL")
+                    if (SelectLogic == "AND" || SelectLogic == "ONLY")
                     {
+                        var find = BeforeConList.FirstOrDefault(x => x.TestResult == "不通过");
+                        if (find != null)
+                        {
+                            beforeResult = 0;
+                        }
+                    }
+                    else
+                    {
+                        if (SelectLogic == "NULL")
+                        {
 
-                        beforeResult = 1;
+                            beforeResult = 1;
 
+                        }
                     }
                 }
             }
 
+
             //输入项
-            if (InSelectLogic == "OR")
+            if (InConList.Count == 0)
             {
-                var find = InConList.FirstOrDefault(x => x.TestResult == "合格");
-                if (find != null)
-                {
-                    inResult = 1;
-                }
+                inResult = 1;
             }
             else
             {
-                if (InSelectLogic == "AND" || InSelectLogic == "ONLY")
+                if (InSelectLogic == "OR")
                 {
-                    var find = InConList.FirstOrDefault(x => x.TestResult == "不合格");
+                    var find = InConList.FirstOrDefault(x => x.TestResult == "通过");
                     if (find != null)
+                    {
+                        inResult = 1;
+                    }
+                    else
                     {
                         inResult = 0;
                     }
                 }
                 else
                 {
-                    if (InSelectLogic == "NULL")
+                    if (InSelectLogic == "AND" || InSelectLogic == "ONLY")
                     {
+                        var find = InConList.FirstOrDefault(x => x.TestResult == "不通过");
+                        if (find != null)
+                        {
+                            inResult = 0;
+                        }
+                        else
+                        {
+                            inResult = 1;
+                        }
+                    }
+                    else
+                    {
+                        if (InSelectLogic == "NULL")
+                        {
 
-                        inResult = 1;
+                            inResult = 1;
 
+                        }
                     }
                 }
+
             }
 
+
             //输出项
-            if (OutSelectLogic == "OR")
+            if (OutConList.Count == 0)
             {
-                var find = OutConList.FirstOrDefault(x => x.TestResult == "合格");
-                if (find != null)
-                {
-                    outResult = 1;
-                }
+                outResult = 1;
             }
             else
             {
-                if (OutSelectLogic == "AND" || OutSelectLogic == "ONLY")
+                if (OutSelectLogic == "OR")
                 {
-                    var find = OutConList.FirstOrDefault(x => x.TestResult == "不合格");
+                    var find = OutConList.FirstOrDefault(x => x.TestResult == "通过");
                     if (find != null)
+                    {
+                        outResult = 1;
+                    }
+                    else
                     {
                         outResult = 0;
                     }
                 }
                 else
                 {
-                    if (OutSelectLogic == "NULL")
+                    if (OutSelectLogic == "AND" || OutSelectLogic == "ONLY")
+                    {
+                        var find = OutConList.FirstOrDefault(x => x.TestResult == "不通过");
+                        if (find != null)
+                        {
+                            outResult = 0;
+                        }
+                        else
+                        {
+                            outResult = 1;
+                        }
+                    }
+                    else
                     {
+                        if (OutSelectLogic == "NULL")
+                        {
 
-                        outResult = 1;
+                            outResult = 1;
 
+                        }
                     }
                 }
             }
+
             if (beforeResult == 1 && inResult == 1 && outResult == 1)
             {
                 return 1;
@@ -528,7 +573,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     string prefixJsonStr = ModelToJsonToStr(BeforeSelectJudge, SelectLogic, BeforeDetail, BeforeConList);
                     //json字符串
                     bizTestRecordDtlDto.PreconditionFinal = prefixJsonStr;
-                    bizTestRecordDtlDto.PreconditionResult = "合格";
+                    bizTestRecordDtlDto.PreconditionResult = "通过";
                     StepIndex = 1;
                     //MessageBoxResult boxResult = MessageBox.Show(BeforeDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
                     //if (boxResult == MessageBoxResult.OK)
@@ -537,7 +582,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     //    string prefixJsonStr = ModelToJsonToStr(BeforeSelectJudge, SelectLogic, BeforeDetail, BeforeConList);
                     //    //json字符串
                     //    bizTestRecordDtlDto.PreconditionFinal = prefixJsonStr;
-                    //    bizTestRecordDtlDto.PreconditionResult = "合格";
+                    //    bizTestRecordDtlDto.PreconditionResult = "通过";
                     //    StepIndex = 1;
                     //}
                     //else
@@ -556,7 +601,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                             string prefixJsonStrAuto = ModelToJsonToStr(BeforeSelectJudge, SelectLogic, BeforeDetail, BeforeConList);
                             //json字符串
                             bizTestRecordDtlDto.PreconditionFinal = prefixJsonStrAuto;
-                            bizTestRecordDtlDto.PreconditionResult = "合格";
+                            bizTestRecordDtlDto.PreconditionResult = "通过";
                             StepIndex = 1;
                             //MessageBoxResult boxResultAuto = MessageBox.Show(BeforeDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
                             //if (boxResultAuto == MessageBoxResult.OK)
@@ -565,7 +610,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                             //    string prefixJsonStr = ModelToJsonToStr(BeforeSelectJudge, SelectLogic, BeforeDetail, BeforeConList);
                             //    //json字符串
                             //    bizTestRecordDtlDto.PreconditionFinal = prefixJsonStr;
-                            //    bizTestRecordDtlDto.PreconditionResult = "合格";
+                            //    bizTestRecordDtlDto.PreconditionResult = "通过";
                             //    StepIndex = 1;
                             //}
                             //else
@@ -608,12 +653,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (readResult.Trim() == plcValue.Trim())
                         {
-                            item.TestResult = "合格";
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
                         break;
                     case "word":
@@ -634,23 +679,23 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 case "ONLY":
                     if ((countCond == BeforeConList.Count) && (countCond != 0))
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "合格";
+                        bizTestRecordDtlDto.PreconditionResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "不合格";
+                        bizTestRecordDtlDto.PreconditionResult = "不通过";
                     }
                     break;
                 case "OR":
                     if ((countCond != 0))
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "合格";
+                        bizTestRecordDtlDto.PreconditionResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "不合格";
+                        bizTestRecordDtlDto.PreconditionResult = "不通过";
                     }
                     break;
             }
@@ -669,20 +714,17 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             {
                 case "人工判定":
                     //弹出确认的对话框
-                    MessageBoxResult boxResult = MessageBox.Show(InDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
-                    if (boxResult == MessageBoxResult.OK)
+                    //MessageBoxResult boxResult = MessageBox.Show(InDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
+                    //if (boxResult == MessageBoxResult.OK)
                     {
                         //前置项测试结果json转化
                         string actionJsonStr = ModelToJsonToStr(SelectInJudge, InSelectLogic, InDetail, InConList);
                         //json字符串
                         bizTestRecordDtlDto.ActionFinal = actionJsonStr;
-                        bizTestRecordDtlDto.ActionResult = "合格";
+                        bizTestRecordDtlDto.ActionResult = "通过";
                         StepIndex = 2;
                     }
-                    else
-                    {
-                        isActionResult = false;
-                    }
+
 
                     break;
                 case "自动判定":
@@ -691,20 +733,17 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     {
                         case "NULL":
                             //弹出确认的对话框
-                            MessageBoxResult boxResultAction = MessageBox.Show(InDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
-                            if (boxResultAction == MessageBoxResult.OK)
+                            //MessageBoxResult boxResultAction = MessageBox.Show(InDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
+                            //if (boxResultAction == MessageBoxResult.OK)
                             {
                                 //前置项测试结果json转化
                                 string actionJsonStr = ModelToJsonToStr(SelectInJudge, InSelectLogic, InDetail, InConList);
                                 //json字符串
                                 bizTestRecordDtlDto.ActionFinal = actionJsonStr;
-                                bizTestRecordDtlDto.ActionResult = "合格";
+                                bizTestRecordDtlDto.ActionResult = "通过";
                                 StepIndex = 2;
                             }
-                            else
-                            {
-                                isActionResult = false;
-                            }
+                           
 
                             break;
                         case "AND":
@@ -746,13 +785,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (writeResult)
                         {
-                            ///单个测试项合格
-                            item.TestResult = "合格";
+                            ///单个测试项通过
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
                     
                         break;
@@ -764,13 +803,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (writeWrordResult)
                         {
-                            ///单个测试项合格
-                            item.TestResult = "合格";
+                            ///单个测试项通过
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
                       
                     
@@ -797,23 +836,23 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 case "ONLY":
                     if ((countCond == BeforeConList.Count) && (countCond != 0))
                     {
-                        bizTestRecordDtlDto.ActionResult = "合格";
+                        bizTestRecordDtlDto.ActionResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.ActionResult = "不合格";
+                        bizTestRecordDtlDto.ActionResult = "不通过";
                     }
                     break;
                 case "OR":
                     if ((countCond != 0))
                     {
-                        bizTestRecordDtlDto.ActionResult = "合格";
+                        bizTestRecordDtlDto.ActionResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.ActionResult = "不合格";
+                        bizTestRecordDtlDto.ActionResult = "不通过";
                     }
                     break;
             }
@@ -834,7 +873,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     MessageBoxResult boxResult = MessageBox.Show(OutDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
                     if (boxResult == MessageBoxResult.OK)
                     {
-                        bizTestRecordDtlDto.JudgementResult = "合格";
+                        bizTestRecordDtlDto.JudgementResult = "通过";
                         StepIndex = 3;
                     }
                     else
@@ -848,7 +887,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     switch (OutSelectLogic)
                     {
                         case "NULL":
-                            bizTestRecordDtlDto.JudgementResult = "合格";
+                            bizTestRecordDtlDto.JudgementResult = "通过";
                             StepIndex = 3;
                             break;
                         case "AND":
@@ -917,12 +956,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (readResult.Trim() == plcValue?.Trim())
                         {
-                            item.TestResult = "合格";
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
 
                         break;
@@ -955,12 +994,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (readResult2.Trim() == plcValue?.Trim())
                         {
-                            item.TestResult = "合格";
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
 
                         break;
@@ -981,23 +1020,23 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 case "ONLY":
                     if ((countCond == OutConList.Count) && (countCond != 0))
                     {
-                        bizTestRecordDtlDto.JudgementResult = "合格";
+                        bizTestRecordDtlDto.JudgementResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.JudgementResult = "不合格";
+                        bizTestRecordDtlDto.JudgementResult = "不通过";
                     }
                     break;
                 case "OR":
                     if (countCond != 0)
                     {
-                        bizTestRecordDtlDto.JudgementResult = "合格";
+                        bizTestRecordDtlDto.JudgementResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.JudgementResult = "不合格";
+                        bizTestRecordDtlDto.JudgementResult = "不通过";
                     }
                     break;
             }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/ManualTestViewModel.cs

@@ -297,94 +297,139 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
             int beforeResult = 0;
             int inResult= 0;
             int outResult = 0;
-            if (SelectLogic == "OR")
+            if(BeforeConList.Count==0)
             {
-                var find = BeforeConList.FirstOrDefault(x => x.TestResult == "合格");
-                if (find != null)
-                {
-                    beforeResult= 1;
-                }
+                beforeResult = 1;
             }
             else
             {
-                if (SelectLogic == "AND" || SelectLogic == "ONLY")
+                if (SelectLogic == "OR")
                 {
-                    var find = BeforeConList.FirstOrDefault(x => x.TestResult == "不合格");
+                    var find = BeforeConList.FirstOrDefault(x => x.TestResult == "通过");
                     if (find != null)
                     {
-                        beforeResult= 0;
+                        beforeResult = 1;
+                    }
+                    else
+                    {
+                        beforeResult = 0;
                     }
                 }
                 else
                 {
-                    if (SelectLogic == "NULL")
+                    if (SelectLogic == "AND" || SelectLogic == "ONLY")
+                    {
+                        var find = BeforeConList.FirstOrDefault(x => x.TestResult == "不通过");
+                        if (find != null)
+                        {
+                            beforeResult = 0;
+                        }
+                    }
+                    else
                     {
+                        if (SelectLogic == "NULL")
+                        {
 
-                        beforeResult= 1;
+                            beforeResult = 1;
 
+                        }
                     }
                 }
             }
-
+           
+            
             //输入项
-            if (InSelectLogic == "OR")
+            if(InConList.Count==0)
             {
-                var find = InConList.FirstOrDefault(x => x.TestResult == "合格");
-                if (find != null)
-                {
-                    inResult= 1;
-                }
+                inResult = 1;
             }
             else
             {
-                if (InSelectLogic == "AND" || InSelectLogic == "ONLY")
+                if (InSelectLogic == "OR")
                 {
-                    var find = InConList.FirstOrDefault(x => x.TestResult == "不合格");
+                    var find = InConList.FirstOrDefault(x => x.TestResult == "通过");
                     if (find != null)
                     {
-                        inResult= 0;
+                        inResult = 1;
+                    }
+                    else
+                    {
+                        inResult = 0;
                     }
                 }
                 else
                 {
-                    if (InSelectLogic == "NULL")
+                    if (InSelectLogic == "AND" || InSelectLogic == "ONLY")
                     {
+                        var find = InConList.FirstOrDefault(x => x.TestResult == "不通过");
+                        if (find != null)
+                        {
+                            inResult = 0;
+                        }
+                        else
+                        {
+                            inResult = 1;
+                        }
+                    }
+                    else
+                    {
+                        if (InSelectLogic == "NULL")
+                        {
 
-                        inResult= 1;
+                            inResult = 1;
 
+                        }
                     }
                 }
+
             }
+          
 
             //输出项
-            if (OutSelectLogic == "OR")
+            if(OutConList.Count==0)
             {
-                var find = OutConList.FirstOrDefault(x => x.TestResult == "合格");
-                if (find != null)
-                {
-                    outResult= 1;
-                }
+                outResult = 1;
             }
             else
             {
-                if (OutSelectLogic == "AND" || OutSelectLogic == "ONLY")
+                if (OutSelectLogic == "OR")
                 {
-                    var find = OutConList.FirstOrDefault(x => x.TestResult == "不合格");
+                    var find = OutConList.FirstOrDefault(x => x.TestResult == "通过");
                     if (find != null)
                     {
-                        outResult= 0;
+                        outResult = 1;
+                    }
+                    else
+                    {
+                        outResult = 0;
                     }
                 }
                 else
                 {
-                    if (OutSelectLogic == "NULL")
+                    if (OutSelectLogic == "AND" || OutSelectLogic == "ONLY")
                     {
+                        var find = OutConList.FirstOrDefault(x => x.TestResult == "不通过");
+                        if (find != null)
+                        {
+                            outResult = 0;
+                        }
+                        else
+                        {
+                            outResult = 1;
+                        }
+                    }
+                    else
+                    {
+                        if (OutSelectLogic == "NULL")
+                        {
 
-                        outResult= 1;
+                            outResult = 1;
 
+                        }
                     }
                 }
             }
+         
             if(beforeResult==1&&inResult==1&&outResult==1)
             {
                 return 1;
@@ -537,7 +582,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         string prefixJsonStr = ModelToJsonToStr(BeforeSelectJudge, SelectLogic, BeforeDetail, BeforeConList);
                         //json字符串
                         bizTestRecordDtlDto.PreconditionFinal = prefixJsonStr;
-                        bizTestRecordDtlDto.PreconditionResult = "合格";
+                        bizTestRecordDtlDto.PreconditionResult = "通过";
                         StepIndex = 1;
                     }
                     else
@@ -559,7 +604,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 string prefixJsonStr = ModelToJsonToStr(BeforeSelectJudge, SelectLogic, BeforeDetail, BeforeConList);
                                 //json字符串
                                 bizTestRecordDtlDto.PreconditionFinal = prefixJsonStr;
-                                bizTestRecordDtlDto.PreconditionResult = "合格";
+                                bizTestRecordDtlDto.PreconditionResult = "通过";
                                 StepIndex = 1;
                             }
                             else
@@ -602,12 +647,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (readResult.Trim() == plcValue?.Trim())
                         {
-                            item.TestResult = "合格";
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
                         break;
                     case "word":
@@ -628,23 +673,23 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 case "ONLY":
                     if ((countCond == BeforeConList.Count) && (countCond != 0))
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "合格";
+                        bizTestRecordDtlDto.PreconditionResult = "通过";
                     
                     }
                     else
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "不合格";
+                        bizTestRecordDtlDto.PreconditionResult = "不通过";
                     }
                     break;
                 case "OR":
                     if ( (countCond != 0))
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "合格";
+                        bizTestRecordDtlDto.PreconditionResult = "通过";
                       
                     }
                     else
                     {
-                        bizTestRecordDtlDto.PreconditionResult = "不合格";
+                        bizTestRecordDtlDto.PreconditionResult = "不通过";
                     }
                     break;
             }
@@ -670,7 +715,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         string actionJsonStr = ModelToJsonToStr(SelectInJudge, InSelectLogic, InDetail, InConList);
                         //json字符串
                         bizTestRecordDtlDto.ActionFinal = actionJsonStr;
-                        bizTestRecordDtlDto.ActionResult = "合格";
+                        bizTestRecordDtlDto.ActionResult = "通过";
                         StepIndex = 2;
                     }
                     else
@@ -692,7 +737,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 string actionJsonStr = ModelToJsonToStr(SelectInJudge, InSelectLogic, InDetail, InConList);
                                 //json字符串
                                 bizTestRecordDtlDto.ActionFinal = actionJsonStr;
-                                bizTestRecordDtlDto.ActionResult = "合格";
+                                bizTestRecordDtlDto.ActionResult = "通过";
                                 StepIndex = 2;
                             }
                             else
@@ -749,13 +794,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 item.TestTime = DateTime.Now;
                                 if (writeResult)
                                 {
-                                    ///单个测试项合格
-                                    item.TestResult = "合格";
+                                    ///单个测试项通过
+                                    item.TestResult = "通过";
                                     countCond++;
                                 }
                                 else
                                 {
-                                    item.TestResult = "不合格";
+                                    item.TestResult = "不通过";
                                 }
                             }
                             else
@@ -781,13 +826,13 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                                 item.TestTime = DateTime.Now;
                                 if (writeResult)
                                 {
-                                    ///单个测试项合格
-                                    item.TestResult = "合格";
+                                    ///单个测试项通过
+                                    item.TestResult = "通过";
                                     countCond++;
                                 }
                                 else
                                 {
-                                    item.TestResult = "不合格";
+                                    item.TestResult = "不通过";
                                 }
                             }
                             else
@@ -819,23 +864,23 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 case "ONLY":
                     if ((countCond == BeforeConList.Count) && (countCond != 0))
                     {
-                        bizTestRecordDtlDto.ActionResult = "合格";
+                        bizTestRecordDtlDto.ActionResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.ActionResult = "不合格";
+                        bizTestRecordDtlDto.ActionResult = "不通过";
                     }
                     break;
                 case "OR":
                     if ((countCond != 0))
                     {
-                        bizTestRecordDtlDto.ActionResult = "合格";
+                        bizTestRecordDtlDto.ActionResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.ActionResult = "不合格";
+                        bizTestRecordDtlDto.ActionResult = "不通过";
                     }
                     break;
             }
@@ -856,7 +901,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     MessageBoxResult boxResult = MessageBox.Show(OutDetail, "确认", MessageBoxButton.OKCancel, MessageBoxImage.Information);
                     if (boxResult == MessageBoxResult.OK)
                     {
-                        bizTestRecordDtlDto.JudgementResult = "合格";
+                        bizTestRecordDtlDto.JudgementResult = "通过";
                         StepIndex = 3;
                     }
                     else
@@ -870,7 +915,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                     switch (OutSelectLogic)
                     {
                         case "NULL":
-                            bizTestRecordDtlDto.JudgementResult = "合格";
+                            bizTestRecordDtlDto.JudgementResult = "通过";
                             StepIndex = 3;
                             break;
                         case "AND":
@@ -932,12 +977,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (readResult.Trim() == plcValue?.Trim())
                         {
-                            item.TestResult = "合格";
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
 
                         break;
@@ -970,12 +1015,12 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         item.TestTime = DateTime.Now;
                         if (readResult2.Trim() == plcValue?.Trim())
                         {
-                            item.TestResult = "合格";
+                            item.TestResult = "通过";
                             countCond++;
                         }
                         else
                         {
-                            item.TestResult = "不合格";
+                            item.TestResult = "不通过";
                         }
 
                         break;
@@ -996,23 +1041,23 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                 case "ONLY":
                     if ((countCond == OutConList.Count) && (countCond != 0))
                     {
-                        bizTestRecordDtlDto.JudgementResult = "合格";
+                        bizTestRecordDtlDto.JudgementResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.JudgementResult = "不合格";
+                        bizTestRecordDtlDto.JudgementResult = "不通过";
                     }
                     break;
                 case "OR":
                     if ( countCond != 0)
                     {
-                        bizTestRecordDtlDto.JudgementResult = "合格";
+                        bizTestRecordDtlDto.JudgementResult = "通过";
 
                     }
                     else
                     {
-                        bizTestRecordDtlDto.JudgementResult = "不合格";
+                        bizTestRecordDtlDto.JudgementResult = "不通过";
                     }
                     break;
             }

BlankApp1/BlankApp1/ViewModels/BusinessManageViewModel/QueryViewModel.cs

@@ -189,7 +189,7 @@ namespace PLCTool.ViewModels.BusinessManageViewModel
                         }
                     }
                 }
-                //判断方案结果是否合格
+                //判断方案结果是否通过
                 var testCount = allConfigList.FindAll(X => X.SchemeName == findSch.scheme_name&&X.TestResult=="通过")?.Count;
                 if(testCount== allResult.Count)
                 {

BlankApp1/BlankApp1/ViewModels/StatisticsViewModel.cs

@@ -195,12 +195,12 @@ namespace BlankApp1.ViewModels
             nochartvalue.Add(noSuccTest);
             PieSeries series = new PieSeries();
             series.DataLabels = true;
-            series.Title = "合格率";
+            series.Title = "通过率";
             series.Values = chartvalue;
 
             PieSeries series2 = new PieSeries();
             series2.DataLabels = true;
-            series2.Title = "不合格率";
+            series2.Title = "不通过率";
             series2.Values = nochartvalue;
             PieSeriesCollectionPLC.Add(series);
             PieSeriesCollectionPLC.Add(series2);
@@ -226,7 +226,7 @@ namespace BlankApp1.ViewModels
             PieSeries series2 = new PieSeries();
             series2.DataLabels = true;
             series2.Title = "不通过";
-            series2.Values = chartvalue;
+            series2.Values = noChartvalue;
             PieSeriesCollectionFail.Add(series);
             PieSeriesCollectionFail.Add(series2);
 

BlankApp1/BlankApp1/Views/BusinessManageView/AutoTestView.xaml

@@ -33,19 +33,19 @@
         <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="10">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="测试方案名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
+                <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" IsReadOnly="True"  />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}" IsReadOnly="True" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <ComboBox  Height="28" Width="120" ItemsSource="{Binding TestKinds}" SelectedItem="{Binding SelectTest}" />
+                <TextBox  Height="28" Width="120" Text="{Binding SelectTest}" IsReadOnly="True"  />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="测试项名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="160"  Text="{Binding TestName}"/>
+                <TextBox  Height="28" Width="160"  Text="{Binding TestName}" IsReadOnly="True" />
             </StackPanel>
             
         </StackPanel>
@@ -68,19 +68,19 @@
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="测试项类型:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding BeforeJudgeKinds}" SelectedItem="{Binding BeforeSelectJudge}" />
+                        <TextBox  Height="28" Width="150"  Text="{Binding BeforeSelectJudge}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="1"  >
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="明细判定逻辑:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding JudgeLogicKinds}" SelectedItem="{Binding SelectLogic}"/>
+                        <TextBox   Height="28" Width="150" Text="{Binding SelectLogic}" IsReadOnly="True"/> 
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="2">
                     <DockPanel LastChildFill="True" >
                         <TextBlock Text="前置项描述:"   Style="{StaticResource textBlockStyle}" />
-                        <RichTextBox  Margin="0,5,5,5" >
+                        <RichTextBox  Margin="0,5,5,5" IsReadOnly="True" >
                             <FlowDocument>
                                 <Paragraph>
                                     <Run Text="{Binding BeforeDetail,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -109,7 +109,7 @@
                         <DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                        <DataGridTextColumn Header="测试时间" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                        <DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                     </DataGrid.Columns>
@@ -136,19 +136,19 @@
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="测试项类型:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding InJudgeKinds}" SelectedItem="{Binding SelectInJudge}" />
+                        <TextBox  Height="28" Width="150"  Text="{Binding SelectInJudge}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="1"  >
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="明细判定逻辑:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding InJudgeLogicKinds}" SelectedItem="{Binding InSelectLogic}"/>
+                        <TextBox  Height="28" Width="150"  Text="{Binding InSelectLogic}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="2">
                     <DockPanel LastChildFill="True" >
                         <TextBlock Text="输入项描述:"   Style="{StaticResource textBlockStyle}" />
-                        <RichTextBox  Margin="0,5,5,5" >
+                        <RichTextBox  Margin="0,5,5,5" IsReadOnly="True" >
                             <FlowDocument>
                                 <Paragraph>
                                     <Run Text="{Binding InDetail,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -177,7 +177,7 @@
                         <DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                        <DataGridTextColumn Header="测试时间" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                        <DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                     </DataGrid.Columns>
@@ -205,19 +205,19 @@
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="测试项类型:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding OutJudgeKinds}" SelectedItem="{Binding SelectOutJudge}" />
+                        <TextBox  Height="28" Width="150"  Text="{Binding SelectOutJudge}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="1"  >
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="明细判定逻辑:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding OutJudgeLogicKinds}" SelectedItem="{Binding OutSelectLogic}"/>
+                        <TextBox  Height="28" Width="150"  Text="{Binding OutSelectLogic}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="2">
                     <DockPanel LastChildFill="True" >
                         <TextBlock Text="结果项描述:"   Style="{StaticResource textBlockStyle}" />
-                        <RichTextBox  Margin="0,5,5,5" >
+                        <RichTextBox  Margin="0,5,5,5" IsReadOnly="True"  >
                             <FlowDocument>
                                 <Paragraph>
                                     <Run Text="{Binding OutDetail,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -245,7 +245,7 @@
                         <DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                        <DataGridTextColumn Header="测试时间" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                        <DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                     </DataGrid.Columns>

BlankApp1/BlankApp1/Views/BusinessManageView/ManualTestView.xaml

@@ -34,19 +34,19 @@
         <StackPanel Orientation="Horizontal" Grid.Row="0" Margin="10">
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="测试方案名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" />
+                <TextBox  Height="28" Width="120" Text="{Binding ScheduleName}" IsReadOnly="True" />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="设备名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}"/>
+                <TextBox  Height="28" Width="120" Text="{Binding DeviceName}" IsReadOnly="True" />
             </StackPanel>
             <StackPanel Orientation="Horizontal" >
                 <TextBlock Text="测试项类型:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <ComboBox  Height="28" Width="120" ItemsSource="{Binding TestKinds}" SelectedItem="{Binding SelectTest}" />
+                <TextBox  Height="28" Width="120"  Text="{Binding SelectTest}" IsReadOnly="True"  />
             </StackPanel>
             <StackPanel Orientation="Horizontal">
                 <TextBlock Text="测试项名称:"  Style="{StaticResource NormalTextBlockStyle}" Margin="10,0,5,0"/>
-                <TextBox  Height="28" Width="160"  Text="{Binding TestName}"/>
+                <TextBox  Height="28" Width="160"  Text="{Binding TestName}" IsReadOnly="True" />
             </StackPanel>
 
         </StackPanel>
@@ -69,19 +69,19 @@
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="测试项类型:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding BeforeJudgeKinds}" SelectedItem="{Binding BeforeSelectJudge}" />
+                        <TextBox  Height="28" Width="150"  Text="{Binding BeforeSelectJudge}" IsReadOnly="True"  />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="1"  >
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="明细判定逻辑:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding JudgeLogicKinds}" SelectedItem="{Binding SelectLogic}"/>
+                        <TextBox  Height="28" Width="150" Text="{Binding SelectLogic}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="2">
                     <DockPanel LastChildFill="True" >
                         <TextBlock Text="前置项描述:"   Style="{StaticResource textBlockStyle}" />
-                        <RichTextBox  Margin="0,5,5,5" >
+                        <RichTextBox  Margin="0,5,5,5" IsReadOnly="True" >
                             <FlowDocument>
                                 <Paragraph>
                                     <Run Text="{Binding BeforeDetail,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -110,7 +110,7 @@
                         <DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                        <DataGridTextColumn Header="测试时间" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                        <DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
 
@@ -138,19 +138,19 @@
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="测试项类型:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding InJudgeKinds}" SelectedItem="{Binding SelectInJudge}" />
+                        <TextBox  Height="28" Width="150"  Text="{Binding SelectInJudge}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="1"  >
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="明细判定逻辑:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding InJudgeLogicKinds}" SelectedItem="{Binding InSelectLogic}"/>
+                        <TextBox  Height="28" Width="150"  Text="{Binding InSelectLogic}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="2">
                     <DockPanel LastChildFill="True" >
                         <TextBlock Text="输入项描述:"   Style="{StaticResource textBlockStyle}" />
-                        <RichTextBox  Margin="0,5,5,5" >
+                        <RichTextBox  Margin="0,5,5,5" IsReadOnly="True"  >
                             <FlowDocument>
                                 <Paragraph>
                                     <Run Text="{Binding InDetail,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -179,7 +179,7 @@
                         <DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                        <DataGridTextColumn Header="测试时间" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                        <DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
 
@@ -208,19 +208,19 @@
                 <Grid Grid.Row="0">
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="测试项类型:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding OutJudgeKinds}" SelectedItem="{Binding SelectOutJudge}" />
+                        <TextBox  Height="28" Width="150"  Text="{Binding SelectOutJudge}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="1"  >
                     <StackPanel Orientation="Horizontal" >
                         <TextBlock Text="明细判定逻辑:"  Style="{StaticResource textBlockStyle}"/>
-                        <ComboBox  Height="28" Width="150" ItemsSource="{Binding OutJudgeLogicKinds}" SelectedItem="{Binding OutSelectLogic}"/>
+                        <TextBox  Height="28" Width="150"  Text="{Binding OutSelectLogic}" IsReadOnly="True" />
                     </StackPanel>
                 </Grid>
                 <Grid Grid.Row="2">
                     <DockPanel LastChildFill="True" >
                         <TextBlock Text="结果项描述:"   Style="{StaticResource textBlockStyle}" />
-                        <RichTextBox  Margin="0,5,5,5" >
+                        <RichTextBox  Margin="0,5,5,5" IsReadOnly="True" >
                             <FlowDocument>
                                 <Paragraph>
                                     <Run Text="{Binding OutDetail,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
@@ -249,7 +249,7 @@
                         <DataGridTextColumn Header="PLC变量名" Binding="{Binding PlcItem}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="判定值" Binding="{Binding PlcValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="描述" Binding="{Binding Remark}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
-                        <DataGridTextColumn Header="测试时间" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
+                        <DataGridTextColumn Header="测试时间" Width="160" Binding="{Binding TestTime,StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="实际值" Binding="{Binding RealValue}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
                         <DataGridTextColumn Header="结果" Binding="{Binding TestResult}" CellStyle="{StaticResource MyDataGridCellStyle}"/>
 

BlankApp1/Model/Dto/BizTestRecordDtlDto.cs

@@ -64,12 +64,12 @@ namespace Model.Dto
 
 
         /// <summary>
-        /// 前置项测试项  合格 不合格
+        /// 前置项测试项  通过 不通过
         /// </summary>
         public string PreconditionResult { get; set; }
 
         /// <summary>
-        /// Desc:测试项输入项结果 合格 不合格
+        /// Desc:测试项输入项结果 通过 不通过
         /// Default:
         /// Nullable:True
         /// </summary>