修改逻辑

DHSoftware/Models/DataUtil.cs

@@ -11,6 +11,7 @@ namespace AntdUIDemo.Models
                 new MenuItems { Text = "工位1" , Tag = "工位1"},
                 new MenuItems { Text = "工位2", Tag = "工位2"},
                 new MenuItems { Text = "工位3", Tag = "工位3"},
+                new MenuItems { Text = "保存配置", Tag = "保存配置"},
             }
         },
         //{ "布局", new List<MenuItems>

DHSoftware/Views/CamConfigFrm.Designer.cs

@@ -39,7 +39,8 @@
             Serinum = new DataGridViewTextBoxColumn();
             IP = new DataGridViewTextBoxColumn();
             COMBO_DEVICES = new ComboBox();
-            btnsubmit = new Button();
+            label2 = new Label();
+            inputNumber1 = new AntdUI.InputNumber();
             tabs1.SuspendLayout();
             tabPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)dgvCams).BeginInit();
@@ -52,21 +53,22 @@
             tabs1.Location = new Point(0, 0);
             tabs1.Name = "tabs1";
             tabs1.Pages.Add(tabPage1);
-            tabs1.Size = new Size(391, 407);
+            tabs1.Size = new Size(489, 563);
             tabs1.Style = styleLine1;
             tabs1.TabIndex = 0;
             tabs1.Text = "tabs1";
             // 
             // tabPage1
             // 
-            tabPage1.Controls.Add(btnsubmit);
+            tabPage1.Controls.Add(inputNumber1);
+            tabPage1.Controls.Add(label2);
             tabPage1.Controls.Add(label1);
             tabPage1.Controls.Add(btnRefreshCamList);
             tabPage1.Controls.Add(dgvCams);
             tabPage1.Controls.Add(COMBO_DEVICES);
             tabPage1.Location = new Point(3, 28);
             tabPage1.Name = "tabPage1";
-            tabPage1.Size = new Size(385, 376);
+            tabPage1.Size = new Size(483, 532);
             tabPage1.TabIndex = 0;
             tabPage1.Text = "相机配置";
             // 
@@ -83,7 +85,7 @@
             // 
             btnRefreshCamList.Location = new Point(36, 43);
             btnRefreshCamList.Name = "btnRefreshCamList";
-            btnRefreshCamList.Size = new Size(286, 33);
+            btnRefreshCamList.Size = new Size(423, 33);
             btnRefreshCamList.TabIndex = 2;
             btnRefreshCamList.Text = "刷新相机列表";
             btnRefreshCamList.UseVisualStyleBackColor = true;
@@ -96,7 +98,7 @@
             dgvCams.Columns.AddRange(new DataGridViewColumn[] { CamName, Serinum, IP });
             dgvCams.Location = new Point(38, 82);
             dgvCams.Name = "dgvCams";
-            dgvCams.Size = new Size(284, 206);
+            dgvCams.Size = new Size(421, 206);
             dgvCams.TabIndex = 1;
             // 
             // CamName
@@ -120,18 +122,25 @@
             COMBO_DEVICES.FormattingEnabled = true;
             COMBO_DEVICES.Location = new Point(100, 12);
             COMBO_DEVICES.Name = "COMBO_DEVICES";
-            COMBO_DEVICES.Size = new Size(222, 25);
+            COMBO_DEVICES.Size = new Size(359, 25);
             COMBO_DEVICES.TabIndex = 0;
             // 
-            // btnsubmit
+            // label2
             // 
-            btnsubmit.Location = new Point(236, 312);
+            label2.AutoSize = true;
-            btnsubmit.Name = "btnsubmit";
+            label2.Location = new Point(36, 321);
-            btnsubmit.Size = new Size(86, 37);
+            label2.Name = "label2";
-            btnsubmit.TabIndex = 4;
+            label2.Size = new Size(68, 17);
-            btnsubmit.Text = "确定";
+            label2.TabIndex = 5;
-            btnsubmit.UseVisualStyleBackColor = true;
+            label2.Text = "工位配置数";
-            btnsubmit.Click += btnsubmit_Click;
+            // 
+            // inputNumber1
+            // 
+            inputNumber1.Location = new Point(100, 309);
+            inputNumber1.Name = "inputNumber1";
+            inputNumber1.Size = new Size(141, 39);
+            inputNumber1.TabIndex = 6;
+            inputNumber1.Text = "inputNumber1";
             // 
             // CamConfigFrm
             // 
@@ -139,7 +148,7 @@
             AutoScaleMode = AutoScaleMode.Font;
             Controls.Add(tabs1);
             Name = "CamConfigFrm";
-            Size = new Size(391, 407);
+            Size = new Size(489, 563);
             tabs1.ResumeLayout(false);
             tabPage1.ResumeLayout(false);
             tabPage1.PerformLayout();
@@ -158,6 +167,7 @@
         private DataGridViewTextBoxColumn CamName;
         private DataGridViewTextBoxColumn Serinum;
         private DataGridViewTextBoxColumn IP;
-        private Button btnsubmit;
+        private AntdUI.InputNumber inputNumber1;
+        private Label label2;
     }
 }

DHSoftware/Views/DetectConfigControl.Designer.cs

@@ -29,33 +29,34 @@
         private void InitializeComponent()
         {
             panel1 = new Panel();
-            label1 = new AntdUI.Label();
+            button3 = new AntdUI.Button();
-            tbxPrePath = new TextBox();
-            btnPreOpen = new AntdUI.Button();
-            label5 = new AntdUI.Label();
-            comboBox1 = new ComboBox();
-            label6 = new AntdUI.Label();
-            textBox1 = new TextBox();
-            label8 = new AntdUI.Label();
-            switch1 = new AntdUI.Switch();
-            label7 = new AntdUI.Label();
-            switch2 = new AntdUI.Switch();
-            label9 = new AntdUI.Label();
-            switch3 = new AntdUI.Switch();
-            label10 = new AntdUI.Label();
-            switch4 = new AntdUI.Switch();
             panel2 = new Panel();
             label2 = new Label();
             button2 = new AntdUI.Button();
             table1 = new AntdUI.Table();
             button1 = new AntdUI.Button();
-            button3 = new AntdUI.Button();
+            label10 = new AntdUI.Label();
+            switch4 = new AntdUI.Switch();
+            label9 = new AntdUI.Label();
+            switch3 = new AntdUI.Switch();
+            label7 = new AntdUI.Label();
+            switch2 = new AntdUI.Switch();
+            label8 = new AntdUI.Label();
+            switch1 = new AntdUI.Switch();
+            textBox1 = new TextBox();
+            label6 = new AntdUI.Label();
+            comboBox1 = new ComboBox();
+            label5 = new AntdUI.Label();
+            btnPreOpen = new AntdUI.Button();
+            tbxPrePath = new TextBox();
+            label1 = new AntdUI.Label();
             panel1.SuspendLayout();
             panel2.SuspendLayout();
             SuspendLayout();
             // 
             // panel1
             // 
+            panel1.BorderStyle = BorderStyle.FixedSingle;
             panel1.Controls.Add(button3);
             panel1.Controls.Add(panel2);
             panel1.Controls.Add(label10);
@@ -79,123 +80,13 @@
             panel1.Size = new Size(785, 445);
             panel1.TabIndex = 0;
             // 
-            // label1
+            // button3
             // 
-            label1.Location = new Point(17, 41);
+            button3.Location = new Point(472, 101);
-            label1.Name = "label1";
+            button3.Name = "button3";
-            label1.Size = new Size(73, 23);
+            button3.Size = new Size(118, 34);
-            label1.TabIndex = 9;
+            button3.TabIndex = 37;
-            label1.Text = "模型路径";
+            button3.Text = "查看文件夹";
-            // 
-            // tbxPrePath
-            // 
-            tbxPrePath.Location = new Point(96, 41);
-            tbxPrePath.Name = "tbxPrePath";
-            tbxPrePath.Size = new Size(498, 23);
-            tbxPrePath.TabIndex = 17;
-            // 
-            // btnPreOpen
-            // 
-            btnPreOpen.Location = new Point(613, 41);
-            btnPreOpen.Name = "btnPreOpen";
-            btnPreOpen.Size = new Size(46, 23);
-            btnPreOpen.TabIndex = 22;
-            btnPreOpen.Text = "...";
-            // 
-            // label5
-            // 
-            label5.Location = new Point(333, 12);
-            label5.Name = "label5";
-            label5.Size = new Size(73, 23);
-            label5.TabIndex = 23;
-            label5.Text = "目标类型";
-            // 
-            // comboBox1
-            // 
-            comboBox1.FormattingEnabled = true;
-            comboBox1.Location = new Point(402, 10);
-            comboBox1.Name = "comboBox1";
-            comboBox1.Size = new Size(188, 25);
-            comboBox1.TabIndex = 24;
-            // 
-            // label6
-            // 
-            label6.Location = new Point(17, 12);
-            label6.Name = "label6";
-            label6.Size = new Size(58, 23);
-            label6.TabIndex = 25;
-            label6.Text = "检测名称";
-            // 
-            // textBox1
-            // 
-            textBox1.Location = new Point(96, 12);
-            textBox1.Name = "textBox1";
-            textBox1.Size = new Size(211, 23);
-            textBox1.TabIndex = 26;
-            // 
-            // label8
-            // 
-            label8.Location = new Point(17, 70);
-            label8.Name = "label8";
-            label8.Size = new Size(58, 23);
-            label8.TabIndex = 28;
-            label8.Text = "模型启用";
-            // 
-            // switch1
-            // 
-            switch1.Location = new Point(96, 70);
-            switch1.Name = "switch1";
-            switch1.Size = new Size(57, 23);
-            switch1.TabIndex = 27;
-            switch1.Text = "switch1";
-            // 
-            // label7
-            // 
-            label7.Location = new Point(179, 70);
-            label7.Name = "label7";
-            label7.Size = new Size(58, 23);
-            label7.TabIndex = 30;
-            label7.Text = "数据保存";
-            // 
-            // switch2
-            // 
-            switch2.Location = new Point(258, 70);
-            switch2.Name = "switch2";
-            switch2.Size = new Size(57, 23);
-            switch2.TabIndex = 29;
-            switch2.Text = "switch2";
-            // 
-            // label9
-            // 
-            label9.Location = new Point(333, 70);
-            label9.Name = "label9";
-            label9.Size = new Size(73, 23);
-            label9.TabIndex = 32;
-            label9.Text = "保存OK原图";
-            // 
-            // switch3
-            // 
-            switch3.Location = new Point(412, 70);
-            switch3.Name = "switch3";
-            switch3.Size = new Size(57, 23);
-            switch3.TabIndex = 31;
-            switch3.Text = "switch3";
-            // 
-            // label10
-            // 
-            label10.Location = new Point(487, 70);
-            label10.Name = "label10";
-            label10.Size = new Size(73, 23);
-            label10.TabIndex = 34;
-            label10.Text = "保存NG原图";
-            // 
-            // switch4
-            // 
-            switch4.Location = new Point(566, 70);
-            switch4.Name = "switch4";
-            switch4.Size = new Size(57, 23);
-            switch4.TabIndex = 33;
-            switch4.Text = "switch4";
             // 
             // panel2
             // 
@@ -241,13 +132,123 @@
             button1.TabIndex = 23;
             button1.Text = "新增";
             // 
-            // button3
+            // label10
             // 
-            button3.Location = new Point(472, 101);
+            label10.Location = new Point(487, 70);
-            button3.Name = "button3";
+            label10.Name = "label10";
-            button3.Size = new Size(118, 34);
+            label10.Size = new Size(73, 23);
-            button3.TabIndex = 37;
+            label10.TabIndex = 34;
-            button3.Text = "查看文件夹";
+            label10.Text = "保存NG原图";
+            // 
+            // switch4
+            // 
+            switch4.Location = new Point(566, 70);
+            switch4.Name = "switch4";
+            switch4.Size = new Size(57, 23);
+            switch4.TabIndex = 33;
+            switch4.Text = "switch4";
+            // 
+            // label9
+            // 
+            label9.Location = new Point(333, 70);
+            label9.Name = "label9";
+            label9.Size = new Size(73, 23);
+            label9.TabIndex = 32;
+            label9.Text = "保存OK原图";
+            // 
+            // switch3
+            // 
+            switch3.Location = new Point(412, 70);
+            switch3.Name = "switch3";
+            switch3.Size = new Size(57, 23);
+            switch3.TabIndex = 31;
+            switch3.Text = "switch3";
+            // 
+            // label7
+            // 
+            label7.Location = new Point(179, 70);
+            label7.Name = "label7";
+            label7.Size = new Size(58, 23);
+            label7.TabIndex = 30;
+            label7.Text = "数据保存";
+            // 
+            // switch2
+            // 
+            switch2.Location = new Point(258, 70);
+            switch2.Name = "switch2";
+            switch2.Size = new Size(57, 23);
+            switch2.TabIndex = 29;
+            switch2.Text = "switch2";
+            // 
+            // label8
+            // 
+            label8.Location = new Point(17, 70);
+            label8.Name = "label8";
+            label8.Size = new Size(58, 23);
+            label8.TabIndex = 28;
+            label8.Text = "模型启用";
+            // 
+            // switch1
+            // 
+            switch1.Location = new Point(96, 70);
+            switch1.Name = "switch1";
+            switch1.Size = new Size(57, 23);
+            switch1.TabIndex = 27;
+            switch1.Text = "switch1";
+            // 
+            // textBox1
+            // 
+            textBox1.Location = new Point(96, 12);
+            textBox1.Name = "textBox1";
+            textBox1.Size = new Size(211, 23);
+            textBox1.TabIndex = 26;
+            // 
+            // label6
+            // 
+            label6.Location = new Point(17, 12);
+            label6.Name = "label6";
+            label6.Size = new Size(58, 23);
+            label6.TabIndex = 25;
+            label6.Text = "检测名称";
+            // 
+            // comboBox1
+            // 
+            comboBox1.FormattingEnabled = true;
+            comboBox1.Location = new Point(402, 10);
+            comboBox1.Name = "comboBox1";
+            comboBox1.Size = new Size(188, 25);
+            comboBox1.TabIndex = 24;
+            // 
+            // label5
+            // 
+            label5.Location = new Point(333, 12);
+            label5.Name = "label5";
+            label5.Size = new Size(73, 23);
+            label5.TabIndex = 23;
+            label5.Text = "目标类型";
+            // 
+            // btnPreOpen
+            // 
+            btnPreOpen.Location = new Point(613, 41);
+            btnPreOpen.Name = "btnPreOpen";
+            btnPreOpen.Size = new Size(46, 23);
+            btnPreOpen.TabIndex = 22;
+            btnPreOpen.Text = "...";
+            // 
+            // tbxPrePath
+            // 
+            tbxPrePath.Location = new Point(96, 41);
+            tbxPrePath.Name = "tbxPrePath";
+            tbxPrePath.Size = new Size(498, 23);
+            tbxPrePath.TabIndex = 17;
+            // 
+            // label1
+            // 
+            label1.Location = new Point(17, 41);
+            label1.Name = "label1";
+            label1.Size = new Size(73, 23);
+            label1.TabIndex = 9;
+            label1.Text = "模型路径";
             // 
             // DetectConfigControl
             // 

DHSoftware/Views/PreTreatUserControl.Designer.cs

@@ -32,19 +32,19 @@
             tbxPrePath = new TextBox();
             label1 = new AntdUI.Label();
             panel1 = new Panel();
-            table1 = new AntdUI.Table();
-            button1 = new AntdUI.Button();
-            button2 = new AntdUI.Button();
-            panel2 = new Panel();
-            label2 = new Label();
             panel3 = new Panel();
             label3 = new Label();
             button3 = new AntdUI.Button();
             table2 = new AntdUI.Table();
             button4 = new AntdUI.Button();
+            panel2 = new Panel();
+            label2 = new Label();
+            button2 = new AntdUI.Button();
+            table1 = new AntdUI.Table();
+            button1 = new AntdUI.Button();
             panel1.SuspendLayout();
-            panel2.SuspendLayout();
             panel3.SuspendLayout();
+            panel2.SuspendLayout();
             SuspendLayout();
             // 
             // btnPreOpen
@@ -72,6 +72,7 @@
             // 
             // panel1
             // 
+            panel1.BorderStyle = BorderStyle.FixedSingle;
             panel1.Controls.Add(panel3);
             panel1.Controls.Add(panel2);
             panel1.Controls.Add(label1);
@@ -83,50 +84,6 @@
             panel1.Size = new Size(759, 243);
             panel1.TabIndex = 22;
             // 
-            // table1
-            // 
-            table1.Location = new Point(3, 65);
-            table1.Name = "table1";
-            table1.Size = new Size(258, 126);
-            table1.TabIndex = 22;
-            table1.Text = "table1";
-            // 
-            // button1
-            // 
-            button1.Location = new Point(3, 25);
-            button1.Name = "button1";
-            button1.Size = new Size(84, 34);
-            button1.TabIndex = 23;
-            button1.Text = "新增";
-            // 
-            // button2
-            // 
-            button2.Location = new Point(93, 25);
-            button2.Name = "button2";
-            button2.Size = new Size(84, 34);
-            button2.TabIndex = 24;
-            button2.Text = "删除";
-            // 
-            // panel2
-            // 
-            panel2.Controls.Add(label2);
-            panel2.Controls.Add(button2);
-            panel2.Controls.Add(table1);
-            panel2.Controls.Add(button1);
-            panel2.Location = new Point(91, 46);
-            panel2.Name = "panel2";
-            panel2.Size = new Size(264, 194);
-            panel2.TabIndex = 25;
-            // 
-            // label2
-            // 
-            label2.AutoSize = true;
-            label2.Location = new Point(3, 5);
-            label2.Name = "label2";
-            label2.Size = new Size(56, 17);
-            label2.TabIndex = 25;
-            label2.Text = "输入参数";
-            // 
             // panel3
             // 
             panel3.Controls.Add(label3);
@@ -171,6 +128,50 @@
             button4.TabIndex = 23;
             button4.Text = "新增";
             // 
+            // panel2
+            // 
+            panel2.Controls.Add(label2);
+            panel2.Controls.Add(button2);
+            panel2.Controls.Add(table1);
+            panel2.Controls.Add(button1);
+            panel2.Location = new Point(91, 46);
+            panel2.Name = "panel2";
+            panel2.Size = new Size(264, 194);
+            panel2.TabIndex = 25;
+            // 
+            // label2
+            // 
+            label2.AutoSize = true;
+            label2.Location = new Point(3, 5);
+            label2.Name = "label2";
+            label2.Size = new Size(56, 17);
+            label2.TabIndex = 25;
+            label2.Text = "输入参数";
+            // 
+            // button2
+            // 
+            button2.Location = new Point(93, 25);
+            button2.Name = "button2";
+            button2.Size = new Size(84, 34);
+            button2.TabIndex = 24;
+            button2.Text = "删除";
+            // 
+            // table1
+            // 
+            table1.Location = new Point(3, 65);
+            table1.Name = "table1";
+            table1.Size = new Size(258, 126);
+            table1.TabIndex = 22;
+            table1.Text = "table1";
+            // 
+            // button1
+            // 
+            button1.Location = new Point(3, 25);
+            button1.Name = "button1";
+            button1.Size = new Size(84, 34);
+            button1.TabIndex = 23;
+            button1.Text = "新增";
+            // 
             // PreTreatUserControl
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
@@ -180,10 +181,10 @@
             Size = new Size(759, 243);
             panel1.ResumeLayout(false);
             panel1.PerformLayout();
-            panel2.ResumeLayout(false);
-            panel2.PerformLayout();
             panel3.ResumeLayout(false);
             panel3.PerformLayout();
+            panel2.ResumeLayout(false);
+            panel2.PerformLayout();
             ResumeLayout(false);
         }
 

DHSoftware/Views/SizeConfigControl.Designer.cs

@@ -84,9 +84,10 @@
             // 
             AutoScaleDimensions = new SizeF(7F, 17F);
             AutoScaleMode = AutoScaleMode.Font;
+            BorderStyle = BorderStyle.FixedSingle;
             Controls.Add(panel2);
             Name = "SizeConfigControl";
-            Size = new Size(785, 292);
+            Size = new Size(783, 290);
             panel2.ResumeLayout(false);
             panel2.PerformLayout();
             ResumeLayout(false);