diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/19e72c6c-d0df-4fe0-94e0-ad7f768fd465.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/19e72c6c-d0df-4fe0-94e0-ad7f768fd465.vsidx deleted file mode 100644 index bc19461..0000000 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/19e72c6c-d0df-4fe0-94e0-ad7f768fd465.vsidx and /dev/null differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/a9117b2d-ffed-4549-9226-5e4a298d8264.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/276a616e-a73a-4f46-81ae-8bad83414708.vsidx similarity index 67% rename from ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/a9117b2d-ffed-4549-9226-5e4a298d8264.vsidx rename to ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/276a616e-a73a-4f46-81ae-8bad83414708.vsidx index b7e883a..28c4ad0 100644 Binary files a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/a9117b2d-ffed-4549-9226-5e4a298d8264.vsidx and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/276a616e-a73a-4f46-81ae-8bad83414708.vsidx differ diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/70018388-3c00-4027-b4e7-3a6a7f1f6ea4.vsidx b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/70018388-3c00-4027-b4e7-3a6a7f1f6ea4.vsidx new file mode 100644 index 0000000..5554e1f Binary files /dev/null and b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/.vs/ZTTMS_Manage_yibayiyi_20230320/FileContentIndex/70018388-3c00-4027-b4e7-3a6a7f1f6ea4.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 edb8e1b..a05737c 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 eb27ee0..7533cb6 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 @@ -481,7 +481,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void btnRefresh_Click(object sender, EventArgs e) { RefreshData(); - CalculateData(""); + CalculateData(); EveryDayLog.WriteADCP("ADCP进行刷新数据操作!"); } @@ -570,7 +570,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 dtpStopTime.Value = new DateTime(2023, 1, 1, 00, 00, 00); RefreshData(); - CalculateData(""); + CalculateData(); EveryDayLog.WriteADCP("ADCP进行重置数据操作!"); } @@ -609,7 +609,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 //lblTip.Visible = false; } - private void CalculateData(string fac) + private void CalculateData() { if (dgvDataDisplay.Rows.Count <= 0) return; @@ -900,7 +900,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 { RefreshData(); - CalculateData(""); + CalculateData(); ToolTip toolTip = new ToolTip(); toolTip.SetToolTip(lblTips, "鼠标滚轮缩放\nCtrl+左键拖动\n右键恢复默认大小"); diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CamAndVidCurrentDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CamAndVidCurrentDataForm.cs index 8cbda2d..0396869 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CamAndVidCurrentDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CamAndVidCurrentDataForm.cs @@ -68,9 +68,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void CamAndVidCurrentDataForm_Load(object sender, EventArgs e) { dtpStartTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); g_timerGetCamData.Enabled = true; g_timerGetCamData.Interval = 20000; @@ -543,8 +543,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } private void txtCycle_KeyPress(object sender, KeyPressEventArgs e) diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CavityEnvironDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CavityEnvironDataForm.cs index 3ca08be..1cdf539 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CavityEnvironDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/CavityEnvironDataForm.cs @@ -56,9 +56,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 g_timerEnvironmentData.Elapsed += new System.Timers.ElapsedEventHandler(methodEnvironmentData); dtpStartTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } private void CavityDataForm_Shown(object sender, EventArgs e) @@ -379,8 +379,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } private void txtCycleEnviron_KeyPress(object sender, KeyPressEventArgs e) 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 2a55ce9..d3e527c 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 @@ -220,9 +220,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void GDFLPortStateForm_Load(object sender, EventArgs e) { dtpStartTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); timerUpgradeTime.Interval = 60 * 60 * 1000; timerUpgradeTime.Enabled = true; @@ -542,8 +542,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs index b87208f..4ea72c4 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/MainForm.cs @@ -4378,6 +4378,23 @@ namespace ZTTMS_Manage_yibayiyi_20230320 EveryDayLog.WriteErrorOther("CloseTimerError:" + ex.ToString()); } + try + { + photoelectricSeparationDataForm.PhotoelectricSeparationDataForm_FormClosing(null, null); + pictureTakeForm.PictureTakeForm_FormClosing(null, null); + aDCPDataForm.ADCPDataForm_FormClosing(null, null); + cO2DataForm.CO2DataForm_FormClosing(null, null); + cTDDataForm.CTDDataForm_FormClosing(null, null); + mulitiDataForm.MulitiDataForm_FormClosing(null, null); + otherSettingForm.OtherSettingForm_FormClosing(null, null); + relayControlForm.RelayControlForm_FormClosing(null, null); + } + catch (Exception ex) + { + Console.WriteLine("CloseOtherFormError:" + ex.ToString()); + EveryDayLog.WriteErrorOther("CloseOtherFormError:" + ex.ToString()); + } + EveryDayLog.WriteOther("开始存储各个设备工作状态！"); int cycleTime = 0; string sql; @@ -4443,23 +4460,6 @@ namespace ZTTMS_Manage_yibayiyi_20230320 EveryDayLog.WriteErrorCamAndVid("录制视频出错：" + ex.Message); } - try - { - photoelectricSeparationDataForm.PhotoelectricSeparationDataForm_FormClosing(null, null); - pictureTakeForm.PictureTakeForm_FormClosing(null, null); - aDCPDataForm.ADCPDataForm_FormClosing(null, null); - cO2DataForm.CO2DataForm_FormClosing(null, null); - cTDDataForm.CTDDataForm_FormClosing(null, null); - mulitiDataForm.MulitiDataForm_FormClosing(null, null); - otherSettingForm.OtherSettingForm_FormClosing(null, null); - relayControlForm.RelayControlForm_FormClosing(null, null); - } - catch (Exception ex) - { - Console.WriteLine("CloseOtherFormError:" + ex.ToString()); - EveryDayLog.WriteErrorOther("CloseOtherFormError:" + ex.ToString()); - } - EveryDayLog.WriteDZ("上位机软件关闭！"); } #endregion diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputPortStateData.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputPortStateData.cs index 199775f..7d1c750 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputPortStateData.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputPortStateData.cs @@ -324,9 +324,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 lblTitle.Text = lblTitle.Text.ToString(); dtpStartTime.MinDate = new DateTime(2022, 12, 14, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2022, 12, 14, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStartTime.Value = new DateTime(2023, 1, 1, 00, 00, 00); dtpStopTime.Value = new DateTime(2023, 1, 1, 00, 00, 00); @@ -362,8 +362,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } } } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputStatusInfoDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputStatusInfoDataForm.cs index d10012d..a1dc3c5 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputStatusInfoDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/OutputStatusInfoDataForm.cs @@ -574,9 +574,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 lblTitle.Text = lblTitle.Text.ToString(); dtpStartTime.MinDate = new DateTime(2022, 12, 14, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2022, 12, 14, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStartTime.Value = new DateTime(2023, 1, 1, 00, 00, 00); dtpStopTime.Value = new DateTime(2023, 1, 1, 00, 00, 00); @@ -593,8 +593,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } private void txtCycle_KeyPress(object sender, KeyPressEventArgs e) diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs index 75295a7..9aa86a4 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PhotoelectricSeparationDataForm.cs @@ -2247,9 +2247,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 public void PhotoelectricSeparationDataForm_Load(object sender, EventArgs e) { dtpStartTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); //检测设备的使能状态 Thread thIsDeviceWork = new Thread(IsDeviceWork); @@ -2360,8 +2360,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureSearchForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureSearchForm.cs index ca6289b..7e20020 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureSearchForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/PictureSearchForm.cs @@ -36,9 +36,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 listPicturePath.Clear(); dtpStartTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); //ShowPicture(); @@ -398,8 +398,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } } } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs index 87bc73b..fec0ca3 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/RealTimeDataForm.Designer.cs @@ -115,6 +115,9 @@ this.lblPotency = new System.Windows.Forms.Label(); this.label25 = new System.Windows.Forms.Label(); this.timerUpdate = new System.Windows.Forms.Timer(this.components); + this.label19 = new System.Windows.Forms.Label(); + this.lblSality = new System.Windows.Forms.Label(); + this.label36 = new System.Windows.Forms.Label(); this.panel.SuspendLayout(); this.groupBox1.SuspendLayout(); this.groupBox2.SuspendLayout(); @@ -372,10 +375,11 @@ // // groupBox2 // - this.groupBox2.Controls.Add(this.lblTimeCTD); + this.groupBox2.Controls.Add(this.label19); this.groupBox2.Controls.Add(this.label13); - this.groupBox2.Controls.Add(this.label5); + this.groupBox2.Controls.Add(this.lblSality); this.groupBox2.Controls.Add(this.label14); + this.groupBox2.Controls.Add(this.label36); this.groupBox2.Controls.Add(this.label15); this.groupBox2.Controls.Add(this.lblPressure1); this.groupBox2.Controls.Add(this.lblWaterTemperature); @@ -395,8 +399,9 @@ // lblTimeCTD // this.lblTimeCTD.AutoSize = true; + this.lblTimeCTD.Font = new System.Drawing.Font("方正楷体简体", 20.25F); this.lblTimeCTD.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.lblTimeCTD.Location = new System.Drawing.Point(651, 115); + this.lblTimeCTD.Location = new System.Drawing.Point(253, 792); this.lblTimeCTD.Name = "lblTimeCTD"; this.lblTimeCTD.Size = new System.Drawing.Size(73, 29); this.lblTimeCTD.TabIndex = 64; @@ -416,11 +421,11 @@ this.label5.AutoSize = true; this.label5.Font = new System.Drawing.Font("方正楷体简体", 21.75F); this.label5.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.label5.Location = new System.Drawing.Point(478, 115); + this.label5.Location = new System.Drawing.Point(93, 792); this.label5.Name = "label5"; this.label5.Size = new System.Drawing.Size(138, 32); this.label5.TabIndex = 63; - this.label5.Text = "④ 时间："; + this.label5.Text = "⑤ 时间："; // // label14 // @@ -1018,7 +1023,7 @@ this.groupBox4.Controls.Add(this.label25); this.groupBox4.Font = new System.Drawing.Font("方正楷体简体", 20.25F); this.groupBox4.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; - this.groupBox4.Location = new System.Drawing.Point(51, 689); + this.groupBox4.Location = new System.Drawing.Point(51, 605); this.groupBox4.Name = "groupBox4"; this.groupBox4.Size = new System.Drawing.Size(496, 157); this.groupBox4.TabIndex = 39; @@ -1079,14 +1084,47 @@ // this.timerUpdate.Tick += new System.EventHandler(this.timerUpdate_Tick); // + // label19 + // + this.label19.AutoSize = true; + this.label19.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.label19.Location = new System.Drawing.Point(763, 115); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(47, 29); + this.label19.TabIndex = 78; + this.label19.Text = "ppt"; + // + // lblSality + // + this.lblSality.AutoSize = true; + this.lblSality.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.lblSality.Location = new System.Drawing.Point(651, 115); + this.lblSality.Name = "lblSality"; + this.lblSality.Size = new System.Drawing.Size(73, 29); + this.lblSality.TabIndex = 77; + this.lblSality.Text = "XXX"; + // + // label36 + // + this.label36.AutoSize = true; + this.label36.Font = new System.Drawing.Font("方正楷体简体", 21.75F); + this.label36.ForeColor = System.Drawing.SystemColors.ActiveCaptionText; + this.label36.Location = new System.Drawing.Point(478, 115); + this.label36.Name = "label36"; + this.label36.Size = new System.Drawing.Size(138, 32); + this.label36.TabIndex = 76; + this.label36.Text = "④ 盐度："; + // // RealTimeDataForm // this.AutoScaleDimensions = new System.Drawing.SizeF(16F, 31F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(231)))), ((int)(((byte)(236)))), ((int)(((byte)(233))))); this.ClientSize = new System.Drawing.Size(1560, 868); + this.Controls.Add(this.lblTimeCTD); this.Controls.Add(this.groupBox4); this.Controls.Add(this.groupBox3); + this.Controls.Add(this.label5); this.Controls.Add(this.groupBox2); this.Controls.Add(this.groupBox1); this.Controls.Add(this.panel); @@ -1108,6 +1146,7 @@ this.groupBox4.ResumeLayout(false); this.groupBox4.PerformLayout(); this.ResumeLayout(false); + this.PerformLayout(); } @@ -1199,5 +1238,8 @@ private System.Windows.Forms.Label label31; private System.Windows.Forms.Timer timerUpdate; private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label19; + private System.Windows.Forms.Label lblSality; + private System.Windows.Forms.Label label36; } } \ No newline at end of file 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 e51d7ea..4aa30b3 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 @@ -115,6 +115,7 @@ namespace ZTTMS_Manage_yibayiyi_20230320 lblWaterTemperature.Text = dataReader[3].ToString(); lblConductivityCTD.Text = dataReader[4].ToString(); lblPressure1.Text = dataReader[5].ToString(); + lblSality.Text = dataReader[6].ToString(); } dataReader.Close(); diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/VideoSearchForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/VideoSearchForm.cs index 2e26bd2..6419080 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/VideoSearchForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/VideoSearchForm.cs @@ -255,9 +255,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 listVideoPath.Clear(); dtpStartTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2023, 1, 1, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); picLeft.Parent = picShow; picRight.Parent = picShow; @@ -1151,8 +1151,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } } } diff --git a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/WorkStatusInfoDataForm.cs b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/WorkStatusInfoDataForm.cs index b962257..2ddaef9 100644 --- a/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/WorkStatusInfoDataForm.cs +++ b/ZTTMS_Manage_yibayiyi_KeepaliveTest3_GKJ_V1.1/ZTTMS_Manage_yibayiyi_20230320/WorkStatusInfoDataForm.cs @@ -102,9 +102,9 @@ namespace ZTTMS_Manage_yibayiyi_20230320 //lblTitle.Text = strTitle.ToString(); dtpStartTime.MinDate = new DateTime(2022, 12, 14, 00, 00, 00); - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStopTime.MinDate = new DateTime(2022, 12, 14, 00, 00, 00); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); dtpStartTime.Value = new DateTime(2023, 1, 1, 00, 00, 00); dtpStopTime.Value = new DateTime(2023, 1, 1, 00, 00, 00); @@ -589,8 +589,8 @@ namespace ZTTMS_Manage_yibayiyi_20230320 private void timerUpgradeTime_Tick(object sender, EventArgs e) { - dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); - dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, DateTime.Now.Hour, DateTime.Now.Minute, DateTime.Now.Second); + dtpStartTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); + dtpStopTime.MaxDate = new DateTime(DateTime.Now.Year, DateTime.Now.Month, DateTime.Now.Day, 23, 59, 59); } private void txtCycle_KeyPress(object sender, KeyPressEventArgs 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 d4254ae..6f06577 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 c6991df..a17bcb6 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 d4254ae..6f06577 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 c6991df..a17bcb6 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