diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/052f7a6a-4330-432d-8a16-997312745ca1.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/052f7a6a-4330-432d-8a16-997312745ca1.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/LeatherProject/.vs/LeatherApp/FileContentIndex/052f7a6a-4330-432d-8a16-997312745ca1.vsidx differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/4cebdf18-91e4-4a08-8fde-8d4a7a119906.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/4cebdf18-91e4-4a08-8fde-8d4a7a119906.vsidx new file mode 100644 index 0000000..babefe4 Binary files /dev/null and b/LeatherProject/.vs/LeatherApp/FileContentIndex/4cebdf18-91e4-4a08-8fde-8d4a7a119906.vsidx differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/5aca7518-0bf2-4820-8884-2b834afd429c.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/5aca7518-0bf2-4820-8884-2b834afd429c.vsidx new file mode 100644 index 0000000..66e1915 Binary files /dev/null and b/LeatherProject/.vs/LeatherApp/FileContentIndex/5aca7518-0bf2-4820-8884-2b834afd429c.vsidx differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/af82f398-8707-49e6-8bcd-48dc7d4992e0.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/af82f398-8707-49e6-8bcd-48dc7d4992e0.vsidx new file mode 100644 index 0000000..70aef67 Binary files /dev/null and b/LeatherProject/.vs/LeatherApp/FileContentIndex/af82f398-8707-49e6-8bcd-48dc7d4992e0.vsidx differ diff --git a/LeatherProject/.vs/LeatherApp/FileContentIndex/ba9b1f23-a761-4e14-9a55-6ac309e227d9.vsidx b/LeatherProject/.vs/LeatherApp/FileContentIndex/ba9b1f23-a761-4e14-9a55-6ac309e227d9.vsidx new file mode 100644 index 0000000..5a06c3a Binary files /dev/null and b/LeatherProject/.vs/LeatherApp/FileContentIndex/ba9b1f23-a761-4e14-9a55-6ac309e227d9.vsidx differ diff --git a/LeatherProject/GeBoShi/SysCtrl/SysMgr.cs b/LeatherProject/GeBoShi/SysCtrl/SysMgr.cs index ae0a521..fa37735 100644 --- a/LeatherProject/GeBoShi/SysCtrl/SysMgr.cs +++ b/LeatherProject/GeBoShi/SysCtrl/SysMgr.cs @@ -2190,12 +2190,12 @@ namespace GeBoShi.SysCtrl ZXD = double.Parse(res.excelTable.Rows[i]["置信度"].ToString()), Contrast = double.Parse(res.excelTable.Rows[i]["对比度"].ToString()), Target = int.Parse(res.excelTable.Rows[i]["目标"].ToString()), - image = res.lstDefectBmp[i].Clone(), + image = DefectPauseForUser? res.lstDefectBmp[i].Clone() : null, }; defectInfo.ModifyUserCode = defectInfo.CreateUserCode = res.record.CreateUserCode; step = 6 + i * 10; - if (DefectItemsPuaseNameList.Contains(defectInfo.Name)) + if (DefectPauseForUser && DefectItemsPuaseNameList.Contains(defectInfo.Name)) { lock (lock_defectPuase) {