diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.resx b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx new file mode 100644 index 0000000..d484387 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.resx b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx new file mode 100644 index 0000000..d484387 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index ba19109..8bdbee9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -29,12 +29,29 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEditDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnAddDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.rpDevCond = new Casic.Birmm.RbFreqStandMeasure.RoundPanel(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.rpDevCond.SuspendLayout(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.panelEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -46,14 +63,190 @@ this.label1.TabIndex = 0; this.label1.Text = "送检仪器管理"; // - // dataGridView1 + // panelEx1 // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(23, 137); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(935, 420); - this.dataGridView1.TabIndex = 1; + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.Controls.Add(this.btnEditDev); + this.panelEx1.Controls.Add(this.btnAddDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 57); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 5; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 155); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 9; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "删除"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // btnEditDev + // + this.btnEditDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnEditDev.EnterForeColor = System.Drawing.Color.White; + this.btnEditDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnEditDev.FlatAppearance.BorderSize = 0; + this.btnEditDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnEditDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnEditDev.HoverForeColor = System.Drawing.Color.White; + this.btnEditDev.Location = new System.Drawing.Point(546, 15); + this.btnEditDev.Name = "btnEditDev"; + this.btnEditDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnEditDev.PressForeColor = System.Drawing.Color.White; + this.btnEditDev.Radius = 18; + this.btnEditDev.Size = new System.Drawing.Size(75, 28); + this.btnEditDev.TabIndex = 3; + this.btnEditDev.Text = "编辑"; + this.btnEditDev.UseVisualStyleBackColor = true; // // btnAddDev // @@ -66,7 +259,7 @@ this.btnAddDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); this.btnAddDev.HoverForeColor = System.Drawing.Color.White; - this.btnAddDev.Location = new System.Drawing.Point(500, 6); + this.btnAddDev.Location = new System.Drawing.Point(455, 15); this.btnAddDev.Name = "btnAddDev"; this.btnAddDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnAddDev.PressForeColor = System.Drawing.Color.White; @@ -75,29 +268,29 @@ this.btnAddDev.TabIndex = 3; this.btnAddDev.Text = "添加"; this.btnAddDev.UseVisualStyleBackColor = true; + this.btnAddDev.Click += new System.EventHandler(this.btnAddDev_Click); // - // rpDevCond + // line1 // - this.rpDevCond.Back = System.Drawing.Color.Empty; - this.rpDevCond.Controls.Add(this.btnAddDev); - this.rpDevCond.Location = new System.Drawing.Point(23, 71); - this.rpDevCond.MatrixRound = 8; - this.rpDevCond.Name = "rpDevCond"; - this.rpDevCond.Size = new System.Drawing.Size(935, 40); - this.rpDevCond.TabIndex = 4; + this.line1.Location = new System.Drawing.Point(4, 28); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 10; + this.line1.Text = "line1"; // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.rpDevCond); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); this.Controls.Add(this.label1); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "InfoCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.rpDevCond.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -106,8 +299,24 @@ #endregion private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView dataGridView1; private RoundButton btnAddDev; - private RoundPanel rpDevCond; + private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private RoundButton btnDelDev; + private RoundButton btnEditDev; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private DevComponents.DotNetBar.Controls.Line line1; } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.resx b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx new file mode 100644 index 0000000..d484387 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index ba19109..8bdbee9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -29,12 +29,29 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEditDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnAddDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.rpDevCond = new Casic.Birmm.RbFreqStandMeasure.RoundPanel(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.rpDevCond.SuspendLayout(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.panelEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -46,14 +63,190 @@ this.label1.TabIndex = 0; this.label1.Text = "送检仪器管理"; // - // dataGridView1 + // panelEx1 // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(23, 137); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(935, 420); - this.dataGridView1.TabIndex = 1; + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.Controls.Add(this.btnEditDev); + this.panelEx1.Controls.Add(this.btnAddDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 57); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 5; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 155); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 9; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "删除"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // btnEditDev + // + this.btnEditDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnEditDev.EnterForeColor = System.Drawing.Color.White; + this.btnEditDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnEditDev.FlatAppearance.BorderSize = 0; + this.btnEditDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnEditDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnEditDev.HoverForeColor = System.Drawing.Color.White; + this.btnEditDev.Location = new System.Drawing.Point(546, 15); + this.btnEditDev.Name = "btnEditDev"; + this.btnEditDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnEditDev.PressForeColor = System.Drawing.Color.White; + this.btnEditDev.Radius = 18; + this.btnEditDev.Size = new System.Drawing.Size(75, 28); + this.btnEditDev.TabIndex = 3; + this.btnEditDev.Text = "编辑"; + this.btnEditDev.UseVisualStyleBackColor = true; // // btnAddDev // @@ -66,7 +259,7 @@ this.btnAddDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); this.btnAddDev.HoverForeColor = System.Drawing.Color.White; - this.btnAddDev.Location = new System.Drawing.Point(500, 6); + this.btnAddDev.Location = new System.Drawing.Point(455, 15); this.btnAddDev.Name = "btnAddDev"; this.btnAddDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnAddDev.PressForeColor = System.Drawing.Color.White; @@ -75,29 +268,29 @@ this.btnAddDev.TabIndex = 3; this.btnAddDev.Text = "添加"; this.btnAddDev.UseVisualStyleBackColor = true; + this.btnAddDev.Click += new System.EventHandler(this.btnAddDev_Click); // - // rpDevCond + // line1 // - this.rpDevCond.Back = System.Drawing.Color.Empty; - this.rpDevCond.Controls.Add(this.btnAddDev); - this.rpDevCond.Location = new System.Drawing.Point(23, 71); - this.rpDevCond.MatrixRound = 8; - this.rpDevCond.Name = "rpDevCond"; - this.rpDevCond.Size = new System.Drawing.Size(935, 40); - this.rpDevCond.TabIndex = 4; + this.line1.Location = new System.Drawing.Point(4, 28); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 10; + this.line1.Text = "line1"; // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.rpDevCond); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); this.Controls.Add(this.label1); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "InfoCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.rpDevCond.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -106,8 +299,24 @@ #endregion private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView dataGridView1; private RoundButton btnAddDev; - private RoundPanel rpDevCond; + private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private RoundButton btnDelDev; + private RoundButton btnEditDev; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private DevComponents.DotNetBar.Controls.Line line1; } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 31a3e61..8df7e6c 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -15,5 +15,12 @@ { InitializeComponent(); } + + // 送检仪器登记页面 + private void btnAddDev_Click(object sender, EventArgs e) + { + AddDevDlg addDev = new AddDevDlg(); + addDev.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.resx b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx new file mode 100644 index 0000000..d484387 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index ba19109..8bdbee9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -29,12 +29,29 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEditDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnAddDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.rpDevCond = new Casic.Birmm.RbFreqStandMeasure.RoundPanel(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.rpDevCond.SuspendLayout(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.panelEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -46,14 +63,190 @@ this.label1.TabIndex = 0; this.label1.Text = "送检仪器管理"; // - // dataGridView1 + // panelEx1 // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(23, 137); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(935, 420); - this.dataGridView1.TabIndex = 1; + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.Controls.Add(this.btnEditDev); + this.panelEx1.Controls.Add(this.btnAddDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 57); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 5; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 155); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 9; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "删除"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // btnEditDev + // + this.btnEditDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnEditDev.EnterForeColor = System.Drawing.Color.White; + this.btnEditDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnEditDev.FlatAppearance.BorderSize = 0; + this.btnEditDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnEditDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnEditDev.HoverForeColor = System.Drawing.Color.White; + this.btnEditDev.Location = new System.Drawing.Point(546, 15); + this.btnEditDev.Name = "btnEditDev"; + this.btnEditDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnEditDev.PressForeColor = System.Drawing.Color.White; + this.btnEditDev.Radius = 18; + this.btnEditDev.Size = new System.Drawing.Size(75, 28); + this.btnEditDev.TabIndex = 3; + this.btnEditDev.Text = "编辑"; + this.btnEditDev.UseVisualStyleBackColor = true; // // btnAddDev // @@ -66,7 +259,7 @@ this.btnAddDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); this.btnAddDev.HoverForeColor = System.Drawing.Color.White; - this.btnAddDev.Location = new System.Drawing.Point(500, 6); + this.btnAddDev.Location = new System.Drawing.Point(455, 15); this.btnAddDev.Name = "btnAddDev"; this.btnAddDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnAddDev.PressForeColor = System.Drawing.Color.White; @@ -75,29 +268,29 @@ this.btnAddDev.TabIndex = 3; this.btnAddDev.Text = "添加"; this.btnAddDev.UseVisualStyleBackColor = true; + this.btnAddDev.Click += new System.EventHandler(this.btnAddDev_Click); // - // rpDevCond + // line1 // - this.rpDevCond.Back = System.Drawing.Color.Empty; - this.rpDevCond.Controls.Add(this.btnAddDev); - this.rpDevCond.Location = new System.Drawing.Point(23, 71); - this.rpDevCond.MatrixRound = 8; - this.rpDevCond.Name = "rpDevCond"; - this.rpDevCond.Size = new System.Drawing.Size(935, 40); - this.rpDevCond.TabIndex = 4; + this.line1.Location = new System.Drawing.Point(4, 28); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 10; + this.line1.Text = "line1"; // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.rpDevCond); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); this.Controls.Add(this.label1); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "InfoCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.rpDevCond.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -106,8 +299,24 @@ #endregion private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView dataGridView1; private RoundButton btnAddDev; - private RoundPanel rpDevCond; + private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private RoundButton btnDelDev; + private RoundButton btnEditDev; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private DevComponents.DotNetBar.Controls.Line line1; } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 31a3e61..8df7e6c 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -15,5 +15,12 @@ { InitializeComponent(); } + + // 送检仪器登记页面 + private void btnAddDev_Click(object sender, EventArgs e) + { + AddDevDlg addDev = new AddDevDlg(); + addDev.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.resx b/RbFreqStandMeasure/info/InfoCtrlForm.resx index 1af7de1..40cec2f 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.resx +++ b/RbFreqStandMeasure/info/InfoCtrlForm.resx @@ -117,4 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.resx b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx new file mode 100644 index 0000000..d484387 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index ba19109..8bdbee9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -29,12 +29,29 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEditDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnAddDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.rpDevCond = new Casic.Birmm.RbFreqStandMeasure.RoundPanel(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.rpDevCond.SuspendLayout(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.panelEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -46,14 +63,190 @@ this.label1.TabIndex = 0; this.label1.Text = "送检仪器管理"; // - // dataGridView1 + // panelEx1 // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(23, 137); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(935, 420); - this.dataGridView1.TabIndex = 1; + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.Controls.Add(this.btnEditDev); + this.panelEx1.Controls.Add(this.btnAddDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 57); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 5; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 155); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 9; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "删除"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // btnEditDev + // + this.btnEditDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnEditDev.EnterForeColor = System.Drawing.Color.White; + this.btnEditDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnEditDev.FlatAppearance.BorderSize = 0; + this.btnEditDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnEditDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnEditDev.HoverForeColor = System.Drawing.Color.White; + this.btnEditDev.Location = new System.Drawing.Point(546, 15); + this.btnEditDev.Name = "btnEditDev"; + this.btnEditDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnEditDev.PressForeColor = System.Drawing.Color.White; + this.btnEditDev.Radius = 18; + this.btnEditDev.Size = new System.Drawing.Size(75, 28); + this.btnEditDev.TabIndex = 3; + this.btnEditDev.Text = "编辑"; + this.btnEditDev.UseVisualStyleBackColor = true; // // btnAddDev // @@ -66,7 +259,7 @@ this.btnAddDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); this.btnAddDev.HoverForeColor = System.Drawing.Color.White; - this.btnAddDev.Location = new System.Drawing.Point(500, 6); + this.btnAddDev.Location = new System.Drawing.Point(455, 15); this.btnAddDev.Name = "btnAddDev"; this.btnAddDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnAddDev.PressForeColor = System.Drawing.Color.White; @@ -75,29 +268,29 @@ this.btnAddDev.TabIndex = 3; this.btnAddDev.Text = "添加"; this.btnAddDev.UseVisualStyleBackColor = true; + this.btnAddDev.Click += new System.EventHandler(this.btnAddDev_Click); // - // rpDevCond + // line1 // - this.rpDevCond.Back = System.Drawing.Color.Empty; - this.rpDevCond.Controls.Add(this.btnAddDev); - this.rpDevCond.Location = new System.Drawing.Point(23, 71); - this.rpDevCond.MatrixRound = 8; - this.rpDevCond.Name = "rpDevCond"; - this.rpDevCond.Size = new System.Drawing.Size(935, 40); - this.rpDevCond.TabIndex = 4; + this.line1.Location = new System.Drawing.Point(4, 28); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 10; + this.line1.Text = "line1"; // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.rpDevCond); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); this.Controls.Add(this.label1); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "InfoCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.rpDevCond.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -106,8 +299,24 @@ #endregion private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView dataGridView1; private RoundButton btnAddDev; - private RoundPanel rpDevCond; + private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private RoundButton btnDelDev; + private RoundButton btnEditDev; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private DevComponents.DotNetBar.Controls.Line line1; } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 31a3e61..8df7e6c 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -15,5 +15,12 @@ { InitializeComponent(); } + + // 送检仪器登记页面 + private void btnAddDev_Click(object sender, EventArgs e) + { + AddDevDlg addDev = new AddDevDlg(); + addDev.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.resx b/RbFreqStandMeasure/info/InfoCtrlForm.resx index 1af7de1..40cec2f 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.resx +++ b/RbFreqStandMeasure/info/InfoCtrlForm.resx @@ -117,4 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/RbFreqStandMeasure/packages.config b/RbFreqStandMeasure/packages.config index c2aa027..ecdd1da 100644 --- a/RbFreqStandMeasure/packages.config +++ b/RbFreqStandMeasure/packages.config @@ -3,9 +3,4 @@ - - - - - \ No newline at end of file diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.resx b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx new file mode 100644 index 0000000..d484387 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index ba19109..8bdbee9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -29,12 +29,29 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEditDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnAddDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.rpDevCond = new Casic.Birmm.RbFreqStandMeasure.RoundPanel(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.rpDevCond.SuspendLayout(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.panelEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -46,14 +63,190 @@ this.label1.TabIndex = 0; this.label1.Text = "送检仪器管理"; // - // dataGridView1 + // panelEx1 // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(23, 137); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(935, 420); - this.dataGridView1.TabIndex = 1; + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.Controls.Add(this.btnEditDev); + this.panelEx1.Controls.Add(this.btnAddDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 57); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 5; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 155); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 9; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "删除"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // btnEditDev + // + this.btnEditDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnEditDev.EnterForeColor = System.Drawing.Color.White; + this.btnEditDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnEditDev.FlatAppearance.BorderSize = 0; + this.btnEditDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnEditDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnEditDev.HoverForeColor = System.Drawing.Color.White; + this.btnEditDev.Location = new System.Drawing.Point(546, 15); + this.btnEditDev.Name = "btnEditDev"; + this.btnEditDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnEditDev.PressForeColor = System.Drawing.Color.White; + this.btnEditDev.Radius = 18; + this.btnEditDev.Size = new System.Drawing.Size(75, 28); + this.btnEditDev.TabIndex = 3; + this.btnEditDev.Text = "编辑"; + this.btnEditDev.UseVisualStyleBackColor = true; // // btnAddDev // @@ -66,7 +259,7 @@ this.btnAddDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); this.btnAddDev.HoverForeColor = System.Drawing.Color.White; - this.btnAddDev.Location = new System.Drawing.Point(500, 6); + this.btnAddDev.Location = new System.Drawing.Point(455, 15); this.btnAddDev.Name = "btnAddDev"; this.btnAddDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnAddDev.PressForeColor = System.Drawing.Color.White; @@ -75,29 +268,29 @@ this.btnAddDev.TabIndex = 3; this.btnAddDev.Text = "添加"; this.btnAddDev.UseVisualStyleBackColor = true; + this.btnAddDev.Click += new System.EventHandler(this.btnAddDev_Click); // - // rpDevCond + // line1 // - this.rpDevCond.Back = System.Drawing.Color.Empty; - this.rpDevCond.Controls.Add(this.btnAddDev); - this.rpDevCond.Location = new System.Drawing.Point(23, 71); - this.rpDevCond.MatrixRound = 8; - this.rpDevCond.Name = "rpDevCond"; - this.rpDevCond.Size = new System.Drawing.Size(935, 40); - this.rpDevCond.TabIndex = 4; + this.line1.Location = new System.Drawing.Point(4, 28); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 10; + this.line1.Text = "line1"; // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.rpDevCond); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); this.Controls.Add(this.label1); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "InfoCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.rpDevCond.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -106,8 +299,24 @@ #endregion private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView dataGridView1; private RoundButton btnAddDev; - private RoundPanel rpDevCond; + private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private RoundButton btnDelDev; + private RoundButton btnEditDev; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private DevComponents.DotNetBar.Controls.Line line1; } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 31a3e61..8df7e6c 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -15,5 +15,12 @@ { InitializeComponent(); } + + // 送检仪器登记页面 + private void btnAddDev_Click(object sender, EventArgs e) + { + AddDevDlg addDev = new AddDevDlg(); + addDev.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.resx b/RbFreqStandMeasure/info/InfoCtrlForm.resx index 1af7de1..40cec2f 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.resx +++ b/RbFreqStandMeasure/info/InfoCtrlForm.resx @@ -117,4 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/RbFreqStandMeasure/packages.config b/RbFreqStandMeasure/packages.config index c2aa027..ecdd1da 100644 --- a/RbFreqStandMeasure/packages.config +++ b/RbFreqStandMeasure/packages.config @@ -3,9 +3,4 @@ - - - - - \ No newline at end of file diff --git a/RbFreqStandMeasure/res/images/bg_white_shadow.png b/RbFreqStandMeasure/res/images/bg_white_shadow.png new file mode 100644 index 0000000..4fdd543 --- /dev/null +++ b/RbFreqStandMeasure/res/images/bg_white_shadow.png Binary files differ diff --git a/RbFreqStandMeasure/App.config b/RbFreqStandMeasure/App.config index 0553c2a..356e71e 100644 --- a/RbFreqStandMeasure/App.config +++ b/RbFreqStandMeasure/App.config @@ -1,23 +1,35 @@  + + + + + + + + + + + + + -
+
- - + + - + @@ -33,7 +45,7 @@ - + @@ -54,10 +66,5 @@ - - - - - - + \ No newline at end of file diff --git a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs index d7fcfe8..fb515f8 100644 --- a/RbFreqStandMeasure/HomeCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/HomeCtrlForm.Designer.cs @@ -32,6 +32,12 @@ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelToBeTested = new System.Windows.Forms.Panel(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); this.labelX6 = new DevComponents.DotNetBar.LabelX(); this.labelX5 = new DevComponents.DotNetBar.LabelX(); @@ -49,12 +55,6 @@ this.labelX13 = new DevComponents.DotNetBar.LabelX(); this.labelX12 = new DevComponents.DotNetBar.LabelX(); this.panelEx4 = new DevComponents.DotNetBar.PanelEx(); - this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); - this.Column13 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column14 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column15 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column16 = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Column17 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.dataGridViewX2 = new DevComponents.DotNetBar.Controls.DataGridViewX(); this.Column18 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column19 = new System.Windows.Forms.DataGridViewTextBoxColumn(); @@ -68,23 +68,78 @@ this.Column27 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column28 = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.Column29 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.buttonX2 = new DevComponents.DotNetBar.ButtonX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); this.panelToBeTested.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.panelEx1.SuspendLayout(); this.panelEx2.SuspendLayout(); this.panelEx3.SuspendLayout(); this.panelEx4.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).BeginInit(); this.SuspendLayout(); // // panelToBeTested // this.panelToBeTested.Controls.Add(this.dataGridViewX1); + this.panelToBeTested.Controls.Add(this.buttonX2); + this.panelToBeTested.Controls.Add(this.buttonX1); this.panelToBeTested.Location = new System.Drawing.Point(250, 0); this.panelToBeTested.Name = "panelToBeTested"; - this.panelToBeTested.Size = new System.Drawing.Size(750, 200); + this.panelToBeTested.Size = new System.Drawing.Size(750, 216); this.panelToBeTested.TabIndex = 4; // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column13, + this.Column14, + this.Column15, + this.Column16, + this.Column17}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(0, 1); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(750, 179); + this.dataGridViewX1.TabIndex = 14; + // + // Column13 + // + this.Column13.HeaderText = "仪器名称"; + this.Column13.Name = "Column13"; + // + // Column14 + // + this.Column14.HeaderText = "仪器类型"; + this.Column14.Name = "Column14"; + // + // Column15 + // + this.Column15.HeaderText = "仪器编号"; + this.Column15.Name = "Column15"; + // + // Column16 + // + this.Column16.HeaderText = "客户名称"; + this.Column16.Name = "Column16"; + // + // Column17 + // + this.Column17.HeaderText = "开始时间"; + this.Column17.Name = "Column17"; + // // panelEx1 // this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; @@ -351,55 +406,6 @@ this.panelEx4.Style.GradientAngle = 90; this.panelEx4.TabIndex = 10; // - // dataGridViewX1 - // - this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { - this.Column13, - this.Column14, - this.Column15, - this.Column16, - this.Column17}); - dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; - dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; - dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; - this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX1.Location = new System.Drawing.Point(0, 0); - this.dataGridViewX1.Name = "dataGridViewX1"; - this.dataGridViewX1.RowTemplate.Height = 23; - this.dataGridViewX1.Size = new System.Drawing.Size(750, 200); - this.dataGridViewX1.TabIndex = 14; - // - // Column13 - // - this.Column13.HeaderText = "仪器名称"; - this.Column13.Name = "Column13"; - // - // Column14 - // - this.Column14.HeaderText = "仪器类型"; - this.Column14.Name = "Column14"; - // - // Column15 - // - this.Column15.HeaderText = "仪器编号"; - this.Column15.Name = "Column15"; - // - // Column16 - // - this.Column16.HeaderText = "客户名称"; - this.Column16.Name = "Column16"; - // - // Column17 - // - this.Column17.HeaderText = "开始时间"; - this.Column17.Name = "Column17"; - // // dataGridViewX2 // this.dataGridViewX2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; @@ -425,9 +431,9 @@ dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; this.dataGridViewX2.DefaultCellStyle = dataGridViewCellStyle2; this.dataGridViewX2.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); - this.dataGridViewX2.Location = new System.Drawing.Point(250, 193); + this.dataGridViewX2.Location = new System.Drawing.Point(250, 216); this.dataGridViewX2.Name = "dataGridViewX2"; - this.dataGridViewX2.Size = new System.Drawing.Size(747, 447); + this.dataGridViewX2.Size = new System.Drawing.Size(747, 424); this.dataGridViewX2.TabIndex = 15; // // Column18 @@ -490,10 +496,64 @@ this.Column29.HeaderText = "频率计数器范围及灵敏度"; this.Column29.Name = "Column29"; // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.BackColor = System.Drawing.Color.Transparent; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(663, 183); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(30, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.Symbol = ""; + this.buttonX1.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX1.SymbolSize = 8F; + this.buttonX1.TabIndex = 19; + // + // buttonX2 + // + this.buttonX2.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX2.BackColor = System.Drawing.Color.Transparent; + this.buttonX2.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX2.Location = new System.Drawing.Point(589, 184); + this.buttonX2.Name = "buttonX2"; + this.buttonX2.Size = new System.Drawing.Size(30, 23); + this.buttonX2.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX2.Symbol = ""; + this.buttonX2.SymbolColor = System.Drawing.Color.FromArgb(((int)(((byte)(64)))), ((int)(((byte)(64)))), ((int)(((byte)(64))))); + this.buttonX2.SymbolSize = 8F; + this.buttonX2.TabIndex = 19; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label1.Location = new System.Drawing.Point(880, 186); + this.label1.Margin = new System.Windows.Forms.Padding(0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(20, 20); + this.label1.TabIndex = 20; + this.label1.Text = "1"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("Times New Roman", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); + this.label2.Location = new System.Drawing.Point(636, 187); + this.label2.Margin = new System.Windows.Forms.Padding(0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(200, 20); + this.label2.TabIndex = 20; + this.label2.Text = "共150条，每页5条，共100页"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + // // HomeCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.label2); this.Controls.Add(this.dataGridViewX2); this.Controls.Add(this.panelEx4); this.Controls.Add(this.panelToBeTested); @@ -501,11 +561,11 @@ this.Name = "HomeCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); this.panelToBeTested.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.panelEx1.ResumeLayout(false); this.panelEx2.ResumeLayout(false); this.panelEx3.ResumeLayout(false); this.panelEx4.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX2)).EndInit(); this.ResumeLayout(false); @@ -549,5 +609,9 @@ private System.Windows.Forms.DataGridViewTextBoxColumn Column27; private System.Windows.Forms.DataGridViewTextBoxColumn Column28; private System.Windows.Forms.DataGridViewTextBoxColumn Column29; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.ButtonX buttonX2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; } } diff --git a/RbFreqStandMeasure/Properties/Resources.Designer.cs b/RbFreqStandMeasure/Properties/Resources.Designer.cs index 4c88151..716ac6d 100644 --- a/RbFreqStandMeasure/Properties/Resources.Designer.cs +++ b/RbFreqStandMeasure/Properties/Resources.Designer.cs @@ -59,5 +59,15 @@ resourceCulture = value; } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap bg_white_shadow { + get { + object obj = ResourceManager.GetObject("bg_white_shadow", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/RbFreqStandMeasure/Properties/Resources.resx b/RbFreqStandMeasure/Properties/Resources.resx index af7dbeb..1435dab 100644 --- a/RbFreqStandMeasure/Properties/Resources.resx +++ b/RbFreqStandMeasure/Properties/Resources.resx @@ -46,7 +46,7 @@ mimetype: application/x-microsoft.net.object.binary.base64 value : The object must be serialized with - : System.Serialization.Formatters.Binary.BinaryFormatter + : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter : and then encoded with base64 encoding. mimetype: application/x-microsoft.net.object.soap.base64 @@ -60,6 +60,7 @@ : and then encoded with base64 encoding. --> + @@ -68,9 +69,10 @@ - + + @@ -85,9 +87,10 @@ - + + @@ -109,9 +112,13 @@ 2.0 - System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ..\res\images\bg_white_shadow.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs index de33c49..9467ff1 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.Designer.cs @@ -30,16 +30,16 @@ private void InitializeComponent() { this.panelMenu = new System.Windows.Forms.Panel(); + this.btnCounter = new DevComponents.DotNetBar.ButtonX(); + this.btnData = new DevComponents.DotNetBar.ButtonX(); + this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); + this.btnDev = new DevComponents.DotNetBar.ButtonX(); + this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); + this.btnSetting = new DevComponents.DotNetBar.ButtonX(); + this.btnHome = new DevComponents.DotNetBar.ButtonX(); this.panelMain = new System.Windows.Forms.Panel(); this.panelFooter = new System.Windows.Forms.Panel(); this.labelFooter = new System.Windows.Forms.Label(); - this.btnHome = new DevComponents.DotNetBar.ButtonX(); - this.btnDevStatus = new DevComponents.DotNetBar.ButtonX(); - this.btnDev = new DevComponents.DotNetBar.ButtonX(); - this.btnCounter = new DevComponents.DotNetBar.ButtonX(); - this.btnMeasure = new DevComponents.DotNetBar.ButtonX(); - this.btnData = new DevComponents.DotNetBar.ButtonX(); - this.btnSetting = new DevComponents.DotNetBar.ButtonX(); this.panelMenu.SuspendLayout(); this.panelFooter.SuspendLayout(); this.SuspendLayout(); @@ -59,6 +59,96 @@ this.panelMenu.Size = new System.Drawing.Size(1000, 64); this.panelMenu.TabIndex = 1; // + // btnCounter + // + this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCounter.Location = new System.Drawing.Point(400, 0); + this.btnCounter.Margin = new System.Windows.Forms.Padding(0); + this.btnCounter.Name = "btnCounter"; + this.btnCounter.Size = new System.Drawing.Size(200, 64); + this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCounter.TabIndex = 3; + this.btnCounter.Text = "频率计数器范围及灵敏度测量"; + // + // btnData + // + this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnData.Location = new System.Drawing.Point(750, 0); + this.btnData.Margin = new System.Windows.Forms.Padding(0); + this.btnData.Name = "btnData"; + this.btnData.Size = new System.Drawing.Size(150, 64); + this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnData.TabIndex = 5; + this.btnData.Text = "数据管理"; + this.btnData.Click += new System.EventHandler(this.btnData_Click); + // + // btnMeasure + // + this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnMeasure.Location = new System.Drawing.Point(600, 0); + this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); + this.btnMeasure.Name = "btnMeasure"; + this.btnMeasure.Size = new System.Drawing.Size(150, 64); + this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnMeasure.TabIndex = 4; + this.btnMeasure.Text = "计量信息管理"; + this.btnMeasure.Click += new System.EventHandler(this.btnMeasure_Click); + // + // btnDev + // + this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDev.Location = new System.Drawing.Point(250, 0); + this.btnDev.Margin = new System.Windows.Forms.Padding(0); + this.btnDev.Name = "btnDev"; + this.btnDev.Size = new System.Drawing.Size(150, 64); + this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDev.TabIndex = 2; + this.btnDev.Text = "送检仪器管理"; + this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); + // + // btnDevStatus + // + this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnDevStatus.Location = new System.Drawing.Point(100, 0); + this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); + this.btnDevStatus.Name = "btnDevStatus"; + this.btnDevStatus.Size = new System.Drawing.Size(150, 64); + this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnDevStatus.TabIndex = 1; + this.btnDevStatus.Text = "基准状态"; + this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); + // + // btnSetting + // + this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnSetting.Location = new System.Drawing.Point(900, 0); + this.btnSetting.Margin = new System.Windows.Forms.Padding(0); + this.btnSetting.Name = "btnSetting"; + this.btnSetting.Size = new System.Drawing.Size(100, 64); + this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnSetting.TabIndex = 6; + this.btnSetting.Text = "系统设置"; + this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); + // + // btnHome + // + this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnHome.Location = new System.Drawing.Point(0, 0); + this.btnHome.Margin = new System.Windows.Forms.Padding(0); + this.btnHome.Name = "btnHome"; + this.btnHome.Size = new System.Drawing.Size(100, 64); + this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnHome.TabIndex = 0; + this.btnHome.Text = "首页"; + this.btnHome.Click += new System.EventHandler(this.btnHome_Click); + // // panelMain // this.panelMain.Location = new System.Drawing.Point(4, 64); @@ -87,95 +177,6 @@ this.labelFooter.Text = "欢迎使用铷原子频标对比测量软件"; this.labelFooter.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // - // btnHome - // - this.btnHome.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnHome.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnHome.Location = new System.Drawing.Point(0, 0); - this.btnHome.Margin = new System.Windows.Forms.Padding(0); - this.btnHome.Name = "btnHome"; - this.btnHome.Size = new System.Drawing.Size(100, 64); - this.btnHome.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnHome.TabIndex = 0; - this.btnHome.Text = "首页"; - this.btnHome.Click += new System.EventHandler(this.btnHome_Click); - // - // btnDevStatus - // - this.btnDevStatus.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDevStatus.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDevStatus.Location = new System.Drawing.Point(100, 0); - this.btnDevStatus.Margin = new System.Windows.Forms.Padding(0); - this.btnDevStatus.Name = "btnDevStatus"; - this.btnDevStatus.Size = new System.Drawing.Size(150, 64); - this.btnDevStatus.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDevStatus.TabIndex = 1; - this.btnDevStatus.Text = "基准状态"; - this.btnDevStatus.Click += new System.EventHandler(this.btnDevStatus_Click); - // - // btnDev - // - this.btnDev.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnDev.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnDev.Location = new System.Drawing.Point(250, 0); - this.btnDev.Margin = new System.Windows.Forms.Padding(0); - this.btnDev.Name = "btnDev"; - this.btnDev.Size = new System.Drawing.Size(150, 64); - this.btnDev.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnDev.TabIndex = 2; - this.btnDev.Text = "送检仪器管理"; - this.btnDev.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnCounter - // - this.btnCounter.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnCounter.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnCounter.Location = new System.Drawing.Point(400, 0); - this.btnCounter.Margin = new System.Windows.Forms.Padding(0); - this.btnCounter.Name = "btnCounter"; - this.btnCounter.Size = new System.Drawing.Size(200, 64); - this.btnCounter.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnCounter.TabIndex = 3; - this.btnCounter.Text = "频率计数器范围及灵敏度测量"; - this.btnCounter.Click += new System.EventHandler(this.btnInfoMan_Click); - // - // btnMeasure - // - this.btnMeasure.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnMeasure.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnMeasure.Location = new System.Drawing.Point(600, 0); - this.btnMeasure.Margin = new System.Windows.Forms.Padding(0); - this.btnMeasure.Name = "btnMeasure"; - this.btnMeasure.Size = new System.Drawing.Size(150, 64); - this.btnMeasure.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnMeasure.TabIndex = 4; - this.btnMeasure.Text = "计量信息管理"; - // - // btnData - // - this.btnData.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnData.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnData.Location = new System.Drawing.Point(750, 0); - this.btnData.Margin = new System.Windows.Forms.Padding(0); - this.btnData.Name = "btnData"; - this.btnData.Size = new System.Drawing.Size(150, 64); - this.btnData.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnData.TabIndex = 5; - this.btnData.Text = "数据管理"; - // - // btnSetting - // - this.btnSetting.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; - this.btnSetting.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; - this.btnSetting.Location = new System.Drawing.Point(900, 0); - this.btnSetting.Margin = new System.Windows.Forms.Padding(0); - this.btnSetting.Name = "btnSetting"; - this.btnSetting.Size = new System.Drawing.Size(100, 64); - this.btnSetting.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; - this.btnSetting.TabIndex = 6; - this.btnSetting.Text = "系统设置"; - this.btnSetting.Click += new System.EventHandler(this.btnSetting_Click); - // // RbFreqStandMeasureForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.cs b/RbFreqStandMeasure/RbFreqStandMeasure.cs index 2a27570..82592ee 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.cs +++ b/RbFreqStandMeasure/RbFreqStandMeasure.cs @@ -1,4 +1,4 @@ -using Casic.Birmm.RbFreqStandMeasure.Db; +//using Casic.Birmm.RbFreqStandMeasure.Db; using Casic.Birmm.RbFreqStandMeasure.info; using Casic.Birmm.RbFreqStandMeasure.setting; using Casic.Birmm.RbFreqStandMeasure.Tools; @@ -23,9 +23,10 @@ home.Show(); this.panelMain.Controls.Add(home); + /* // 系统启动时即打开数据库 int iRetval = -1; - iRetval = SqliteHelper.OpenDB(); + iRetval = MySqlHelper.OpenDB(); if (iRetval != 0) { @@ -38,6 +39,7 @@ LogHelper.logger.Info("启动正常"); return; } + */ } private void btnInfoMan_Click(object sender, EventArgs e) @@ -79,5 +81,21 @@ home.Show(); this.panelMain.Controls.Add(home); } + + private void btnMeasure_Click(object sender, EventArgs e) + { + // 清除panel上的所有控件 + this.panelMain.Controls.Clear(); + + DevTestedCtrlForm tested = new DevTestedCtrlForm(); + tested.Show(); + this.panelMain.Controls.Add(tested); + } + + private void btnData_Click(object sender, EventArgs e) + { + DataBackupDlg dataDlg = new DataBackupDlg(); + dataDlg.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/RbFreqStandMeasure.csproj b/RbFreqStandMeasure/RbFreqStandMeasure.csproj index 81a947b..35f244d 100644 --- a/RbFreqStandMeasure/RbFreqStandMeasure.csproj +++ b/RbFreqStandMeasure/RbFreqStandMeasure.csproj @@ -76,15 +76,6 @@ - - ..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.113.3\lib\net40\System.Data.SQLite.dll - - - ..\packages\System.Data.SQLite.EF6.1.0.113.0\lib\net40\System.Data.SQLite.EF6.dll - - - ..\packages\System.Data.SQLite.Linq.1.0.113.0\lib\net40\System.Data.SQLite.Linq.dll - @@ -97,19 +88,36 @@ - UserControl HomeCtrlForm.cs + + Form + + + DataBackupDlg.cs + + + Form + + + AddDevDlg.cs + UserControl InfoCtrlForm.cs + + UserControl + + + DevTestedCtrlForm.cs + Form @@ -141,6 +149,15 @@ HomeCtrlForm.cs + + DataBackupDlg.cs + + + AddDevDlg.cs + + + DevTestedCtrlForm.cs + InfoCtrlForm.cs @@ -185,6 +202,9 @@ + + + @@ -192,8 +212,6 @@ - - \ No newline at end of file diff --git a/RbFreqStandMeasure/db/SqliteHelper.cs b/RbFreqStandMeasure/db/SqliteHelper.cs deleted file mode 100644 index f6fc9eb..0000000 --- a/RbFreqStandMeasure/db/SqliteHelper.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Data.SqlClient; -using System.Data.SQLite; -using System.Linq; -using System.Text; -using System.Windows.Forms; - -namespace Casic.Birmm.RbFreqStandMeasure.Db -{ - public class SqliteHelper - { - static readonly string DB_PATH = "Data Source="+Application.StartupPath+ "\\sqlite\\data\\rb_freq_comp.db"; - public static SQLiteConnection sqliteConnection = null; - public static int OpenDB() - { - int iRetval = -1; - try - { - sqliteConnection = new SQLiteConnection(DB_PATH); - sqliteConnection.Open(); - iRetval = 0; - } - catch (SqlException exSql) - { - iRetval = exSql.ErrorCode; - } - catch (SQLiteException sqliteEx) - { - iRetval = sqliteEx.ErrorCode; - } - - return iRetval; - } - - - } -} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.Designer.cs b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs new file mode 100644 index 0000000..fee0aae --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.Designer.cs @@ -0,0 +1,202 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class AddDevDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.btnAddDevCancel = new DevComponents.DotNetBar.ButtonX(); + this.buttonX1 = new DevComponents.DotNetBar.ButtonX(); + this.labelX3 = new DevComponents.DotNetBar.LabelX(); + this.labelX4 = new DevComponents.DotNetBar.LabelX(); + this.labelX2 = new DevComponents.DotNetBar.LabelX(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX4 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.SuspendLayout(); + // + // btnAddDevCancel + // + this.btnAddDevCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnAddDevCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnAddDevCancel.Location = new System.Drawing.Point(216, 228); + this.btnAddDevCancel.Name = "btnAddDevCancel"; + this.btnAddDevCancel.Size = new System.Drawing.Size(75, 23); + this.btnAddDevCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnAddDevCancel.TabIndex = 8; + this.btnAddDevCancel.Text = "取消"; + this.btnAddDevCancel.Click += new System.EventHandler(this.btnAddDevCancel_Click); + // + // buttonX1 + // + this.buttonX1.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.buttonX1.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.buttonX1.Location = new System.Drawing.Point(108, 228); + this.buttonX1.Name = "buttonX1"; + this.buttonX1.Size = new System.Drawing.Size(75, 23); + this.buttonX1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.buttonX1.TabIndex = 9; + this.buttonX1.Text = "添加"; + // + // labelX3 + // + // + // + // + this.labelX3.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX3.Location = new System.Drawing.Point(60, 166); + this.labelX3.Name = "labelX3"; + this.labelX3.Size = new System.Drawing.Size(75, 23); + this.labelX3.TabIndex = 3; + this.labelX3.Text = "客户单位"; + // + // labelX4 + // + // + // + // + this.labelX4.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX4.Location = new System.Drawing.Point(60, 121); + this.labelX4.Name = "labelX4"; + this.labelX4.Size = new System.Drawing.Size(75, 23); + this.labelX4.TabIndex = 4; + this.labelX4.Text = "仪器名称"; + // + // labelX2 + // + // + // + // + this.labelX2.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX2.Location = new System.Drawing.Point(60, 79); + this.labelX2.Name = "labelX2"; + this.labelX2.Size = new System.Drawing.Size(75, 23); + this.labelX2.TabIndex = 5; + this.labelX2.Text = "仪器编号"; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(60, 35); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(75, 23); + this.labelX1.TabIndex = 7; + this.labelX1.Text = "仪器型号"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(152, 35); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(100, 21); + this.textBoxX1.TabIndex = 10; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX2.Location = new System.Drawing.Point(152, 79); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(100, 21); + this.textBoxX2.TabIndex = 10; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX3.Location = new System.Drawing.Point(152, 121); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(100, 21); + this.textBoxX3.TabIndex = 10; + // + // textBoxX4 + // + // + // + // + this.textBoxX4.Border.Class = "TextBoxBorder"; + this.textBoxX4.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX4.Location = new System.Drawing.Point(152, 166); + this.textBoxX4.Name = "textBoxX4"; + this.textBoxX4.PreventEnterBeep = true; + this.textBoxX4.Size = new System.Drawing.Size(100, 21); + this.textBoxX4.TabIndex = 10; + // + // AddDevDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.textBoxX4); + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnAddDevCancel); + this.Controls.Add(this.buttonX1); + this.Controls.Add(this.labelX3); + this.Controls.Add(this.labelX4); + this.Controls.Add(this.labelX2); + this.Controls.Add(this.labelX1); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "AddDevDlg"; + this.Text = "添加检测设备"; + this.ResumeLayout(false); + + } + + #endregion + private DevComponents.DotNetBar.ButtonX btnAddDevCancel; + private DevComponents.DotNetBar.ButtonX buttonX1; + private DevComponents.DotNetBar.LabelX labelX3; + private DevComponents.DotNetBar.LabelX labelX4; + private DevComponents.DotNetBar.LabelX labelX2; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX4; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/AddDevDlg.cs b/RbFreqStandMeasure/info/AddDevDlg.cs new file mode 100644 index 0000000..739e250 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.cs @@ -0,0 +1,25 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class AddDevDlg : Form + { + public AddDevDlg() + { + InitializeComponent(); + } + + // 关闭对话框 + private void btnAddDevCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/AddDevDlg.resx b/RbFreqStandMeasure/info/AddDevDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/AddDevDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs new file mode 100644 index 0000000..63217b9 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.Designer.cs @@ -0,0 +1,151 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DataBackupDlg + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.rdDataBackup = new System.Windows.Forms.RadioButton(); + this.rdDataRecover = new System.Windows.Forms.RadioButton(); + this.btnConfirm = new DevComponents.DotNetBar.ButtonX(); + this.btnCancel = new DevComponents.DotNetBar.ButtonX(); + this.panel1 = new System.Windows.Forms.Panel(); + this.labelX1 = new DevComponents.DotNetBar.LabelX(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panel1.SuspendLayout(); + this.SuspendLayout(); + // + // rdDataBackup + // + this.rdDataBackup.AutoSize = true; + this.rdDataBackup.Location = new System.Drawing.Point(41, 28); + this.rdDataBackup.Name = "rdDataBackup"; + this.rdDataBackup.Size = new System.Drawing.Size(71, 16); + this.rdDataBackup.TabIndex = 0; + this.rdDataBackup.TabStop = true; + this.rdDataBackup.Text = "数据备份"; + this.rdDataBackup.UseVisualStyleBackColor = true; + // + // rdDataRecover + // + this.rdDataRecover.AutoSize = true; + this.rdDataRecover.Location = new System.Drawing.Point(199, 28); + this.rdDataRecover.Name = "rdDataRecover"; + this.rdDataRecover.Size = new System.Drawing.Size(71, 16); + this.rdDataRecover.TabIndex = 1; + this.rdDataRecover.TabStop = true; + this.rdDataRecover.Text = "数据还原"; + this.rdDataRecover.UseVisualStyleBackColor = true; + // + // btnConfirm + // + this.btnConfirm.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnConfirm.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnConfirm.Location = new System.Drawing.Point(70, 252); + this.btnConfirm.Name = "btnConfirm"; + this.btnConfirm.Size = new System.Drawing.Size(75, 23); + this.btnConfirm.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnConfirm.TabIndex = 1; + this.btnConfirm.Text = "确定"; + // + // btnCancel + // + this.btnCancel.AccessibleRole = System.Windows.Forms.AccessibleRole.PushButton; + this.btnCancel.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground; + this.btnCancel.Location = new System.Drawing.Point(211, 252); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.Size = new System.Drawing.Size(75, 23); + this.btnCancel.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnCancel.TabIndex = 1; + this.btnCancel.Text = "取消"; + this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click); + // + // panel1 + // + this.panel1.Controls.Add(this.textBoxX1); + this.panel1.Controls.Add(this.labelX1); + this.panel1.Location = new System.Drawing.Point(13, 50); + this.panel1.Name = "panel1"; + this.panel1.Size = new System.Drawing.Size(375, 196); + this.panel1.TabIndex = 6; + // + // labelX1 + // + // + // + // + this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.labelX1.Location = new System.Drawing.Point(13, 91); + this.labelX1.Name = "labelX1"; + this.labelX1.Size = new System.Drawing.Size(56, 23); + this.labelX1.TabIndex = 0; + this.labelX1.Text = "路径"; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxX1.Location = new System.Drawing.Point(57, 92); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(297, 21); + this.textBoxX1.TabIndex = 1; + // + // DataBackupDlg + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(400, 300); + this.ControlBox = false; + this.Controls.Add(this.panel1); + this.Controls.Add(this.btnCancel); + this.Controls.Add(this.btnConfirm); + this.Controls.Add(this.rdDataRecover); + this.Controls.Add(this.rdDataBackup); + this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog; + this.Name = "DataBackupDlg"; + this.Text = "数据管理"; + this.panel1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.RadioButton rdDataBackup; + private System.Windows.Forms.RadioButton rdDataRecover; + private DevComponents.DotNetBar.ButtonX btnConfirm; + private DevComponents.DotNetBar.ButtonX btnCancel; + private System.Windows.Forms.Panel panel1; + private DevComponents.DotNetBar.LabelX labelX1; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + } +} \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DataBackupDlg.cs b/RbFreqStandMeasure/info/DataBackupDlg.cs new file mode 100644 index 0000000..ec6e45c --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.cs @@ -0,0 +1,24 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DataBackupDlg : Form + { + public DataBackupDlg() + { + InitializeComponent(); + } + + private void btnCancel_Click(object sender, EventArgs e) + { + this.Close(); + } + } +} diff --git a/RbFreqStandMeasure/info/DataBackupDlg.resx b/RbFreqStandMeasure/info/DataBackupDlg.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RbFreqStandMeasure/info/DataBackupDlg.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs new file mode 100644 index 0000000..5dedab5 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.Designer.cs @@ -0,0 +1,296 @@ + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + partial class DevTestedCtrlForm + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.label1 = new System.Windows.Forms.Label(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.roundButton1 = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); + this.panelEx1.SuspendLayout(); + this.SuspendLayout(); + // + // line1 + // + this.line1.Location = new System.Drawing.Point(4, 43); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 17; + this.line1.Text = "line1"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle5; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 170); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 16; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // panelEx1 + // + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.roundButton1); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 72); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 15; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(21, 27); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 12); + this.label1.TabIndex = 14; + this.label1.Text = "计量信息管理"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "导出数据"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // roundButton1 + // + this.roundButton1.EnterBackColor = System.Drawing.Color.Blue; + this.roundButton1.EnterForeColor = System.Drawing.Color.White; + this.roundButton1.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.roundButton1.FlatAppearance.BorderSize = 0; + this.roundButton1.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.roundButton1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.roundButton1.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.roundButton1.HoverForeColor = System.Drawing.Color.White; + this.roundButton1.Location = new System.Drawing.Point(537, 15); + this.roundButton1.Name = "roundButton1"; + this.roundButton1.PressBackColor = System.Drawing.Color.DarkBlue; + this.roundButton1.PressForeColor = System.Drawing.Color.White; + this.roundButton1.Radius = 18; + this.roundButton1.Size = new System.Drawing.Size(75, 28); + this.roundButton1.TabIndex = 3; + this.roundButton1.Text = "查看详情"; + this.roundButton1.UseVisualStyleBackColor = true; + // + // DevTestedCtrlForm + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); + this.Controls.Add(this.label1); + this.Name = "DevTestedCtrlForm"; + this.Size = new System.Drawing.Size(1000, 640); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); + this.panelEx1.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private DevComponents.DotNetBar.Controls.Line line1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.PanelEx panelEx1; + private System.Windows.Forms.Label label1; + private RoundButton btnDelDev; + private RoundButton roundButton1; + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.cs b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs new file mode 100644 index 0000000..5ed5c34 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.cs @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Windows.Forms; + +namespace Casic.Birmm.RbFreqStandMeasure.info +{ + public partial class DevTestedCtrlForm : UserControl + { + public DevTestedCtrlForm() + { + InitializeComponent(); + } + } +} diff --git a/RbFreqStandMeasure/info/DevTestedCtrlForm.resx b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx new file mode 100644 index 0000000..d484387 --- /dev/null +++ b/RbFreqStandMeasure/info/DevTestedCtrlForm.resx @@ -0,0 +1,150 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + \ No newline at end of file diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs index ba19109..8bdbee9 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.Designer.cs @@ -29,12 +29,29 @@ /// private void InitializeComponent() { + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); this.label1 = new System.Windows.Forms.Label(); - this.dataGridView1 = new System.Windows.Forms.DataGridView(); + this.panelEx1 = new DevComponents.DotNetBar.PanelEx(); + this.iptDevType = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.iptDevName = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxDropDown1 = new DevComponents.DotNetBar.Controls.TextBoxDropDown(); + this.dataGridViewX1 = new DevComponents.DotNetBar.Controls.DataGridViewX(); + this.Column1 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column2 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column3 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column4 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column5 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column6 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column7 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column8 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column9 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Column10 = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.btnDelDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnEditDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); this.btnAddDev = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); - this.rpDevCond = new Casic.Birmm.RbFreqStandMeasure.RoundPanel(); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).BeginInit(); - this.rpDevCond.SuspendLayout(); + this.line1 = new DevComponents.DotNetBar.Controls.Line(); + this.panelEx1.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).BeginInit(); this.SuspendLayout(); // // label1 @@ -46,14 +63,190 @@ this.label1.TabIndex = 0; this.label1.Text = "送检仪器管理"; // - // dataGridView1 + // panelEx1 // - this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; - this.dataGridView1.Location = new System.Drawing.Point(23, 137); - this.dataGridView1.Name = "dataGridView1"; - this.dataGridView1.RowTemplate.Height = 23; - this.dataGridView1.Size = new System.Drawing.Size(935, 420); - this.dataGridView1.TabIndex = 1; + this.panelEx1.CanvasColor = System.Drawing.SystemColors.Control; + this.panelEx1.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.panelEx1.Controls.Add(this.textBoxDropDown1); + this.panelEx1.Controls.Add(this.iptDevName); + this.panelEx1.Controls.Add(this.iptDevType); + this.panelEx1.Controls.Add(this.btnDelDev); + this.panelEx1.Controls.Add(this.btnEditDev); + this.panelEx1.Controls.Add(this.btnAddDev); + this.panelEx1.DisabledBackColor = System.Drawing.Color.Empty; + this.panelEx1.Location = new System.Drawing.Point(3, 57); + this.panelEx1.Name = "panelEx1"; + this.panelEx1.Size = new System.Drawing.Size(994, 59); + this.panelEx1.Style.Alignment = System.Drawing.StringAlignment.Center; + this.panelEx1.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground; + this.panelEx1.Style.BackColor2.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBackground2; + this.panelEx1.Style.Border = DevComponents.DotNetBar.eBorderType.SingleLine; + this.panelEx1.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.panelEx1.Style.ForeColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelText; + this.panelEx1.Style.GradientAngle = 90; + this.panelEx1.TabIndex = 5; + // + // iptDevType + // + // + // + // + this.iptDevType.Border.Class = "TextBoxBorder"; + this.iptDevType.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevType.Location = new System.Drawing.Point(21, 21); + this.iptDevType.Name = "iptDevType"; + this.iptDevType.PreventEnterBeep = true; + this.iptDevType.Size = new System.Drawing.Size(100, 21); + this.iptDevType.TabIndex = 4; + // + // iptDevName + // + // + // + // + this.iptDevName.Border.Class = "TextBoxBorder"; + this.iptDevName.Border.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.iptDevName.Location = new System.Drawing.Point(142, 21); + this.iptDevName.Name = "iptDevName"; + this.iptDevName.PreventEnterBeep = true; + this.iptDevName.Size = new System.Drawing.Size(100, 21); + this.iptDevName.TabIndex = 4; + // + // textBoxDropDown1 + // + // + // + // + this.textBoxDropDown1.BackgroundStyle.Class = "TextBoxBorder"; + this.textBoxDropDown1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square; + this.textBoxDropDown1.ButtonDropDown.Visible = true; + this.textBoxDropDown1.Location = new System.Drawing.Point(273, 21); + this.textBoxDropDown1.Name = "textBoxDropDown1"; + this.textBoxDropDown1.Size = new System.Drawing.Size(122, 20); + this.textBoxDropDown1.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.textBoxDropDown1.TabIndex = 9; + this.textBoxDropDown1.Text = ""; + // + // dataGridViewX1 + // + this.dataGridViewX1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.dataGridViewX1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] { + this.Column1, + this.Column2, + this.Column3, + this.Column4, + this.Column5, + this.Column6, + this.Column7, + this.Column8, + this.Column9, + this.Column10}); + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Window; + dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.ControlText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dataGridViewX1.DefaultCellStyle = dataGridViewCellStyle1; + this.dataGridViewX1.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229))))); + this.dataGridViewX1.Location = new System.Drawing.Point(3, 155); + this.dataGridViewX1.Name = "dataGridViewX1"; + this.dataGridViewX1.RowTemplate.Height = 23; + this.dataGridViewX1.Size = new System.Drawing.Size(994, 444); + this.dataGridViewX1.TabIndex = 9; + // + // Column1 + // + this.Column1.HeaderText = "登记日期"; + this.Column1.Name = "Column1"; + // + // Column2 + // + this.Column2.HeaderText = "仪器型号"; + this.Column2.Name = "Column2"; + // + // Column3 + // + this.Column3.HeaderText = "仪器编号"; + this.Column3.Name = "Column3"; + // + // Column4 + // + this.Column4.HeaderText = "客户单位"; + this.Column4.Name = "Column4"; + // + // Column5 + // + this.Column5.HeaderText = "检测状态"; + this.Column5.Name = "Column5"; + // + // Column6 + // + this.Column6.HeaderText = "频率稳定度"; + this.Column6.Name = "Column6"; + // + // Column7 + // + this.Column7.HeaderText = "频率准确度"; + this.Column7.Name = "Column7"; + // + // Column8 + // + this.Column8.HeaderText = "开机特性"; + this.Column8.Name = "Column8"; + // + // Column9 + // + this.Column9.HeaderText = "日老化率"; + this.Column9.Name = "Column9"; + // + // Column10 + // + this.Column10.HeaderText = "频率计数器范围及灵敏度"; + this.Column10.Name = "Column10"; + // + // btnDelDev + // + this.btnDelDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnDelDev.EnterForeColor = System.Drawing.Color.White; + this.btnDelDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnDelDev.FlatAppearance.BorderSize = 0; + this.btnDelDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnDelDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnDelDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnDelDev.HoverForeColor = System.Drawing.Color.White; + this.btnDelDev.Location = new System.Drawing.Point(639, 15); + this.btnDelDev.Name = "btnDelDev"; + this.btnDelDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnDelDev.PressForeColor = System.Drawing.Color.White; + this.btnDelDev.Radius = 18; + this.btnDelDev.Size = new System.Drawing.Size(75, 28); + this.btnDelDev.TabIndex = 3; + this.btnDelDev.Text = "删除"; + this.btnDelDev.UseVisualStyleBackColor = true; + // + // btnEditDev + // + this.btnEditDev.EnterBackColor = System.Drawing.Color.Blue; + this.btnEditDev.EnterForeColor = System.Drawing.Color.White; + this.btnEditDev.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnEditDev.FlatAppearance.BorderSize = 0; + this.btnEditDev.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnEditDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnEditDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); + this.btnEditDev.HoverForeColor = System.Drawing.Color.White; + this.btnEditDev.Location = new System.Drawing.Point(546, 15); + this.btnEditDev.Name = "btnEditDev"; + this.btnEditDev.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnEditDev.PressForeColor = System.Drawing.Color.White; + this.btnEditDev.Radius = 18; + this.btnEditDev.Size = new System.Drawing.Size(75, 28); + this.btnEditDev.TabIndex = 3; + this.btnEditDev.Text = "编辑"; + this.btnEditDev.UseVisualStyleBackColor = true; // // btnAddDev // @@ -66,7 +259,7 @@ this.btnAddDev.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btnAddDev.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(153)))), ((int)(((byte)(68))))); this.btnAddDev.HoverForeColor = System.Drawing.Color.White; - this.btnAddDev.Location = new System.Drawing.Point(500, 6); + this.btnAddDev.Location = new System.Drawing.Point(455, 15); this.btnAddDev.Name = "btnAddDev"; this.btnAddDev.PressBackColor = System.Drawing.Color.DarkBlue; this.btnAddDev.PressForeColor = System.Drawing.Color.White; @@ -75,29 +268,29 @@ this.btnAddDev.TabIndex = 3; this.btnAddDev.Text = "添加"; this.btnAddDev.UseVisualStyleBackColor = true; + this.btnAddDev.Click += new System.EventHandler(this.btnAddDev_Click); // - // rpDevCond + // line1 // - this.rpDevCond.Back = System.Drawing.Color.Empty; - this.rpDevCond.Controls.Add(this.btnAddDev); - this.rpDevCond.Location = new System.Drawing.Point(23, 71); - this.rpDevCond.MatrixRound = 8; - this.rpDevCond.Name = "rpDevCond"; - this.rpDevCond.Size = new System.Drawing.Size(935, 40); - this.rpDevCond.TabIndex = 4; + this.line1.Location = new System.Drawing.Point(4, 28); + this.line1.Name = "line1"; + this.line1.Size = new System.Drawing.Size(993, 23); + this.line1.TabIndex = 10; + this.line1.Text = "line1"; // // InfoCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.rpDevCond); - this.Controls.Add(this.dataGridView1); + this.Controls.Add(this.line1); + this.Controls.Add(this.dataGridViewX1); + this.Controls.Add(this.panelEx1); this.Controls.Add(this.label1); this.Margin = new System.Windows.Forms.Padding(0); this.Name = "InfoCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); - ((System.ComponentModel.ISupportInitialize)(this.dataGridView1)).EndInit(); - this.rpDevCond.ResumeLayout(false); + this.panelEx1.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)(this.dataGridViewX1)).EndInit(); this.ResumeLayout(false); this.PerformLayout(); @@ -106,8 +299,24 @@ #endregion private System.Windows.Forms.Label label1; - private System.Windows.Forms.DataGridView dataGridView1; private RoundButton btnAddDev; - private RoundPanel rpDevCond; + private DevComponents.DotNetBar.PanelEx panelEx1; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevType; + private DevComponents.DotNetBar.Controls.TextBoxX iptDevName; + private DevComponents.DotNetBar.Controls.TextBoxDropDown textBoxDropDown1; + private RoundButton btnDelDev; + private RoundButton btnEditDev; + private DevComponents.DotNetBar.Controls.DataGridViewX dataGridViewX1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column1; + private System.Windows.Forms.DataGridViewTextBoxColumn Column2; + private System.Windows.Forms.DataGridViewTextBoxColumn Column3; + private System.Windows.Forms.DataGridViewTextBoxColumn Column4; + private System.Windows.Forms.DataGridViewTextBoxColumn Column5; + private System.Windows.Forms.DataGridViewTextBoxColumn Column6; + private System.Windows.Forms.DataGridViewTextBoxColumn Column7; + private System.Windows.Forms.DataGridViewTextBoxColumn Column8; + private System.Windows.Forms.DataGridViewTextBoxColumn Column9; + private System.Windows.Forms.DataGridViewTextBoxColumn Column10; + private DevComponents.DotNetBar.Controls.Line line1; } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.cs b/RbFreqStandMeasure/info/InfoCtrlForm.cs index 31a3e61..8df7e6c 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.cs +++ b/RbFreqStandMeasure/info/InfoCtrlForm.cs @@ -15,5 +15,12 @@ { InitializeComponent(); } + + // 送检仪器登记页面 + private void btnAddDev_Click(object sender, EventArgs e) + { + AddDevDlg addDev = new AddDevDlg(); + addDev.ShowDialog(); + } } } diff --git a/RbFreqStandMeasure/info/InfoCtrlForm.resx b/RbFreqStandMeasure/info/InfoCtrlForm.resx index 1af7de1..40cec2f 100644 --- a/RbFreqStandMeasure/info/InfoCtrlForm.resx +++ b/RbFreqStandMeasure/info/InfoCtrlForm.resx @@ -117,4 +117,34 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + \ No newline at end of file diff --git a/RbFreqStandMeasure/packages.config b/RbFreqStandMeasure/packages.config index c2aa027..ecdd1da 100644 --- a/RbFreqStandMeasure/packages.config +++ b/RbFreqStandMeasure/packages.config @@ -3,9 +3,4 @@ - - - - - \ No newline at end of file diff --git a/RbFreqStandMeasure/res/images/bg_white_shadow.png b/RbFreqStandMeasure/res/images/bg_white_shadow.png new file mode 100644 index 0000000..4fdd543 --- /dev/null +++ b/RbFreqStandMeasure/res/images/bg_white_shadow.png Binary files differ diff --git a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs index a05bc64..f551181 100644 --- a/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs +++ b/RbFreqStandMeasure/setting/SettingCtrlForm.Designer.cs @@ -29,34 +29,154 @@ /// private void InitializeComponent() { - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); + this.btnCancel = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.btnSave = new Casic.Birmm.RbFreqStandMeasure.RoundButton(); + this.textBoxX1 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.label1 = new System.Windows.Forms.Label(); + this.label2 = new System.Windows.Forms.Label(); + this.label3 = new System.Windows.Forms.Label(); + this.textBoxX2 = new DevComponents.DotNetBar.Controls.TextBoxX(); + this.textBoxX3 = new DevComponents.DotNetBar.Controls.TextBoxX(); this.SuspendLayout(); // - // button1 + // btnCancel // - this.button1.Location = new System.Drawing.Point(449, 3); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(160, 23); - this.button1.TabIndex = 0; - this.button1.Text = "设置系统参数"; - this.button1.UseVisualStyleBackColor = true; + this.btnCancel.EnterBackColor = System.Drawing.Color.Blue; + this.btnCancel.EnterForeColor = System.Drawing.Color.White; + this.btnCancel.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnCancel.FlatAppearance.BorderSize = 0; + this.btnCancel.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnCancel.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnCancel.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnCancel.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnCancel.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(86)))), ((int)(((byte)(163)))), ((int)(((byte)(242))))); + this.btnCancel.HoverForeColor = System.Drawing.Color.White; + this.btnCancel.Location = new System.Drawing.Point(322, 517); + this.btnCancel.Name = "btnCancel"; + this.btnCancel.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnCancel.PressForeColor = System.Drawing.Color.White; + this.btnCancel.Radius = 5; + this.btnCancel.Size = new System.Drawing.Size(150, 30); + this.btnCancel.TabIndex = 0; + this.btnCancel.Text = "放弃修改"; + this.btnCancel.UseVisualStyleBackColor = true; // - // button2 + // btnSave // - this.button2.Location = new System.Drawing.Point(449, 614); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(160, 23); - this.button2.TabIndex = 0; - this.button2.Text = "设置系统参数结束"; - this.button2.UseVisualStyleBackColor = true; + this.btnSave.EnterBackColor = System.Drawing.Color.Blue; + this.btnSave.EnterForeColor = System.Drawing.Color.White; + this.btnSave.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0))))); + this.btnSave.FlatAppearance.BorderSize = 0; + this.btnSave.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent; + this.btnSave.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.btnSave.Font = new System.Drawing.Font("微软雅黑", 10F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnSave.HoverBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(47)))), ((int)(((byte)(111)))), ((int)(((byte)(198))))); + this.btnSave.HoverForeColor = System.Drawing.Color.White; + this.btnSave.Location = new System.Drawing.Point(506, 517); + this.btnSave.Name = "btnSave"; + this.btnSave.PressBackColor = System.Drawing.Color.DarkBlue; + this.btnSave.PressForeColor = System.Drawing.Color.White; + this.btnSave.Radius = 5; + this.btnSave.Size = new System.Drawing.Size(150, 30); + this.btnSave.TabIndex = 0; + this.btnSave.Text = "保存"; + this.btnSave.UseVisualStyleBackColor = true; + // + // textBoxX1 + // + // + // + // + this.textBoxX1.Border.Class = "TextBoxBorder"; + this.textBoxX1.Border.CornerDiameter = 5; + this.textBoxX1.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX1.Location = new System.Drawing.Point(378, 131); + this.textBoxX1.Name = "textBoxX1"; + this.textBoxX1.PreventEnterBeep = true; + this.textBoxX1.Size = new System.Drawing.Size(278, 29); + this.textBoxX1.TabIndex = 2; + // + // label1 + // + this.label1.BackColor = System.Drawing.Color.Transparent; + this.label1.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label1.Location = new System.Drawing.Point(250, 131); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(100, 25); + this.label1.TabIndex = 4; + this.label1.Text = "串口波特率"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label2 + // + this.label2.BackColor = System.Drawing.Color.Transparent; + this.label2.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label2.Location = new System.Drawing.Point(250, 180); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(100, 25); + this.label2.TabIndex = 4; + this.label2.Text = "频率发生器IP"; + this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // label3 + // + this.label3.BackColor = System.Drawing.Color.Transparent; + this.label3.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.label3.Location = new System.Drawing.Point(250, 229); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(100, 25); + this.label3.TabIndex = 4; + this.label3.Text = "频率信号源IP"; + this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // textBoxX2 + // + // + // + // + this.textBoxX2.Border.Class = "TextBoxBorder"; + this.textBoxX2.Border.CornerDiameter = 5; + this.textBoxX2.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX2.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX2.Location = new System.Drawing.Point(378, 181); + this.textBoxX2.Name = "textBoxX2"; + this.textBoxX2.PreventEnterBeep = true; + this.textBoxX2.Size = new System.Drawing.Size(278, 29); + this.textBoxX2.TabIndex = 5; + // + // textBoxX3 + // + // + // + // + this.textBoxX3.Border.Class = "TextBoxBorder"; + this.textBoxX3.Border.CornerDiameter = 5; + this.textBoxX3.Border.CornerType = DevComponents.DotNetBar.eCornerType.Rounded; + this.textBoxX3.Font = new System.Drawing.Font("微软雅黑", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.textBoxX3.Location = new System.Drawing.Point(378, 230); + this.textBoxX3.Name = "textBoxX3"; + this.textBoxX3.PreventEnterBeep = true; + this.textBoxX3.Size = new System.Drawing.Size(278, 29); + this.textBoxX3.TabIndex = 6; // // SettingCtrlForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.button2); - this.Controls.Add(this.button1); + this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(236)))), ((int)(((byte)(238)))), ((int)(((byte)(242))))); + this.BackgroundImage = global::Casic.Birmm.RbFreqStandMeasure.Properties.Resources.bg_white_shadow; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; + this.Controls.Add(this.textBoxX3); + this.Controls.Add(this.textBoxX2); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.textBoxX1); + this.Controls.Add(this.btnSave); + this.Controls.Add(this.btnCancel); + this.DoubleBuffered = true; this.Margin = new System.Windows.Forms.Padding(0); this.Name = "SettingCtrlForm"; this.Size = new System.Drawing.Size(1000, 640); @@ -66,7 +186,13 @@ #endregion - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Button button2; + private RoundButton btnCancel; + private RoundButton btnSave; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX1; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label3; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX2; + private DevComponents.DotNetBar.Controls.TextBoxX textBoxX3; } }