diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8d72cbc6-8db1-48e2-8d4f-edaac6ec691a.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8d72cbc6-8db1-48e2-8d4f-edaac6ec691a.vsidx deleted file mode 100644 index 6772434..0000000 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/8d72cbc6-8db1-48e2-8d4f-edaac6ec691a.vsidx and /dev/null differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/c3787771-ed0a-46d2-9f0b-24aae0d34498.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/c3787771-ed0a-46d2-9f0b-24aae0d34498.vsidx new file mode 100644 index 0000000..0f75072 Binary files /dev/null and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/c3787771-ed0a-46d2-9f0b-24aae0d34498.vsidx differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo index be72f6b..7e5b1d9 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/v17/.suo differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs index 6df65c5..694445c 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/ADCPDataForm.cs @@ -144,36 +144,136 @@ namespace ZTTMS_Manage_yibayiyi_20230320 if (isCreate == false) { isCreate = true; + + chkSpeed1.CheckState = CheckState.Checked; + chkSpeed2.CheckState = CheckState.Unchecked; + chkSpeed3.CheckState = CheckState.Unchecked; + chkSpeed4.CheckState = CheckState.Unchecked; + chkSpeed5.CheckState = CheckState.Unchecked; + chkLocation1.CheckState = CheckState.Unchecked; + chkLocation2.CheckState = CheckState.Unchecked; + chkLocation3.CheckState = CheckState.Unchecked; + chkLocation4.CheckState = CheckState.Unchecked; + chkLocation5.CheckState = CheckState.Unchecked; + chkHeight.CheckState = CheckState.Unchecked; + chkPeriod.CheckState = CheckState.Unchecked; + chkWaveLocation.CheckState = CheckState.Unchecked; + chkDepth.CheckState = CheckState.Unchecked; } + else + { + if(chkSpeed1.Checked) + chkSpeed1.CheckState = CheckState.Checked; + else + { + chkSpeed1.CheckState = CheckState.Checked; + chkSpeed1.CheckState = CheckState.Unchecked; + } - chkSpeed1.CheckState = CheckState.Checked; - chkSpeed2.CheckState = CheckState.Checked; - chkSpeed3.CheckState = CheckState.Checked; - chkSpeed4.CheckState = CheckState.Checked; - chkSpeed5.CheckState = CheckState.Checked; - chkLocation1.CheckState = CheckState.Checked; - chkLocation2.CheckState = CheckState.Checked; - chkLocation3.CheckState = CheckState.Checked; - chkLocation4.CheckState = CheckState.Checked; - chkLocation5.CheckState = CheckState.Checked; - chkHeight.CheckState = CheckState.Checked; - chkPeriod.CheckState = CheckState.Checked; - chkWaveLocation.CheckState = CheckState.Checked; - chkDepth.CheckState = CheckState.Checked; + if(chkSpeed2.Checked) + chkSpeed2.CheckState = CheckState.Checked; + else + { + chkSpeed2.CheckState = CheckState.Checked; + chkSpeed2.CheckState = CheckState.Unchecked; + } - chkSpeed2.CheckState = CheckState.Unchecked; - chkSpeed3.CheckState = CheckState.Unchecked; - chkSpeed4.CheckState = CheckState.Unchecked; - chkSpeed5.CheckState = CheckState.Unchecked; - chkLocation1.CheckState = CheckState.Unchecked; - chkLocation2.CheckState = CheckState.Unchecked; - chkLocation3.CheckState = CheckState.Unchecked; - chkLocation4.CheckState = CheckState.Unchecked; - chkLocation5.CheckState = CheckState.Unchecked; - chkHeight.CheckState = CheckState.Unchecked; - chkPeriod.CheckState = CheckState.Unchecked; - chkWaveLocation.CheckState = CheckState.Unchecked; - chkDepth.CheckState = CheckState.Unchecked; + if( chkSpeed3.Checked) + chkSpeed3.CheckState = CheckState.Checked; + else + { + chkSpeed3.CheckState = CheckState.Checked; + chkSpeed3.CheckState = CheckState.Unchecked; + } + + if(chkSpeed4.Checked) + chkSpeed4.CheckState = CheckState.Checked; + else + { + chkSpeed4.CheckState = CheckState.Checked; + chkSpeed4.CheckState = CheckState.Unchecked; + } + + if(chkSpeed5.Checked) + chkSpeed5.CheckState = CheckState.Checked; + else + { + chkSpeed5.CheckState = CheckState.Checked; + chkSpeed5.CheckState = CheckState.Unchecked; + } + + if(chkLocation1.Checked) + chkLocation1.CheckState = CheckState.Checked; + else + { + chkLocation1.CheckState = CheckState.Checked; + chkLocation1.CheckState = CheckState.Unchecked; + } + + if(chkLocation2.Checked) + chkLocation2.CheckState = CheckState.Checked; + else + { + chkLocation2.CheckState = CheckState.Checked; + chkLocation2.CheckState = CheckState.Unchecked; + } + + if(chkLocation3.Checked) + chkLocation3.CheckState = CheckState.Checked; + else + { + chkLocation3.CheckState = CheckState.Checked; + chkLocation3.CheckState = CheckState.Unchecked; + } + + if(chkLocation4.Checked) + chkLocation4.CheckState = CheckState.Checked; + else + { + chkLocation4.CheckState = CheckState.Checked; + chkLocation4.CheckState = CheckState.Unchecked; + } + + if(chkLocation5.Checked) + chkLocation5.CheckState = CheckState.Checked; + else + { + chkLocation5.CheckState = CheckState.Checked; + chkLocation5.CheckState = CheckState.Unchecked; + } + + if(chkHeight.Checked) + chkHeight.CheckState = CheckState.Checked; + else + { + chkHeight.CheckState = CheckState.Checked; + chkHeight.CheckState = CheckState.Unchecked; + } + + if(chkPeriod.Checked) + chkPeriod.CheckState = CheckState.Checked; + else + { + chkPeriod.CheckState = CheckState.Checked; + chkPeriod.CheckState = CheckState.Unchecked; + } + + if(chkWaveLocation.Checked) + chkWaveLocation.CheckState = CheckState.Checked; + else + { + chkWaveLocation.CheckState = CheckState.Checked; + chkWaveLocation.CheckState = CheckState.Unchecked; + } + + if(chkDepth.Checked) + chkDepth.CheckState = CheckState.Checked; + else + { + chkDepth.CheckState = CheckState.Checked; + chkDepth.CheckState = CheckState.Unchecked; + } + } pnlCheckShow.Visible = true; zgcADCPCurve.Visible = true; @@ -386,7 +486,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 } - if (k > 0) + if (k > 0 && !isCreate) { yAxis = new YAxis(); zgcADCPCurve.GraphPane.YAxisList.Add(yAxis); @@ -434,34 +534,117 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { CreateGraph(); - chkSpeed1.CheckState = CheckState.Checked; - chkSpeed2.CheckState = CheckState.Checked; - chkSpeed3.CheckState = CheckState.Checked; - chkSpeed4.CheckState = CheckState.Checked; - chkSpeed5.CheckState = CheckState.Checked; - chkLocation1.CheckState = CheckState.Checked; - chkLocation2.CheckState = CheckState.Checked; - chkLocation3.CheckState = CheckState.Checked; - chkLocation4.CheckState = CheckState.Checked; - chkLocation5.CheckState = CheckState.Checked; - chkHeight.CheckState = CheckState.Checked; - chkPeriod.CheckState = CheckState.Checked; - chkWaveLocation.CheckState = CheckState.Checked; - chkDepth.CheckState = CheckState.Checked; + if (chkSpeed1.Checked) + chkSpeed1.CheckState = CheckState.Checked; + else + { + chkSpeed1.CheckState = CheckState.Checked; + chkSpeed1.CheckState = CheckState.Unchecked; + } - chkSpeed2.CheckState = CheckState.Unchecked; - chkSpeed3.CheckState = CheckState.Unchecked; - chkSpeed4.CheckState = CheckState.Unchecked; - chkSpeed5.CheckState = CheckState.Unchecked; - chkLocation1.CheckState = CheckState.Unchecked; - chkLocation2.CheckState = CheckState.Unchecked; - chkLocation3.CheckState = CheckState.Unchecked; - chkLocation4.CheckState = CheckState.Unchecked; - chkLocation5.CheckState = CheckState.Unchecked; - chkHeight.CheckState = CheckState.Unchecked; - chkPeriod.CheckState = CheckState.Unchecked; - chkWaveLocation.CheckState = CheckState.Unchecked; - chkDepth.CheckState = CheckState.Unchecked; + if (chkSpeed2.Checked) + chkSpeed2.CheckState = CheckState.Checked; + else + { + chkSpeed2.CheckState = CheckState.Checked; + chkSpeed2.CheckState = CheckState.Unchecked; + } + + if (chkSpeed3.Checked) + chkSpeed3.CheckState = CheckState.Checked; + else + { + chkSpeed3.CheckState = CheckState.Checked; + chkSpeed3.CheckState = CheckState.Unchecked; + } + + if (chkSpeed4.Checked) + chkSpeed4.CheckState = CheckState.Checked; + else + { + chkSpeed4.CheckState = CheckState.Checked; + chkSpeed4.CheckState = CheckState.Unchecked; + } + + if (chkSpeed5.Checked) + chkSpeed5.CheckState = CheckState.Checked; + else + { + chkSpeed5.CheckState = CheckState.Checked; + chkSpeed5.CheckState = CheckState.Unchecked; + } + + if (chkLocation1.Checked) + chkLocation1.CheckState = CheckState.Checked; + else + { + chkLocation1.CheckState = CheckState.Checked; + chkLocation1.CheckState = CheckState.Unchecked; + } + + if (chkLocation2.Checked) + chkLocation2.CheckState = CheckState.Checked; + else + { + chkLocation2.CheckState = CheckState.Checked; + chkLocation2.CheckState = CheckState.Unchecked; + } + + if (chkLocation3.Checked) + chkLocation3.CheckState = CheckState.Checked; + else + { + chkLocation3.CheckState = CheckState.Checked; + chkLocation3.CheckState = CheckState.Unchecked; + } + + if (chkLocation4.Checked) + chkLocation4.CheckState = CheckState.Checked; + else + { + chkLocation4.CheckState = CheckState.Checked; + chkLocation4.CheckState = CheckState.Unchecked; + } + + if (chkLocation5.Checked) + chkLocation5.CheckState = CheckState.Checked; + else + { + chkLocation5.CheckState = CheckState.Checked; + chkLocation5.CheckState = CheckState.Unchecked; + } + + if (chkHeight.Checked) + chkHeight.CheckState = CheckState.Checked; + else + { + chkHeight.CheckState = CheckState.Checked; + chkHeight.CheckState = CheckState.Unchecked; + } + + if (chkPeriod.Checked) + chkPeriod.CheckState = CheckState.Checked; + else + { + chkPeriod.CheckState = CheckState.Checked; + chkPeriod.CheckState = CheckState.Unchecked; + } + + if (chkWaveLocation.Checked) + chkWaveLocation.CheckState = CheckState.Checked; + else + { + chkWaveLocation.CheckState = CheckState.Checked; + chkWaveLocation.CheckState = CheckState.Unchecked; + } + + if (chkDepth.Checked) + chkDepth.CheckState = CheckState.Checked; + else + { + chkDepth.CheckState = CheckState.Checked; + chkDepth.CheckState = CheckState.Unchecked; + } } EveryDayLog.WriteADCP("ADCP进行刷新数据操作!"); @@ -910,9 +1093,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320 if (zgcADCPCurve.GraphPane.CurveList.Count > 0) { zgcADCPCurve.ZoomOutAll(zgcADCPCurve.GraphPane); - zgcADCPCurve.GraphPane.YAxisList[0].Title.IsVisible = !zgcADCPCurve.GraphPane.CurveList[0].IsVisible; - zgcADCPCurve.GraphPane.YAxisList[0].Scale.IsVisible = !zgcADCPCurve.GraphPane.CurveList[0].IsVisible; - zgcADCPCurve.GraphPane.CurveList[0].IsVisible = !zgcADCPCurve.GraphPane.CurveList[0].IsVisible; + //zgcADCPCurve.GraphPane.YAxisList[0].Title.IsVisible = !zgcADCPCurve.GraphPane.CurveList[0].IsVisible; + //zgcADCPCurve.GraphPane.YAxisList[0].Scale.IsVisible = !zgcADCPCurve.GraphPane.CurveList[0].IsVisible; + zgcADCPCurve.GraphPane.YAxisList[0].IsVisible = chkSpeed1.Checked; + zgcADCPCurve.GraphPane.CurveList[0].IsVisible = chkSpeed1.Checked; zgcADCPCurve.Invalidate(); zgcADCPCurve.Refresh(); } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs index d541eb9..83b06d6 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CO2DataForm.cs @@ -542,10 +542,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320 if (zgcCO2Curve.GraphPane.CurveList.Count > 0) { zgcCO2Curve.ZoomOutAll(zgcCO2Curve.GraphPane); - //zgcMutiCurve.GraphPane.YAxisList[0].IsVisible = !zgcMutiCurve.GraphPane.YAxisList[0].IsVisible; - zgcCO2Curve.GraphPane.YAxisList[0].Title.IsVisible = !zgcCO2Curve.GraphPane.CurveList[0].IsVisible; - zgcCO2Curve.GraphPane.YAxisList[0].Scale.IsVisible = !zgcCO2Curve.GraphPane.CurveList[0].IsVisible; - zgcCO2Curve.GraphPane.CurveList[0].IsVisible = !zgcCO2Curve.GraphPane.CurveList[0].IsVisible; + zgcCO2Curve.GraphPane.YAxisList[0].IsVisible = chkConc.Checked; + //zgcCO2Curve.GraphPane.YAxisList[0].Title.IsVisible = !zgcCO2Curve.GraphPane.CurveList[0].IsVisible; + //zgcCO2Curve.GraphPane.YAxisList[0].Scale.IsVisible = !zgcCO2Curve.GraphPane.CurveList[0].IsVisible; + zgcCO2Curve.GraphPane.CurveList[0].IsVisible = chkConc.Checked; zgcCO2Curve.Invalidate(); zgcCO2Curve.Refresh(); } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs index 861c670..a51020d 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CTDDataForm.cs @@ -249,14 +249,37 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { CreateGraph(); - chkTemp.CheckState = CheckState.Checked; - chkCond.CheckState = CheckState.Checked; - chkPressure.CheckState = CheckState.Checked; - chkSalinity.CheckState = CheckState.Checked; + if (chkTemp.Checked) + chkTemp.CheckState = CheckState.Checked; + else + { + chkTemp.CheckState = CheckState.Checked; + chkTemp.CheckState = CheckState.Unchecked; + } - chkCond.CheckState = CheckState.Unchecked; - chkPressure.CheckState = CheckState.Unchecked; - chkSalinity.CheckState = CheckState.Unchecked; + if (chkCond.Checked) + chkCond.CheckState = CheckState.Checked; + else + { + chkCond.CheckState = CheckState.Checked; + chkCond.CheckState = CheckState.Unchecked; + } + + if (chkPressure.Checked) + chkPressure.CheckState = CheckState.Checked; + else + { + chkPressure.CheckState = CheckState.Checked; + chkPressure.CheckState = CheckState.Unchecked; + } + + if (chkSalinity.Checked) + chkSalinity.CheckState = CheckState.Checked; + else + { + chkSalinity.CheckState = CheckState.Checked; + chkSalinity.CheckState = CheckState.Unchecked; + } } EveryDayLog.WriteCTD("CTD进行刷新数据操作!"); @@ -419,17 +442,47 @@ namespace ZTTMS_Manage_yibayiyi_20230320 if (isCreate == false) { isCreate = true; + + chkTemp.CheckState = CheckState.Checked; + chkCond.CheckState = CheckState.Unchecked; + chkPressure.CheckState = CheckState.Unchecked; + chkSalinity.CheckState = CheckState.Unchecked; } + else + { + if(chkTemp.Checked) + chkTemp.CheckState = CheckState.Checked; + else + { + chkTemp.CheckState = CheckState.Checked; + chkTemp.CheckState = CheckState.Unchecked; + } - chkTemp.CheckState = CheckState.Checked; - chkCond.CheckState = CheckState.Checked; - chkPressure.CheckState = CheckState.Checked; - chkSalinity.CheckState = CheckState.Checked; + if(chkCond.Checked) + chkCond.CheckState = CheckState.Checked; + else + { + chkCond.CheckState = CheckState.Checked; + chkCond.CheckState = CheckState.Unchecked; + } - chkCond.CheckState = CheckState.Unchecked; - chkPressure.CheckState = CheckState.Unchecked; - chkSalinity.CheckState = CheckState.Unchecked; + if(chkPressure.Checked) + chkPressure.CheckState = CheckState.Checked; + else + { + chkPressure.CheckState = CheckState.Checked; + chkPressure.CheckState = CheckState.Unchecked; + } + if(chkSalinity.Checked) + chkSalinity.CheckState = CheckState.Checked; + else + { + chkSalinity.CheckState = CheckState.Checked; + chkSalinity.CheckState = CheckState.Unchecked; + } + } + pnlCheckShow.Visible = true; zgcCTDCurve.Visible = true; lblTips.Visible = true; @@ -752,10 +805,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320 if (zgcCTDCurve.GraphPane.CurveList.Count > 0) { zgcCTDCurve.ZoomOutAll(zgcCTDCurve.GraphPane); - //zgcCTDCurve.GraphPane.YAxisList[0].IsVisible = !zgcCTDCurve.GraphPane.YAxisList[0].IsVisible; - zgcCTDCurve.GraphPane.YAxisList[0].Title.IsVisible = !zgcCTDCurve.GraphPane.CurveList[0].IsVisible; - zgcCTDCurve.GraphPane.YAxisList[0].Scale.IsVisible = !zgcCTDCurve.GraphPane.CurveList[0].IsVisible; - zgcCTDCurve.GraphPane.CurveList[0].IsVisible = !zgcCTDCurve.GraphPane.CurveList[0].IsVisible; + zgcCTDCurve.GraphPane.YAxisList[0].IsVisible = chkTemp.Checked; + //zgcCTDCurve.GraphPane.YAxisList[0].Title.IsVisible = !zgcCTDCurve.GraphPane.CurveList[0].IsVisible; + //zgcCTDCurve.GraphPane.YAxisList[0].Scale.IsVisible = !zgcCTDCurve.GraphPane.CurveList[0].IsVisible; + zgcCTDCurve.GraphPane.CurveList[0].IsVisible = chkTemp.Checked; zgcCTDCurve.Invalidate(); zgcCTDCurve.Refresh(); } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/GDFLPortStateForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/GDFLPortStateForm.cs index d3e527c..6bf2edd 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/GDFLPortStateForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/GDFLPortStateForm.cs @@ -235,12 +235,18 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { string sql = $"select * from tb_gdflstateinfo_portdata where controlstate!='' order by record_time desc limit 1;"; MySqlDataReader dataReader = MySQL.ExecuteReader(sql); - if (dataReader.Read()) + + if (dataReader == null) + rdoClose.Checked = true; + else { - if (dataReader[10].ToString() == "关闭") - rdoClose.Checked = true; - else - rdoOpen.Checked = true; + if (dataReader.Read()) + { + if (dataReader[10].ToString() == "关闭") + rdoClose.Checked = true; + else + rdoOpen.Checked = true; + } } dataReader.Close(); diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs index d787196..20cf02b 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MulitiDataForm.cs @@ -455,18 +455,53 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { CreateGraph(); - chkTemp.CheckState = CheckState.Checked; - chkChl.CheckState = CheckState.Checked; - chkCond.CheckState = CheckState.Checked; - chkOxygen.CheckState = CheckState.Checked; - chkpH.CheckState = CheckState.Checked; - chkTurb.CheckState = CheckState.Checked; + if (chkTemp.Checked) + chkTemp.CheckState = CheckState.Checked; + else + { + chkTemp.CheckState = CheckState.Checked; + chkTemp.CheckState = CheckState.Unchecked; + } - chkChl.CheckState = CheckState.Unchecked; - chkCond.CheckState = CheckState.Unchecked; - chkOxygen.CheckState = CheckState.Unchecked; - chkpH.CheckState = CheckState.Unchecked; - chkTurb.CheckState = CheckState.Unchecked; + if (chkChl.Checked) + chkChl.CheckState = CheckState.Checked; + else + { + chkChl.CheckState = CheckState.Checked; + chkChl.CheckState = CheckState.Unchecked; + } + + if (chkCond.Checked) + chkCond.CheckState = CheckState.Checked; + else + { + chkCond.CheckState = CheckState.Checked; + chkCond.CheckState = CheckState.Unchecked; + } + + if (chkOxygen.Checked) + chkOxygen.CheckState = CheckState.Checked; + else + { + chkOxygen.CheckState = CheckState.Checked; + chkOxygen.CheckState = CheckState.Unchecked; + } + + if (chkpH.Checked) + chkpH.CheckState = CheckState.Checked; + else + { + chkpH.CheckState = CheckState.Checked; + chkpH.CheckState = CheckState.Unchecked; + } + + if (chkTurb.Checked) + chkTurb.CheckState = CheckState.Checked; + else + { + chkTurb.CheckState = CheckState.Checked; + chkTurb.CheckState = CheckState.Unchecked; + } } EveryDayLog.WriteMulti("EXO2进行刷新数据操作!"); @@ -632,20 +667,65 @@ namespace ZTTMS_Manage_yibayiyi_20230320 if (isCreate == false) { isCreate = true; + + chkTemp.CheckState = CheckState.Checked; + chkChl.CheckState = CheckState.Unchecked; + chkCond.CheckState = CheckState.Unchecked; + chkOxygen.CheckState = CheckState.Unchecked; + chkpH.CheckState = CheckState.Unchecked; + chkTurb.CheckState = CheckState.Unchecked; } + else + { + if (chkTemp.Checked) + chkTemp.CheckState = CheckState.Checked; + else + { + chkTemp.CheckState = CheckState.Checked; + chkTemp.CheckState = CheckState.Unchecked; + } - chkTemp.CheckState = CheckState.Checked; - chkChl.CheckState = CheckState.Checked; - chkCond.CheckState = CheckState.Checked; - chkOxygen.CheckState = CheckState.Checked; - chkpH.CheckState = CheckState.Checked; - chkTurb.CheckState = CheckState.Checked; + if(chkChl.Checked) + chkChl.CheckState = CheckState.Checked; + else + { + chkChl.CheckState = CheckState.Checked; + chkChl.CheckState = CheckState.Unchecked; + } - chkChl.CheckState = CheckState.Unchecked; - chkCond.CheckState = CheckState.Unchecked; - chkOxygen.CheckState = CheckState.Unchecked; - chkpH.CheckState = CheckState.Unchecked; - chkTurb.CheckState = CheckState.Unchecked; + if(chkCond.Checked) + chkCond.CheckState = CheckState.Checked; + else + { + chkCond.CheckState = CheckState.Checked; + chkCond.CheckState = CheckState.Unchecked; + } + + if(chkOxygen.Checked) + chkOxygen.CheckState = CheckState.Checked; + else + { + chkOxygen.CheckState = CheckState.Checked; + chkOxygen.CheckState = CheckState.Unchecked; + } + + if(chkpH.Checked) + chkpH.CheckState = CheckState.Checked; + else + { + chkpH.CheckState = CheckState.Checked; + chkpH.CheckState = CheckState.Unchecked; + } + + if(chkTurb.Checked) + chkTurb.CheckState = CheckState.Checked; + else + { + chkTurb.CheckState = CheckState.Checked; + chkTurb.CheckState = CheckState.Unchecked; + } + } + pnlCheckShow.Visible = true; zgcMultiCurve.Visible = true; @@ -833,10 +913,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320 if (zgcMultiCurve.GraphPane.CurveList.Count > 0) { zgcMultiCurve.ZoomOutAll(zgcMultiCurve.GraphPane); - //zgcMutiCurve.GraphPane.YAxisList[0].IsVisible = !zgcMutiCurve.GraphPane.YAxisList[0].IsVisible; - zgcMultiCurve.GraphPane.YAxisList[0].Title.IsVisible = !zgcMultiCurve.GraphPane.CurveList[0].IsVisible; - zgcMultiCurve.GraphPane.YAxisList[0].Scale.IsVisible = !zgcMultiCurve.GraphPane.CurveList[0].IsVisible; - zgcMultiCurve.GraphPane.CurveList[0].IsVisible = !zgcMultiCurve.GraphPane.CurveList[0].IsVisible; + //zgcMultiCurve.GraphPane.YAxisList[0].Title.IsVisible = chkTemp.Checked; + //zgcMultiCurve.GraphPane.YAxisList[0].Scale.IsVisible = chkTemp.Checked; + zgcMultiCurve.GraphPane.YAxisList[0].IsVisible = chkTemp.Checked; + zgcMultiCurve.GraphPane.CurveList[0].IsVisible = chkTemp.Checked; zgcMultiCurve.Invalidate(); zgcMultiCurve.Refresh(); } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs index fca973e..c7e2b1f 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MySQL.cs @@ -13,8 +13,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { class MySQL { - public static string connectionString = @"server=41.244.68.54;port=3306;user=root;password=zttZTT123!;database=daojiao;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;AllowPublicKeyRetrieval=true;"; - //public static string connectionString = @"server=127.0.0.1;port=3306;user=root;password=ztt12345;database=daojiao;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;"; + //public static string connectionString = @"server=41.244.68.54;port=3306;user=root;password=zttZTT123!;database=daojiao;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;AllowPublicKeyRetrieval=true;"; + public static string connectionString = @"server=127.0.0.1;port=3306;user=root;password=ztt12345;database=daojiao;sslMode=none;charset=utf8;pooling=true;max pool size=1024;connect timeout = 20;"; #region 公用方法 @@ -487,10 +487,10 @@ namespace ZTTMS_Manage_yibayiyi_20230320 connection.Close(); EveryDayLog.WriteErrorOther("ExecuteReaderError:" + e); - throw new Exception("异常信息：", e); + //throw new Exception("异常信息：", e); //throw e; //Console.WriteLine(e); - //return null; + return null; } } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Others.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Others.cs index 333fdbd..b5615cc 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Others.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/Others.cs @@ -108,17 +108,17 @@ namespace ZTTMS_Manage_yibayiyi_20230320 public static string ftpCTDDataPath = @"/File/SensorData/CTDData"; public static string ftpRecordData = @"/File/RecordData"; - public static string totalPath = @"E:\Output\"; - public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe"; - public static string picPath = @"E:\Output\Image\Image_01\"; - public static string picPathShow = @"E:\Output\Image\Image_01"; - public static string vidPathShow = @"E:\Output\Video\Video_01"; - - //public static string picPathShow = @"F:\Code\text\daojiao\Image\Image_01"; - //public static string vidPathShow = @"F:\Code\text\daojiao\Video\Video_01"; - //public static string picPath = @"F:\Code\text\daojiao\Image\Image_01\"; - //public static string totalPath = @"F:\Code\text\daojiao\"; + //public static string totalPath = @"E:\Output\"; //public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe"; + //public static string picPath = @"E:\Output\Image\Image_01\"; + //public static string picPathShow = @"E:\Output\Image\Image_01"; + //public static string vidPathShow = @"E:\Output\Video\Video_01"; + + public static string picPathShow = @"F:\Code\text\daojiao\Image\Image_01"; + public static string vidPathShow = @"F:\Code\text\daojiao\Video\Video_01"; + public static string picPath = @"F:\Code\text\daojiao\Image\Image_01\"; + public static string totalPath = @"F:\Code\text\daojiao\"; + public static string FFmpegPath = Environment.CurrentDirectory + @"\FFmpeg\bin\x86\ffmpeg.exe"; //标记设备是否使能 diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs index a416d40..feb6049 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureTakeForm.cs @@ -2821,11 +2821,14 @@ namespace ZTTMS_Manage_yibayiyi_20230320 else return; - txtExposure.Text = ""; - txtFrameRate.Text = ""; - txtGain.Text = ""; + txtExposure.Text = "5200"; + txtFrameRate.Text = "2"; + txtGain.Text = "7.7"; SetParam(); + + txtLight.Text = ""; + btnSetLight_Click(null, null); } catch(Exception ex) { @@ -2865,6 +2868,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 txtGain.Text = ""; SetParam(); + + txtLight.Text = ""; + btnSetLight_Click(null, null); } catch (Exception ex) { diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.cs index 4aa30b3..24ec205 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.cs @@ -25,9 +25,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320 MySqlDataReader dataReader; - - int num = 0; - private void RealTimeDataForm_Load(object sender, EventArgs e) diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe index 73d7bea..f9a1125 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.exe differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb index 672260b..ae74704 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/bin/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe index 73d7bea..f9a1125 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.exe differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb index 672260b..ae74704 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/obj/Debug/ZTTMS_Manage_yibayiyi_20230320.pdb differ