diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index bbb88a7..dcad124 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -14,57 +14,49 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index bbb88a7..dcad124 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -14,57 +14,49 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index f6ec0a5..e30a315 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -69,6 +69,10 @@ ..\packages\log4net.2.0.12\lib\net40\log4net.dll + + False + bin\Debug\MySql.Data.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll @@ -88,13 +92,23 @@ + + + + + + + + + + + UserControl CounterCtrlForm.cs - UserControl @@ -258,7 +272,7 @@ - + diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index bbb88a7..dcad124 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -14,57 +14,49 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index f6ec0a5..e30a315 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -69,6 +69,10 @@ ..\packages\log4net.2.0.12\lib\net40\log4net.dll + + False + bin\Debug\MySql.Data.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll @@ -88,13 +92,23 @@ + + + + + + + + + + + UserControl CounterCtrlForm.cs - UserControl @@ -258,7 +272,7 @@ - + diff --git a/RbFreqStandMeasure/RbFreqStdMeas.cs b/RbFreqStandMeasure/RbFreqStdMeas.cs index 7737173..3a7c5f6 100644 --- a/RbFreqStandMeasure/RbFreqStdMeas.cs +++ b/RbFreqStandMeasure/RbFreqStdMeas.cs @@ -1,9 +1,12 @@ using Casic.Birmm.RbFreqStandMeasure.counter; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.Properties; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase; using Casic.Birmm.RbFreqStandMeasure.setting; +using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Drawing; +using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -268,6 +271,18 @@ public RbFreqStdMeas() { InitializeComponent(); + + // 打开数据库 + int ret = DbConnectService.openDb(); + if (ret == 0) + { + LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开数据库成功"); + } + else + { + MessageBox.Show("打开数据库失败", null, MessageBoxButtons.OK, MessageBoxIcon.Error); + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "打开数据库失败"); + } } private void RbFreqStdMeas_Load(object sender, EventArgs e) diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index bbb88a7..dcad124 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -14,57 +14,49 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index f6ec0a5..e30a315 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -69,6 +69,10 @@ ..\packages\log4net.2.0.12\lib\net40\log4net.dll + + False + bin\Debug\MySql.Data.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll @@ -88,13 +92,23 @@ + + + + + + + + + + + UserControl CounterCtrlForm.cs - UserControl @@ -258,7 +272,7 @@ - + diff --git a/RbFreqStandMeasure/RbFreqStdMeas.cs b/RbFreqStandMeasure/RbFreqStdMeas.cs index 7737173..3a7c5f6 100644 --- a/RbFreqStandMeasure/RbFreqStdMeas.cs +++ b/RbFreqStandMeasure/RbFreqStdMeas.cs @@ -1,9 +1,12 @@ using Casic.Birmm.RbFreqStandMeasure.counter; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.Properties; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase; using Casic.Birmm.RbFreqStandMeasure.setting; +using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Drawing; +using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -268,6 +271,18 @@ public RbFreqStdMeas() { InitializeComponent(); + + // 打开数据库 + int ret = DbConnectService.openDb(); + if (ret == 0) + { + LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开数据库成功"); + } + else + { + MessageBox.Show("打开数据库失败", null, MessageBoxButtons.OK, MessageBoxIcon.Error); + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "打开数据库失败"); + } } private void RbFreqStdMeas_Load(object sender, EventArgs e) diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index 2bd5048..271e20a 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -444,6 +444,7 @@ this.HideMask(); }; this.ShowMask(); + devTestDlg.StartPosition = FormStartPosition.CenterParent; // 指定窗口弹出在父窗口的中间位置 devTestDlg.ShowDialog(); } @@ -460,6 +461,7 @@ this.HideMask(); }; this.ShowMask(); + channelDlg.StartPosition = FormStartPosition.CenterParent; // 指定窗口弹出在父窗口的中间位置 channelDlg.ShowDialog(); } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index bbb88a7..dcad124 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -14,57 +14,49 @@ - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index f6ec0a5..e30a315 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -69,6 +69,10 @@ ..\packages\log4net.2.0.12\lib\net40\log4net.dll + + False + bin\Debug\MySql.Data.dll + ..\packages\Newtonsoft.Json.12.0.3\lib\net40\Newtonsoft.Json.dll @@ -88,13 +92,23 @@ + + + + + + + + + + + UserControl CounterCtrlForm.cs - UserControl @@ -258,7 +272,7 @@ - + diff --git a/RbFreqStandMeasure/RbFreqStdMeas.cs b/RbFreqStandMeasure/RbFreqStdMeas.cs index 7737173..3a7c5f6 100644 --- a/RbFreqStandMeasure/RbFreqStdMeas.cs +++ b/RbFreqStandMeasure/RbFreqStdMeas.cs @@ -1,9 +1,12 @@ using Casic.Birmm.RbFreqStandMeasure.counter; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.Properties; +using Casic.Birmm.RbFreqStandMeasure.R_DataBase; using Casic.Birmm.RbFreqStandMeasure.setting; +using Casic.Birmm.RbFreqStandMeasure.Tools; using System; using System.Drawing; +using System.Reflection; using System.Runtime.InteropServices; using System.Windows.Forms; @@ -268,6 +271,18 @@ public RbFreqStdMeas() { InitializeComponent(); + + // 打开数据库 + int ret = DbConnectService.openDb(); + if (ret == 0) + { + LogHelper.WriteInfoLog(MethodBase.GetCurrentMethod().DeclaringType, "打开数据库成功"); + } + else + { + MessageBox.Show("打开数据库失败", null, MessageBoxButtons.OK, MessageBoxIcon.Error); + LogHelper.WriteErrorLog(MethodBase.GetCurrentMethod().DeclaringType, "打开数据库失败"); + } } private void RbFreqStdMeas_Load(object sender, EventArgs e) diff --git a/RbFreqStandMeasure/home/HomeCtrlForm.cs b/RbFreqStandMeasure/home/HomeCtrlForm.cs index 2bd5048..271e20a 100644 --- a/RbFreqStandMeasure/home/HomeCtrlForm.cs +++ b/RbFreqStandMeasure/home/HomeCtrlForm.cs @@ -444,6 +444,7 @@ this.HideMask(); }; this.ShowMask(); + devTestDlg.StartPosition = FormStartPosition.CenterParent; // 指定窗口弹出在父窗口的中间位置 devTestDlg.ShowDialog(); } @@ -460,6 +461,7 @@ this.HideMask(); }; this.ShowMask(); + channelDlg.StartPosition = FormStartPosition.CenterParent; // 指定窗口弹出在父窗口的中间位置 channelDlg.ShowDialog(); } diff --git a/RbFreqStandMeasure/home/SetDevChannelDlg.cs b/RbFreqStandMeasure/home/SetDevChannelDlg.cs index d2fc5df..a69695f 100644 --- a/RbFreqStandMeasure/home/SetDevChannelDlg.cs +++ b/RbFreqStandMeasure/home/SetDevChannelDlg.cs @@ -35,7 +35,6 @@ private void btnExitChannel_Click(object sender, EventArgs e) { - // this.Hide(); this.HideMaskAction(); } }