diff --git a/ClientForWEDS/ClientForWEDS.csproj b/ClientForWEDS/ClientForWEDS.csproj index fedcb3a..2640ab0 100644 --- a/ClientForWEDS/ClientForWEDS.csproj +++ b/ClientForWEDS/ClientForWEDS.csproj @@ -11,7 +11,8 @@ ClientForWEDS ClientForWEDS v4.0 - Client + + 512 @@ -37,7 +38,8 @@ 2017.ico - + + False .\AxInterop.WEDS4_CommSV2.dll @@ -52,18 +54,41 @@ .\Interop.WEDS4_CommSV2.dll True - - - - - - - - - - + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + False + + + Tools_version.cs + Form @@ -71,6 +96,12 @@ Form1.cs + + Form + + + Form2.cs + @@ -78,6 +109,9 @@ Form1.cs Designer + + Form2.cs + ResXFileCodeGenerator Resources.Designer.cs @@ -86,7 +120,9 @@ True Resources.resx + True + SettingsSingleFileGenerator Settings.Designer.cs diff --git a/ClientForWEDS/ConfigUtil.cs b/ClientForWEDS/ConfigUtil.cs index 349a208..ecbfb48 100644 --- a/ClientForWEDS/ConfigUtil.cs +++ b/ClientForWEDS/ConfigUtil.cs @@ -18,6 +18,10 @@ namespace ClientForWEDS { IP6 = nutFile.AsString(ConfigItem.IP6, ""); IP7 = nutFile.AsString(ConfigItem.IP7, ""); IP8 = nutFile.AsString(ConfigItem.IP8, ""); + IP9 = nutFile.AsString(ConfigItem.IP9, ""); + IP10 = nutFile.AsString(ConfigItem.IP10, ""); + IP11 = nutFile.AsString(ConfigItem.IP11, ""); + IP12 = nutFile.AsString(ConfigItem.IP12, ""); Port = nutFile.AsString(ConfigItem.Port, "3350"); Timeout = nutFile.AsString(ConfigItem.Timeout, "8000"); ValidateType = nutFile.AsString(ConfigItem.ValidateType, "no"); @@ -36,6 +40,10 @@ namespace ClientForWEDS { public static string IP6; public static string IP7; public static string IP8; + public static string IP9; + public static string IP10; + public static string IP11; + public static string IP12; public static string Port; public static string Timeout; public static string ValidateType; @@ -54,6 +62,10 @@ namespace ClientForWEDS { public const string IP6 = "IP6"; public const string IP7 = "IP7"; public const string IP8 = "IP8"; + public const string IP9 = "IP9"; + public const string IP10 = "IP10"; + public const string IP11 = "IP11"; + public const string IP12 = "IP12"; public const string Port = "Port"; public const string Timeout = "Timeout"; diff --git a/ClientForWEDS/Form1.Designer.cs b/ClientForWEDS/Form1.Designer.cs index d65e3d4..bb16d19 100644 --- a/ClientForWEDS/Form1.Designer.cs +++ b/ClientForWEDS/Form1.Designer.cs @@ -32,6 +32,35 @@ this.panel1 = new System.Windows.Forms.Panel(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tpConnection = new System.Windows.Forms.TabPage(); + this.panel2 = new System.Windows.Forms.Panel(); + this.txtIP12 = new System.Windows.Forms.TextBox(); + this.label18 = new System.Windows.Forms.Label(); + this.txtIP11 = new System.Windows.Forms.TextBox(); + this.label17 = new System.Windows.Forms.Label(); + this.txtIP10 = new System.Windows.Forms.TextBox(); + this.label16 = new System.Windows.Forms.Label(); + this.txtIP9 = new System.Windows.Forms.TextBox(); + this.label15 = new System.Windows.Forms.Label(); + this.txtIP8 = new System.Windows.Forms.TextBox(); + this.label13 = new System.Windows.Forms.Label(); + this.txtIP7 = new System.Windows.Forms.TextBox(); + this.label12 = new System.Windows.Forms.Label(); + this.txtIP6 = new System.Windows.Forms.TextBox(); + this.label11 = new System.Windows.Forms.Label(); + this.txtIP5 = new System.Windows.Forms.TextBox(); + this.label10 = new System.Windows.Forms.Label(); + this.txtIP4 = new System.Windows.Forms.TextBox(); + this.label9 = new System.Windows.Forms.Label(); + this.txtIP3 = new System.Windows.Forms.TextBox(); + this.label1 = new System.Windows.Forms.Label(); + this.txtTimeout = new System.Windows.Forms.TextBox(); + this.lblConnTimeout = new System.Windows.Forms.Label(); + this.txtIP2 = new System.Windows.Forms.TextBox(); + this.nudPort = new System.Windows.Forms.NumericUpDown(); + this.lblConnPort = new System.Windows.Forms.Label(); + this.txtIP = new System.Windows.Forms.TextBox(); + this.label2 = new System.Windows.Forms.Label(); + this.label14 = new System.Windows.Forms.Label(); this.passTextBox = new System.Windows.Forms.TextBox(); this.userTextBox = new System.Windows.Forms.TextBox(); this.erpTextBox = new System.Windows.Forms.TextBox(); @@ -46,29 +75,9 @@ this.rbPassValidate = new System.Windows.Forms.RadioButton(); this.rbNoValidate = new System.Windows.Forms.RadioButton(); this.lblValidateString = new System.Windows.Forms.Label(); - this.txtTimeout = new System.Windows.Forms.TextBox(); - this.nudPort = new System.Windows.Forms.NumericUpDown(); - this.lblConnTimeout = new System.Windows.Forms.Label(); - this.lblConnPort = new System.Windows.Forms.Label(); - this.label11 = new System.Windows.Forms.Label(); - this.label13 = new System.Windows.Forms.Label(); - this.label10 = new System.Windows.Forms.Label(); - this.label12 = new System.Windows.Forms.Label(); - this.label9 = new System.Windows.Forms.Label(); - this.label2 = new System.Windows.Forms.Label(); - this.txtIP6 = new System.Windows.Forms.TextBox(); - this.txtIP8 = new System.Windows.Forms.TextBox(); - this.txtIP5 = new System.Windows.Forms.TextBox(); - this.txtIP7 = new System.Windows.Forms.TextBox(); - this.txtIP4 = new System.Windows.Forms.TextBox(); - this.txtIP3 = new System.Windows.Forms.TextBox(); this.label6 = new System.Windows.Forms.Label(); - this.label1 = new System.Windows.Forms.Label(); this.label5 = new System.Windows.Forms.Label(); - this.txtIP2 = new System.Windows.Forms.TextBox(); this.label4 = new System.Windows.Forms.Label(); - this.lblConnIP = new System.Windows.Forms.Label(); - this.txtIP = new System.Windows.Forms.TextBox(); this.lblLinkParameter = new System.Windows.Forms.Label(); this.cbLineMd = new System.Windows.Forms.ComboBox(); this.lblLinkModel = new System.Windows.Forms.Label(); @@ -123,10 +132,12 @@ this.lblZdLinkStateInfo = new System.Windows.Forms.Label(); this.saveFileDialogRecive = new System.Windows.Forms.SaveFileDialog(); this.openFileDialogDangAn = new System.Windows.Forms.OpenFileDialog(); + this.label19 = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.axW4commsv21)).BeginInit(); this.panel1.SuspendLayout(); this.tabControl1.SuspendLayout(); this.tpConnection.SuspendLayout(); + this.panel2.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudPort)).BeginInit(); this.tpReciveFile.SuspendLayout(); this.tpSendFile.SuspendLayout(); @@ -137,9 +148,10 @@ // this.axW4commsv21.Enabled = true; this.axW4commsv21.Location = new System.Drawing.Point(2, 6); + this.axW4commsv21.Margin = new System.Windows.Forms.Padding(4); this.axW4commsv21.Name = "axW4commsv21"; this.axW4commsv21.OcxState = ((System.Windows.Forms.AxHost.State)(resources.GetObject("axW4commsv21.OcxState"))); - this.axW4commsv21.Size = new System.Drawing.Size(167, 26); + this.axW4commsv21.Size = new System.Drawing.Size(209, 33); this.axW4commsv21.TabIndex = 0; this.axW4commsv21.InfoZdEvent += new AxWEDS4_CommSV2.@__W4commsv2_InfoZdEventHandler(this.axW4commsv21_InfoZdEvent); this.axW4commsv21.OnEvent += new System.EventHandler(this.axW4commsv21_OnEvent); @@ -147,18 +159,20 @@ // // btntpConn // - this.btntpConn.Location = new System.Drawing.Point(2, 35); + this.btntpConn.Location = new System.Drawing.Point(3, 44); + this.btntpConn.Margin = new System.Windows.Forms.Padding(4); this.btntpConn.Name = "btntpConn"; - this.btntpConn.Size = new System.Drawing.Size(167, 45); + this.btntpConn.Size = new System.Drawing.Size(223, 56); this.btntpConn.TabIndex = 9; this.btntpConn.Text = "基础设置"; this.btntpConn.UseVisualStyleBackColor = true; // // btntpRecive // - this.btntpRecive.Location = new System.Drawing.Point(2, 86); + this.btntpRecive.Location = new System.Drawing.Point(3, 108); + this.btntpRecive.Margin = new System.Windows.Forms.Padding(4); this.btntpRecive.Name = "btntpRecive"; - this.btntpRecive.Size = new System.Drawing.Size(167, 45); + this.btntpRecive.Size = new System.Drawing.Size(223, 56); this.btntpRecive.TabIndex = 10; this.btntpRecive.Text = "采集考勤到PC"; this.btntpRecive.UseVisualStyleBackColor = true; @@ -166,9 +180,10 @@ // panel1 // this.panel1.Controls.Add(this.tabControl1); - this.panel1.Location = new System.Drawing.Point(175, 3); + this.panel1.Location = new System.Drawing.Point(233, 4); + this.panel1.Margin = new System.Windows.Forms.Padding(4); this.panel1.Name = "panel1"; - this.panel1.Size = new System.Drawing.Size(454, 539); + this.panel1.Size = new System.Drawing.Size(605, 674); this.panel1.TabIndex = 11; // // tabControl1 @@ -178,15 +193,17 @@ this.tabControl1.Controls.Add(this.tpReciveFile); this.tabControl1.Controls.Add(this.tpSendFile); this.tabControl1.Controls.Add(this.tpReciveFromAny); - this.tabControl1.Location = new System.Drawing.Point(3, 3); + this.tabControl1.Location = new System.Drawing.Point(4, 4); + this.tabControl1.Margin = new System.Windows.Forms.Padding(4); this.tabControl1.Multiline = true; this.tabControl1.Name = "tabControl1"; this.tabControl1.SelectedIndex = 0; - this.tabControl1.Size = new System.Drawing.Size(451, 557); + this.tabControl1.Size = new System.Drawing.Size(601, 696); this.tabControl1.TabIndex = 1; // // tpConnection // + this.tpConnection.Controls.Add(this.panel2); this.tpConnection.Controls.Add(this.passTextBox); this.tpConnection.Controls.Add(this.userTextBox); this.tpConnection.Controls.Add(this.erpTextBox); @@ -201,77 +218,372 @@ this.tpConnection.Controls.Add(this.rbPassValidate); this.tpConnection.Controls.Add(this.rbNoValidate); this.tpConnection.Controls.Add(this.lblValidateString); - this.tpConnection.Controls.Add(this.txtTimeout); - this.tpConnection.Controls.Add(this.nudPort); - this.tpConnection.Controls.Add(this.lblConnTimeout); - this.tpConnection.Controls.Add(this.lblConnPort); - this.tpConnection.Controls.Add(this.label11); - this.tpConnection.Controls.Add(this.label13); - this.tpConnection.Controls.Add(this.label10); - this.tpConnection.Controls.Add(this.label12); - this.tpConnection.Controls.Add(this.label9); - this.tpConnection.Controls.Add(this.label2); - this.tpConnection.Controls.Add(this.txtIP6); - this.tpConnection.Controls.Add(this.txtIP8); - this.tpConnection.Controls.Add(this.txtIP5); - this.tpConnection.Controls.Add(this.txtIP7); - this.tpConnection.Controls.Add(this.txtIP4); - this.tpConnection.Controls.Add(this.txtIP3); this.tpConnection.Controls.Add(this.label6); - this.tpConnection.Controls.Add(this.label1); this.tpConnection.Controls.Add(this.label5); - this.tpConnection.Controls.Add(this.txtIP2); this.tpConnection.Controls.Add(this.label4); - this.tpConnection.Controls.Add(this.lblConnIP); - this.tpConnection.Controls.Add(this.txtIP); this.tpConnection.Controls.Add(this.lblLinkParameter); this.tpConnection.Controls.Add(this.cbLineMd); this.tpConnection.Controls.Add(this.lblLinkModel); this.tpConnection.Location = new System.Drawing.Point(4, 4); + this.tpConnection.Margin = new System.Windows.Forms.Padding(4); this.tpConnection.Name = "tpConnection"; - this.tpConnection.Padding = new System.Windows.Forms.Padding(3); - this.tpConnection.Size = new System.Drawing.Size(443, 531); + this.tpConnection.Padding = new System.Windows.Forms.Padding(4); + this.tpConnection.Size = new System.Drawing.Size(593, 667); this.tpConnection.TabIndex = 0; this.tpConnection.Text = "终端连接/断开"; this.tpConnection.UseVisualStyleBackColor = true; // + // panel2 + // + this.panel2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.panel2.AutoScroll = true; + this.panel2.AutoScrollMinSize = new System.Drawing.Size(100, 200); + this.panel2.Controls.Add(this.label19); + this.panel2.Controls.Add(this.txtIP12); + this.panel2.Controls.Add(this.label18); + this.panel2.Controls.Add(this.txtIP11); + this.panel2.Controls.Add(this.label17); + this.panel2.Controls.Add(this.txtIP10); + this.panel2.Controls.Add(this.label16); + this.panel2.Controls.Add(this.txtIP9); + this.panel2.Controls.Add(this.label15); + this.panel2.Controls.Add(this.txtIP8); + this.panel2.Controls.Add(this.label13); + this.panel2.Controls.Add(this.txtIP7); + this.panel2.Controls.Add(this.label12); + this.panel2.Controls.Add(this.txtIP6); + this.panel2.Controls.Add(this.label11); + this.panel2.Controls.Add(this.txtIP5); + this.panel2.Controls.Add(this.label10); + this.panel2.Controls.Add(this.txtIP4); + this.panel2.Controls.Add(this.label9); + this.panel2.Controls.Add(this.txtIP3); + this.panel2.Controls.Add(this.label1); + this.panel2.Controls.Add(this.txtTimeout); + this.panel2.Controls.Add(this.lblConnTimeout); + this.panel2.Controls.Add(this.txtIP2); + this.panel2.Controls.Add(this.nudPort); + this.panel2.Controls.Add(this.lblConnPort); + this.panel2.Controls.Add(this.txtIP); + this.panel2.Controls.Add(this.label2); + this.panel2.Controls.Add(this.label14); + this.panel2.Location = new System.Drawing.Point(0, 74); + this.panel2.Name = "panel2"; + this.panel2.Size = new System.Drawing.Size(586, 216); + this.panel2.TabIndex = 32; + // + // txtIP12 + // + this.txtIP12.Location = new System.Drawing.Point(387, 218); + this.txtIP12.Margin = new System.Windows.Forms.Padding(4); + this.txtIP12.Name = "txtIP12"; + this.txtIP12.Size = new System.Drawing.Size(159, 25); + this.txtIP12.TabIndex = 33; + // + // label18 + // + this.label18.Location = new System.Drawing.Point(282, 221); + this.label18.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(86, 18); + this.label18.TabIndex = 32; + this.label18.Text = "IP地址12:"; + this.label18.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP11 + // + this.txtIP11.Location = new System.Drawing.Point(117, 218); + this.txtIP11.Margin = new System.Windows.Forms.Padding(4); + this.txtIP11.Name = "txtIP11"; + this.txtIP11.Size = new System.Drawing.Size(158, 25); + this.txtIP11.TabIndex = 31; + // + // label17 + // + this.label17.Location = new System.Drawing.Point(10, 218); + this.label17.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(0, 0); + this.label17.TabIndex = 30; + this.label17.Text = "IP地址11:"; + this.label17.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP10 + // + this.txtIP10.Location = new System.Drawing.Point(387, 183); + this.txtIP10.Margin = new System.Windows.Forms.Padding(4); + this.txtIP10.Name = "txtIP10"; + this.txtIP10.Size = new System.Drawing.Size(159, 25); + this.txtIP10.TabIndex = 29; + // + // label16 + // + this.label16.Location = new System.Drawing.Point(282, 186); + this.label16.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label16.Name = "label16"; + this.label16.Size = new System.Drawing.Size(86, 18); + this.label16.TabIndex = 28; + this.label16.Text = "IP地址10:"; + this.label16.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP9 + // + this.txtIP9.Location = new System.Drawing.Point(116, 183); + this.txtIP9.Margin = new System.Windows.Forms.Padding(4); + this.txtIP9.Name = "txtIP9"; + this.txtIP9.Size = new System.Drawing.Size(158, 25); + this.txtIP9.TabIndex = 27; + // + // label15 + // + this.label15.Location = new System.Drawing.Point(10, 190); + this.label15.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label15.Name = "label15"; + this.label15.Size = new System.Drawing.Size(77, 18); + this.label15.TabIndex = 26; + this.label15.Text = "IP地址9:"; + this.label15.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP8 + // + this.txtIP8.Location = new System.Drawing.Point(387, 148); + this.txtIP8.Margin = new System.Windows.Forms.Padding(4); + this.txtIP8.Name = "txtIP8"; + this.txtIP8.Size = new System.Drawing.Size(159, 25); + this.txtIP8.TabIndex = 25; + // + // label13 + // + this.label13.Location = new System.Drawing.Point(291, 151); + this.label13.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label13.Name = "label13"; + this.label13.Size = new System.Drawing.Size(77, 18); + this.label13.TabIndex = 24; + this.label13.Text = "IP地址8:"; + this.label13.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP7 + // + this.txtIP7.Location = new System.Drawing.Point(116, 148); + this.txtIP7.Margin = new System.Windows.Forms.Padding(4); + this.txtIP7.Name = "txtIP7"; + this.txtIP7.Size = new System.Drawing.Size(158, 25); + this.txtIP7.TabIndex = 23; + // + // label12 + // + this.label12.Location = new System.Drawing.Point(10, 155); + this.label12.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label12.Name = "label12"; + this.label12.Size = new System.Drawing.Size(77, 18); + this.label12.TabIndex = 22; + this.label12.Text = "IP地址7:"; + this.label12.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP6 + // + this.txtIP6.Location = new System.Drawing.Point(387, 113); + this.txtIP6.Margin = new System.Windows.Forms.Padding(4); + this.txtIP6.Name = "txtIP6"; + this.txtIP6.Size = new System.Drawing.Size(159, 25); + this.txtIP6.TabIndex = 21; + // + // label11 + // + this.label11.Location = new System.Drawing.Point(291, 116); + this.label11.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label11.Name = "label11"; + this.label11.Size = new System.Drawing.Size(77, 21); + this.label11.TabIndex = 20; + this.label11.Text = "IP地址6:"; + this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP5 + // + this.txtIP5.Location = new System.Drawing.Point(116, 113); + this.txtIP5.Margin = new System.Windows.Forms.Padding(4); + this.txtIP5.Name = "txtIP5"; + this.txtIP5.Size = new System.Drawing.Size(158, 25); + this.txtIP5.TabIndex = 19; + // + // label10 + // + this.label10.Location = new System.Drawing.Point(10, 120); + this.label10.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label10.Name = "label10"; + this.label10.Size = new System.Drawing.Size(77, 18); + this.label10.TabIndex = 18; + this.label10.Text = "IP地址5:"; + this.label10.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP4 + // + this.txtIP4.Location = new System.Drawing.Point(387, 78); + this.txtIP4.Margin = new System.Windows.Forms.Padding(4); + this.txtIP4.Name = "txtIP4"; + this.txtIP4.Size = new System.Drawing.Size(159, 25); + this.txtIP4.TabIndex = 17; + // + // label9 + // + this.label9.Location = new System.Drawing.Point(291, 85); + this.label9.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label9.Name = "label9"; + this.label9.Size = new System.Drawing.Size(77, 18); + this.label9.TabIndex = 16; + this.label9.Text = "IP地址4:"; + this.label9.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP3 + // + this.txtIP3.Location = new System.Drawing.Point(116, 78); + this.txtIP3.Margin = new System.Windows.Forms.Padding(4); + this.txtIP3.Name = "txtIP3"; + this.txtIP3.Size = new System.Drawing.Size(158, 25); + this.txtIP3.TabIndex = 15; + // + // label1 + // + this.label1.Location = new System.Drawing.Point(10, 85); + this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(77, 18); + this.label1.TabIndex = 14; + this.label1.Text = "IP地址3:"; + this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtTimeout + // + this.txtTimeout.Location = new System.Drawing.Point(388, 43); + this.txtTimeout.Margin = new System.Windows.Forms.Padding(4); + this.txtTimeout.Name = "txtTimeout"; + this.txtTimeout.Size = new System.Drawing.Size(159, 25); + this.txtTimeout.TabIndex = 13; + this.txtTimeout.Text = "8000"; + // + // lblConnTimeout + // + this.lblConnTimeout.Location = new System.Drawing.Point(293, 53); + this.lblConnTimeout.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblConnTimeout.Name = "lblConnTimeout"; + this.lblConnTimeout.Size = new System.Drawing.Size(80, 15); + this.lblConnTimeout.TabIndex = 12; + this.lblConnTimeout.Text = "超时时间:"; + this.lblConnTimeout.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP2 + // + this.txtIP2.Location = new System.Drawing.Point(116, 43); + this.txtIP2.Margin = new System.Windows.Forms.Padding(4); + this.txtIP2.Name = "txtIP2"; + this.txtIP2.Size = new System.Drawing.Size(158, 25); + this.txtIP2.TabIndex = 11; + // + // nudPort + // + this.nudPort.Location = new System.Drawing.Point(387, 8); + this.nudPort.Margin = new System.Windows.Forms.Padding(4); + this.nudPort.Maximum = new decimal(new int[] { + 65535, + 0, + 0, + 0}); + this.nudPort.Minimum = new decimal(new int[] { + 1, + 0, + 0, + 0}); + this.nudPort.Name = "nudPort"; + this.nudPort.Size = new System.Drawing.Size(160, 25); + this.nudPort.TabIndex = 10; + this.nudPort.Value = new decimal(new int[] { + 3350, + 0, + 0, + 0}); + // + // lblConnPort + // + this.lblConnPort.Location = new System.Drawing.Point(283, 18); + this.lblConnPort.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.lblConnPort.Name = "lblConnPort"; + this.lblConnPort.Size = new System.Drawing.Size(85, 15); + this.lblConnPort.TabIndex = 9; + this.lblConnPort.Text = "端 口 号:"; + this.lblConnPort.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // txtIP + // + this.txtIP.Location = new System.Drawing.Point(117, 8); + this.txtIP.Margin = new System.Windows.Forms.Padding(4); + this.txtIP.Name = "txtIP"; + this.txtIP.Size = new System.Drawing.Size(158, 25); + this.txtIP.TabIndex = 8; + this.txtIP.Text = "192.168.1.101"; + // + // label2 + // + this.label2.Location = new System.Drawing.Point(10, 50); + this.label2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(77, 18); + this.label2.TabIndex = 7; + this.label2.Text = "IP地址2:"; + this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // label14 + // + this.label14.Location = new System.Drawing.Point(10, 15); + this.label14.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label14.Name = "label14"; + this.label14.Size = new System.Drawing.Size(77, 18); + this.label14.TabIndex = 6; + this.label14.Text = "IP地址1:"; + this.label14.TextAlign = System.Drawing.ContentAlignment.TopRight; + // // passTextBox // - this.passTextBox.Location = new System.Drawing.Point(248, 433); + this.passTextBox.Location = new System.Drawing.Point(331, 541); + this.passTextBox.Margin = new System.Windows.Forms.Padding(4); this.passTextBox.Name = "passTextBox"; - this.passTextBox.Size = new System.Drawing.Size(84, 21); + this.passTextBox.Size = new System.Drawing.Size(111, 25); this.passTextBox.TabIndex = 31; this.passTextBox.UseSystemPasswordChar = true; // // userTextBox // - this.userTextBox.Location = new System.Drawing.Point(70, 433); + this.userTextBox.Location = new System.Drawing.Point(93, 541); + this.userTextBox.Margin = new System.Windows.Forms.Padding(4); this.userTextBox.Name = "userTextBox"; - this.userTextBox.Size = new System.Drawing.Size(84, 21); + this.userTextBox.Size = new System.Drawing.Size(111, 25); this.userTextBox.TabIndex = 31; // // erpTextBox // - this.erpTextBox.Location = new System.Drawing.Point(70, 411); + this.erpTextBox.Location = new System.Drawing.Point(93, 514); + this.erpTextBox.Margin = new System.Windows.Forms.Padding(4); this.erpTextBox.Name = "erpTextBox"; - this.erpTextBox.Size = new System.Drawing.Size(262, 21); + this.erpTextBox.Size = new System.Drawing.Size(348, 25); this.erpTextBox.TabIndex = 31; this.erpTextBox.Text = "http://"; // // txtReciveZDPath // - this.txtReciveZDPath.Location = new System.Drawing.Point(70, 360); + this.txtReciveZDPath.Location = new System.Drawing.Point(93, 450); + this.txtReciveZDPath.Margin = new System.Windows.Forms.Padding(4); this.txtReciveZDPath.Name = "txtReciveZDPath"; - this.txtReciveZDPath.Size = new System.Drawing.Size(262, 21); + this.txtReciveZDPath.Size = new System.Drawing.Size(348, 25); this.txtReciveZDPath.TabIndex = 30; this.txtReciveZDPath.Text = "\\\\updata\\wdjl.wds"; // // lblRSvFilePath // this.lblRSvFilePath.AutoSize = true; - this.lblRSvFilePath.Location = new System.Drawing.Point(6, 387); + this.lblRSvFilePath.Location = new System.Drawing.Point(8, 484); + this.lblRSvFilePath.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRSvFilePath.Name = "lblRSvFilePath"; - this.lblRSvFilePath.Size = new System.Drawing.Size(65, 12); + this.lblRSvFilePath.Size = new System.Drawing.Size(85, 15); this.lblRSvFilePath.TabIndex = 28; this.lblRSvFilePath.Text = "5.ERP系统:\r\n"; this.lblRSvFilePath.Visible = false; @@ -279,18 +591,20 @@ // lblRZdFilePath // this.lblRZdFilePath.AutoSize = true; - this.lblRZdFilePath.Location = new System.Drawing.Point(6, 328); + this.lblRZdFilePath.Location = new System.Drawing.Point(8, 410); + this.lblRZdFilePath.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRZdFilePath.Name = "lblRZdFilePath"; - this.lblRZdFilePath.Size = new System.Drawing.Size(239, 12); + this.lblRZdFilePath.Size = new System.Drawing.Size(301, 15); this.lblRZdFilePath.TabIndex = 27; this.lblRZdFilePath.Text = "4.终端文件路径（一般为默认值不用修改）:"; // // btnDisconnection // this.btnDisconnection.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnDisconnection.Location = new System.Drawing.Point(253, 475); + this.btnDisconnection.Location = new System.Drawing.Point(337, 594); + this.btnDisconnection.Margin = new System.Windows.Forms.Padding(4); this.btnDisconnection.Name = "btnDisconnection"; - this.btnDisconnection.Size = new System.Drawing.Size(75, 23); + this.btnDisconnection.Size = new System.Drawing.Size(100, 29); this.btnDisconnection.TabIndex = 26; this.btnDisconnection.Text = "断开连接"; this.btnDisconnection.UseVisualStyleBackColor = true; @@ -299,9 +613,10 @@ // btnConnection // this.btnConnection.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.btnConnection.Location = new System.Drawing.Point(170, 475); + this.btnConnection.Location = new System.Drawing.Point(227, 594); + this.btnConnection.Margin = new System.Windows.Forms.Padding(4); this.btnConnection.Name = "btnConnection"; - this.btnConnection.Size = new System.Drawing.Size(75, 23); + this.btnConnection.Size = new System.Drawing.Size(100, 29); this.btnConnection.TabIndex = 26; this.btnConnection.Text = "测试连接"; this.btnConnection.UseVisualStyleBackColor = true; @@ -310,9 +625,10 @@ // saveBt // this.saveBt.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.saveBt.Location = new System.Drawing.Point(80, 475); + this.saveBt.Location = new System.Drawing.Point(107, 594); + this.saveBt.Margin = new System.Windows.Forms.Padding(4); this.saveBt.Name = "saveBt"; - this.saveBt.Size = new System.Drawing.Size(75, 23); + this.saveBt.Size = new System.Drawing.Size(100, 29); this.saveBt.TabIndex = 24; this.saveBt.Text = "保存"; this.saveBt.UseVisualStyleBackColor = true; @@ -320,19 +636,21 @@ // // txtValidate // - this.txtValidate.Location = new System.Drawing.Point(231, 252); + this.txtValidate.Location = new System.Drawing.Point(308, 315); + this.txtValidate.Margin = new System.Windows.Forms.Padding(4); this.txtValidate.Multiline = true; this.txtValidate.Name = "txtValidate"; - this.txtValidate.Size = new System.Drawing.Size(147, 65); + this.txtValidate.Size = new System.Drawing.Size(195, 80); this.txtValidate.TabIndex = 23; this.txtValidate.Text = "id=\r\ncard=\r\npassword=\r\nline="; // // rbAdminValidate // this.rbAdminValidate.AutoSize = true; - this.rbAdminValidate.Location = new System.Drawing.Point(129, 296); + this.rbAdminValidate.Location = new System.Drawing.Point(172, 370); + this.rbAdminValidate.Margin = new System.Windows.Forms.Padding(4); this.rbAdminValidate.Name = "rbAdminValidate"; - this.rbAdminValidate.Size = new System.Drawing.Size(83, 16); + this.rbAdminValidate.Size = new System.Drawing.Size(103, 19); this.rbAdminValidate.TabIndex = 22; this.rbAdminValidate.TabStop = true; this.rbAdminValidate.Text = "管理员验证"; @@ -342,9 +660,10 @@ // rbPassValidate // this.rbPassValidate.AutoSize = true; - this.rbPassValidate.Location = new System.Drawing.Point(129, 275); + this.rbPassValidate.Location = new System.Drawing.Point(172, 344); + this.rbPassValidate.Margin = new System.Windows.Forms.Padding(4); this.rbPassValidate.Name = "rbPassValidate"; - this.rbPassValidate.Size = new System.Drawing.Size(71, 16); + this.rbPassValidate.Size = new System.Drawing.Size(88, 19); this.rbPassValidate.TabIndex = 21; this.rbPassValidate.TabStop = true; this.rbPassValidate.Text = "密码验证"; @@ -354,9 +673,10 @@ // rbNoValidate // this.rbNoValidate.AutoSize = true; - this.rbNoValidate.Location = new System.Drawing.Point(129, 253); + this.rbNoValidate.Location = new System.Drawing.Point(172, 316); + this.rbNoValidate.Margin = new System.Windows.Forms.Padding(4); this.rbNoValidate.Name = "rbNoValidate"; - this.rbNoValidate.Size = new System.Drawing.Size(59, 16); + this.rbNoValidate.Size = new System.Drawing.Size(73, 19); this.rbNoValidate.TabIndex = 20; this.rbNoValidate.TabStop = true; this.rbNoValidate.Text = "不验证"; @@ -366,222 +686,50 @@ // lblValidateString // this.lblValidateString.AutoSize = true; - this.lblValidateString.Location = new System.Drawing.Point(6, 252); + this.lblValidateString.Location = new System.Drawing.Point(8, 315); + this.lblValidateString.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblValidateString.Name = "lblValidateString"; - this.lblValidateString.Size = new System.Drawing.Size(95, 12); + this.lblValidateString.Size = new System.Drawing.Size(121, 15); this.lblValidateString.TabIndex = 19; this.lblValidateString.Text = "3.连接验证字串:\r\n"; // - // txtTimeout - // - this.txtTimeout.Location = new System.Drawing.Point(299, 109); - this.txtTimeout.Name = "txtTimeout"; - this.txtTimeout.Size = new System.Drawing.Size(120, 21); - this.txtTimeout.TabIndex = 8; - this.txtTimeout.Text = "8000"; - // - // nudPort - // - this.nudPort.Location = new System.Drawing.Point(299, 72); - this.nudPort.Maximum = new decimal(new int[] { - 65535, - 0, - 0, - 0}); - this.nudPort.Minimum = new decimal(new int[] { - 1, - 0, - 0, - 0}); - this.nudPort.Name = "nudPort"; - this.nudPort.Size = new System.Drawing.Size(120, 21); - this.nudPort.TabIndex = 7; - this.nudPort.Value = new decimal(new int[] { - 3350, - 0, - 0, - 0}); - // - // lblConnTimeout - // - this.lblConnTimeout.Location = new System.Drawing.Point(233, 112); - this.lblConnTimeout.Name = "lblConnTimeout"; - this.lblConnTimeout.Size = new System.Drawing.Size(60, 12); - this.lblConnTimeout.TabIndex = 6; - this.lblConnTimeout.Text = "超时时间:"; - this.lblConnTimeout.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // lblConnPort - // - this.lblConnPort.Location = new System.Drawing.Point(229, 75); - this.lblConnPort.Name = "lblConnPort"; - this.lblConnPort.Size = new System.Drawing.Size(64, 12); - this.lblConnPort.TabIndex = 5; - this.lblConnPort.Text = "端 口 号:"; - this.lblConnPort.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label11 - // - this.label11.Location = new System.Drawing.Point(235, 150); - this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(58, 17); - this.label11.TabIndex = 4; - this.label11.Text = "IP地址6:"; - this.label11.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label13 - // - this.label13.Location = new System.Drawing.Point(235, 223); - this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(58, 14); - this.label13.TabIndex = 4; - this.label13.Text = "IP地址8:"; - this.label13.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label10 - // - this.label10.Location = new System.Drawing.Point(43, 223); - this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(58, 14); - this.label10.TabIndex = 4; - this.label10.Text = "IP地址5:"; - this.label10.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label12 - // - this.label12.Location = new System.Drawing.Point(235, 188); - this.label12.Name = "label12"; - this.label12.Size = new System.Drawing.Size(58, 14); - this.label12.TabIndex = 4; - this.label12.Text = "IP地址7:"; - this.label12.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label9 - // - this.label9.Location = new System.Drawing.Point(43, 188); - this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(58, 14); - this.label9.TabIndex = 4; - this.label9.Text = "IP地址4:"; - this.label9.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // label2 - // - this.label2.Location = new System.Drawing.Point(43, 150); - this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(58, 14); - this.label2.TabIndex = 4; - this.label2.Text = "IP地址3:"; - this.label2.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // txtIP6 - // - this.txtIP6.Location = new System.Drawing.Point(299, 147); - this.txtIP6.Name = "txtIP6"; - this.txtIP6.Size = new System.Drawing.Size(120, 21); - this.txtIP6.TabIndex = 5; - // - // txtIP8 - // - this.txtIP8.Location = new System.Drawing.Point(299, 220); - this.txtIP8.Name = "txtIP8"; - this.txtIP8.Size = new System.Drawing.Size(120, 21); - this.txtIP8.TabIndex = 5; - // - // txtIP5 - // - this.txtIP5.Location = new System.Drawing.Point(107, 220); - this.txtIP5.Name = "txtIP5"; - this.txtIP5.Size = new System.Drawing.Size(120, 21); - this.txtIP5.TabIndex = 5; - // - // txtIP7 - // - this.txtIP7.Location = new System.Drawing.Point(299, 185); - this.txtIP7.Name = "txtIP7"; - this.txtIP7.Size = new System.Drawing.Size(120, 21); - this.txtIP7.TabIndex = 5; - // - // txtIP4 - // - this.txtIP4.Location = new System.Drawing.Point(107, 185); - this.txtIP4.Name = "txtIP4"; - this.txtIP4.Size = new System.Drawing.Size(120, 21); - this.txtIP4.TabIndex = 5; - // - // txtIP3 - // - this.txtIP3.Location = new System.Drawing.Point(107, 147); - this.txtIP3.Name = "txtIP3"; - this.txtIP3.Size = new System.Drawing.Size(120, 21); - this.txtIP3.TabIndex = 5; - // // label6 // - this.label6.Location = new System.Drawing.Point(201, 436); + this.label6.Location = new System.Drawing.Point(268, 545); + this.label6.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(41, 14); + this.label6.Size = new System.Drawing.Size(55, 18); this.label6.TabIndex = 4; this.label6.Text = "密码:"; this.label6.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // label1 - // - this.label1.Location = new System.Drawing.Point(43, 112); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(58, 14); - this.label1.TabIndex = 4; - this.label1.Text = "IP地址2:"; - this.label1.TextAlign = System.Drawing.ContentAlignment.TopRight; - // // label5 // - this.label5.Location = new System.Drawing.Point(23, 436); + this.label5.Location = new System.Drawing.Point(31, 545); + this.label5.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(41, 14); + this.label5.Size = new System.Drawing.Size(55, 18); this.label5.TabIndex = 4; this.label5.Text = "用户:"; this.label5.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // txtIP2 - // - this.txtIP2.Location = new System.Drawing.Point(107, 109); - this.txtIP2.Name = "txtIP2"; - this.txtIP2.Size = new System.Drawing.Size(120, 21); - this.txtIP2.TabIndex = 4; - // // label4 // - this.label4.Location = new System.Drawing.Point(23, 414); + this.label4.Location = new System.Drawing.Point(31, 518); + this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(41, 14); + this.label4.Size = new System.Drawing.Size(55, 18); this.label4.TabIndex = 4; this.label4.Text = "地址:"; this.label4.TextAlign = System.Drawing.ContentAlignment.TopRight; // - // lblConnIP - // - this.lblConnIP.Location = new System.Drawing.Point(43, 75); - this.lblConnIP.Name = "lblConnIP"; - this.lblConnIP.Size = new System.Drawing.Size(58, 14); - this.lblConnIP.TabIndex = 4; - this.lblConnIP.Text = "IP地址1:"; - this.lblConnIP.TextAlign = System.Drawing.ContentAlignment.TopRight; - // - // txtIP - // - this.txtIP.Location = new System.Drawing.Point(107, 71); - this.txtIP.Name = "txtIP"; - this.txtIP.Size = new System.Drawing.Size(120, 21); - this.txtIP.TabIndex = 3; - this.txtIP.Text = "192.168.1.101"; - // // lblLinkParameter // this.lblLinkParameter.AutoSize = true; - this.lblLinkParameter.Location = new System.Drawing.Point(6, 45); + this.lblLinkParameter.Location = new System.Drawing.Point(8, 56); + this.lblLinkParameter.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblLinkParameter.Name = "lblLinkParameter"; - this.lblLinkParameter.Size = new System.Drawing.Size(95, 12); + this.lblLinkParameter.Size = new System.Drawing.Size(121, 15); this.lblLinkParameter.TabIndex = 2; this.lblLinkParameter.Text = "2.终端基本参数:\r\n"; // @@ -591,17 +739,19 @@ this.cbLineMd.FormattingEnabled = true; this.cbLineMd.Items.AddRange(new object[] { "以太网通讯(TCP/IP)"}); - this.cbLineMd.Location = new System.Drawing.Point(129, 3); + this.cbLineMd.Location = new System.Drawing.Point(172, 4); + this.cbLineMd.Margin = new System.Windows.Forms.Padding(4); this.cbLineMd.Name = "cbLineMd"; - this.cbLineMd.Size = new System.Drawing.Size(227, 20); + this.cbLineMd.Size = new System.Drawing.Size(301, 23); this.cbLineMd.TabIndex = 1; // // lblLinkModel // this.lblLinkModel.AutoSize = true; - this.lblLinkModel.Location = new System.Drawing.Point(6, 6); + this.lblLinkModel.Location = new System.Drawing.Point(8, 8); + this.lblLinkModel.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblLinkModel.Name = "lblLinkModel"; - this.lblLinkModel.Size = new System.Drawing.Size(95, 12); + this.lblLinkModel.Size = new System.Drawing.Size(121, 15); this.lblLinkModel.TabIndex = 0; this.lblLinkModel.Text = "1.连接网络模式:"; // @@ -619,9 +769,10 @@ this.tpReciveFile.Controls.Add(this.label3); this.tpReciveFile.Controls.Add(this.lblRZysx3); this.tpReciveFile.Location = new System.Drawing.Point(4, 4); + this.tpReciveFile.Margin = new System.Windows.Forms.Padding(4); this.tpReciveFile.Name = "tpReciveFile"; - this.tpReciveFile.Padding = new System.Windows.Forms.Padding(3); - this.tpReciveFile.Size = new System.Drawing.Size(443, 531); + this.tpReciveFile.Padding = new System.Windows.Forms.Padding(4); + this.tpReciveFile.Size = new System.Drawing.Size(593, 667); this.tpReciveFile.TabIndex = 1; this.tpReciveFile.Text = "终端文件读取到PC"; this.tpReciveFile.UseVisualStyleBackColor = true; @@ -629,17 +780,19 @@ // label7 // this.label7.AutoSize = true; - this.label7.Location = new System.Drawing.Point(52, 289); + this.label7.Location = new System.Drawing.Point(69, 361); + this.label7.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(95, 12); + this.label7.Size = new System.Drawing.Size(120, 15); this.label7.TabIndex = 20; this.label7.Text = "服务器文件路径:"; // // button2 // - this.button2.Location = new System.Drawing.Point(369, 317); + this.button2.Location = new System.Drawing.Point(492, 396); + this.button2.Margin = new System.Windows.Forms.Padding(4); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(27, 23); + this.button2.Size = new System.Drawing.Size(36, 29); this.button2.TabIndex = 19; this.button2.Text = "…"; this.button2.UseVisualStyleBackColor = true; @@ -647,26 +800,29 @@ // // textBox1 // - this.textBox1.Location = new System.Drawing.Point(128, 319); + this.textBox1.Location = new System.Drawing.Point(171, 399); + this.textBox1.Margin = new System.Windows.Forms.Padding(4); this.textBox1.Name = "textBox1"; this.textBox1.ReadOnly = true; - this.textBox1.Size = new System.Drawing.Size(235, 21); + this.textBox1.Size = new System.Drawing.Size(312, 25); this.textBox1.TabIndex = 18; // // label8 // - this.label8.Location = new System.Drawing.Point(30, 322); + this.label8.Location = new System.Drawing.Point(40, 402); + this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(92, 12); + this.label8.Size = new System.Drawing.Size(123, 15); this.label8.TabIndex = 17; this.label8.Text = "记录路径"; this.label8.TextAlign = System.Drawing.ContentAlignment.TopRight; // // button1 // - this.button1.Location = new System.Drawing.Point(184, 356); + this.button1.Location = new System.Drawing.Point(245, 445); + this.button1.Margin = new System.Windows.Forms.Padding(4); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(75, 23); + this.button1.Size = new System.Drawing.Size(100, 29); this.button1.TabIndex = 14; this.button1.Text = "手工导入"; this.button1.UseVisualStyleBackColor = true; @@ -675,9 +831,10 @@ // lblRZysx1 // this.lblRZysx1.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblRZysx1.Location = new System.Drawing.Point(42, 48); + this.lblRZysx1.Location = new System.Drawing.Point(56, 60); + this.lblRZysx1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRZysx1.Name = "lblRZysx1"; - this.lblRZysx1.Size = new System.Drawing.Size(323, 38); + this.lblRZysx1.Size = new System.Drawing.Size(431, 48); this.lblRZysx1.TabIndex = 13; this.lblRZysx1.Text = "1.定时每10分钟采集一次考勤记录"; // @@ -685,17 +842,19 @@ // this.lblRZysx.AutoSize = true; this.lblRZysx.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblRZysx.Location = new System.Drawing.Point(39, 30); + this.lblRZysx.Location = new System.Drawing.Point(52, 38); + this.lblRZysx.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRZysx.Name = "lblRZysx"; - this.lblRZysx.Size = new System.Drawing.Size(57, 12); + this.lblRZysx.Size = new System.Drawing.Size(71, 15); this.lblRZysx.TabIndex = 12; this.lblRZysx.Text = "注意事项"; // // stopButton // - this.stopButton.Location = new System.Drawing.Point(237, 204); + this.stopButton.Location = new System.Drawing.Point(316, 255); + this.stopButton.Margin = new System.Windows.Forms.Padding(4); this.stopButton.Name = "stopButton"; - this.stopButton.Size = new System.Drawing.Size(75, 23); + this.stopButton.Size = new System.Drawing.Size(100, 29); this.stopButton.TabIndex = 11; this.stopButton.Text = "停止采集"; this.stopButton.UseVisualStyleBackColor = true; @@ -703,9 +862,10 @@ // // btnRecive // - this.btnRecive.Location = new System.Drawing.Point(130, 204); + this.btnRecive.Location = new System.Drawing.Point(173, 255); + this.btnRecive.Margin = new System.Windows.Forms.Padding(4); this.btnRecive.Name = "btnRecive"; - this.btnRecive.Size = new System.Drawing.Size(75, 23); + this.btnRecive.Size = new System.Drawing.Size(100, 29); this.btnRecive.TabIndex = 11; this.btnRecive.Text = "开始采集"; this.btnRecive.UseVisualStyleBackColor = true; @@ -714,18 +874,20 @@ // label3 // 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(42, 135); + this.label3.Location = new System.Drawing.Point(56, 169); + this.label3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(303, 33); + this.label3.Size = new System.Drawing.Size(404, 41); this.label3.TabIndex = 10; this.label3.Text = "3.考勤记录里的员工编号需要在ERP系统做对照"; // // lblRZysx3 // this.lblRZysx3.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblRZysx3.Location = new System.Drawing.Point(42, 91); + this.lblRZysx3.Location = new System.Drawing.Point(56, 114); + this.lblRZysx3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRZysx3.Name = "lblRZysx3"; - this.lblRZysx3.Size = new System.Drawing.Size(303, 33); + this.lblRZysx3.Size = new System.Drawing.Size(404, 41); this.lblRZysx3.TabIndex = 10; this.lblRZysx3.Text = "2.考勤记录采集成功后以文本保存到record文件夹"; // @@ -748,18 +910,20 @@ this.tpSendFile.Controls.Add(this.txtSvDangAnPath); this.tpSendFile.Controls.Add(this.lblSSvDangAn); this.tpSendFile.Location = new System.Drawing.Point(4, 4); + this.tpSendFile.Margin = new System.Windows.Forms.Padding(4); this.tpSendFile.Name = "tpSendFile"; - this.tpSendFile.Padding = new System.Windows.Forms.Padding(3); - this.tpSendFile.Size = new System.Drawing.Size(443, 531); + this.tpSendFile.Padding = new System.Windows.Forms.Padding(4); + this.tpSendFile.Size = new System.Drawing.Size(593, 667); this.tpSendFile.TabIndex = 2; this.tpSendFile.Text = "PC文件写入到终端"; this.tpSendFile.UseVisualStyleBackColor = true; // // btnSendFile // - this.btnSendFile.Location = new System.Drawing.Point(333, 337); + this.btnSendFile.Location = new System.Drawing.Point(444, 421); + this.btnSendFile.Margin = new System.Windows.Forms.Padding(4); this.btnSendFile.Name = "btnSendFile"; - this.btnSendFile.Size = new System.Drawing.Size(75, 23); + this.btnSendFile.Size = new System.Drawing.Size(100, 29); this.btnSendFile.TabIndex = 24; this.btnSendFile.Text = "文件传输"; this.btnSendFile.UseVisualStyleBackColor = true; @@ -768,130 +932,145 @@ // this.lblSZysx.AutoSize = true; this.lblSZysx.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblSZysx.Location = new System.Drawing.Point(45, 215); + this.lblSZysx.Location = new System.Drawing.Point(60, 269); + this.lblSZysx.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSZysx.Name = "lblSZysx"; - this.lblSZysx.Size = new System.Drawing.Size(57, 12); + this.lblSZysx.Size = new System.Drawing.Size(71, 15); this.lblSZysx.TabIndex = 23; this.lblSZysx.Text = "注意事项"; // // lblSZysx2 // this.lblSZysx2.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblSZysx2.Location = new System.Drawing.Point(44, 286); + this.lblSZysx2.Location = new System.Drawing.Point(59, 358); + this.lblSZysx2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSZysx2.Name = "lblSZysx2"; - this.lblSZysx2.Size = new System.Drawing.Size(328, 49); + this.lblSZysx2.Size = new System.Drawing.Size(437, 61); this.lblSZysx2.TabIndex = 22; this.lblSZysx2.Text = "2.写入档案及照片指纹文件到终端时，先写照片指纹成功后再写入档案"; // // lblSZysx1 // this.lblSZysx1.Font = new System.Drawing.Font("宋体", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblSZysx1.Location = new System.Drawing.Point(44, 235); + this.lblSZysx1.Location = new System.Drawing.Point(59, 294); + this.lblSZysx1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSZysx1.Name = "lblSZysx1"; - this.lblSZysx1.Size = new System.Drawing.Size(328, 49); + this.lblSZysx1.Size = new System.Drawing.Size(437, 61); this.lblSZysx1.TabIndex = 22; this.lblSZysx1.Text = "1.请勿随意传输非法文件充当档案及照片,终端可能因无法加载而造成异常"; // // txtZdZhaoPianPath // - this.txtZdZhaoPianPath.Location = new System.Drawing.Point(104, 169); + this.txtZdZhaoPianPath.Location = new System.Drawing.Point(139, 211); + this.txtZdZhaoPianPath.Margin = new System.Windows.Forms.Padding(4); this.txtZdZhaoPianPath.Name = "txtZdZhaoPianPath"; - this.txtZdZhaoPianPath.Size = new System.Drawing.Size(268, 21); + this.txtZdZhaoPianPath.Size = new System.Drawing.Size(356, 25); this.txtZdZhaoPianPath.TabIndex = 21; this.txtZdZhaoPianPath.Text = "\\\\updata\\wdjl.wds"; // // lblSZdZhaoPian // - this.lblSZdZhaoPian.Location = new System.Drawing.Point(6, 172); + this.lblSZdZhaoPian.Location = new System.Drawing.Point(8, 215); + this.lblSZdZhaoPian.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSZdZhaoPian.Name = "lblSZdZhaoPian"; - this.lblSZdZhaoPian.Size = new System.Drawing.Size(92, 12); + this.lblSZdZhaoPian.Size = new System.Drawing.Size(123, 15); this.lblSZdZhaoPian.TabIndex = 20; this.lblSZdZhaoPian.Text = "照片路径"; this.lblSZdZhaoPian.TextAlign = System.Drawing.ContentAlignment.TopRight; // // lblSZdDangAn // - this.lblSZdDangAn.Location = new System.Drawing.Point(6, 145); + this.lblSZdDangAn.Location = new System.Drawing.Point(8, 181); + this.lblSZdDangAn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSZdDangAn.Name = "lblSZdDangAn"; - this.lblSZdDangAn.Size = new System.Drawing.Size(92, 12); + this.lblSZdDangAn.Size = new System.Drawing.Size(123, 15); this.lblSZdDangAn.TabIndex = 19; this.lblSZdDangAn.Text = "档案路径"; this.lblSZdDangAn.TextAlign = System.Drawing.ContentAlignment.TopRight; // // txtZdDangAnPath // - this.txtZdDangAnPath.Location = new System.Drawing.Point(104, 142); + this.txtZdDangAnPath.Location = new System.Drawing.Point(139, 178); + this.txtZdDangAnPath.Margin = new System.Windows.Forms.Padding(4); this.txtZdDangAnPath.Name = "txtZdDangAnPath"; - this.txtZdDangAnPath.Size = new System.Drawing.Size(268, 21); + this.txtZdDangAnPath.Size = new System.Drawing.Size(356, 25); this.txtZdDangAnPath.TabIndex = 18; this.txtZdDangAnPath.Text = "\\\\updata\\wdjl.wds"; // // lblSZdPath // this.lblSZdPath.AutoSize = true; - this.lblSZdPath.Location = new System.Drawing.Point(28, 118); + this.lblSZdPath.Location = new System.Drawing.Point(37, 148); + this.lblSZdPath.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSZdPath.Name = "lblSZdPath"; - this.lblSZdPath.Size = new System.Drawing.Size(119, 12); + this.lblSZdPath.Size = new System.Drawing.Size(151, 15); this.lblSZdPath.TabIndex = 17; this.lblSZdPath.Text = "2.终端文件存放路径:\r\n"; // // lblSSvPath // this.lblSSvPath.AutoSize = true; - this.lblSSvPath.Location = new System.Drawing.Point(28, 25); + this.lblSSvPath.Location = new System.Drawing.Point(37, 31); + this.lblSSvPath.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSSvPath.Name = "lblSSvPath"; - this.lblSSvPath.Size = new System.Drawing.Size(107, 12); + this.lblSSvPath.Size = new System.Drawing.Size(136, 15); this.lblSSvPath.TabIndex = 16; this.lblSSvPath.Text = "1.服务器文件路径:"; // // btnSaveFileZhaoPian // - this.btnSaveFileZhaoPian.Location = new System.Drawing.Point(345, 80); + this.btnSaveFileZhaoPian.Location = new System.Drawing.Point(460, 100); + this.btnSaveFileZhaoPian.Margin = new System.Windows.Forms.Padding(4); this.btnSaveFileZhaoPian.Name = "btnSaveFileZhaoPian"; - this.btnSaveFileZhaoPian.Size = new System.Drawing.Size(27, 23); + this.btnSaveFileZhaoPian.Size = new System.Drawing.Size(36, 29); this.btnSaveFileZhaoPian.TabIndex = 15; this.btnSaveFileZhaoPian.Text = "…"; this.btnSaveFileZhaoPian.UseVisualStyleBackColor = true; // // txtSvZhaoPianPath // - this.txtSvZhaoPianPath.Location = new System.Drawing.Point(104, 82); + this.txtSvZhaoPianPath.Location = new System.Drawing.Point(139, 102); + this.txtSvZhaoPianPath.Margin = new System.Windows.Forms.Padding(4); this.txtSvZhaoPianPath.Name = "txtSvZhaoPianPath"; this.txtSvZhaoPianPath.ReadOnly = true; - this.txtSvZhaoPianPath.Size = new System.Drawing.Size(235, 21); + this.txtSvZhaoPianPath.Size = new System.Drawing.Size(312, 25); this.txtSvZhaoPianPath.TabIndex = 14; // // lblSSvZhaoPian // - this.lblSSvZhaoPian.Location = new System.Drawing.Point(6, 85); + this.lblSSvZhaoPian.Location = new System.Drawing.Point(8, 106); + this.lblSSvZhaoPian.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSSvZhaoPian.Name = "lblSSvZhaoPian"; - this.lblSSvZhaoPian.Size = new System.Drawing.Size(92, 12); + this.lblSSvZhaoPian.Size = new System.Drawing.Size(123, 15); this.lblSSvZhaoPian.TabIndex = 13; this.lblSSvZhaoPian.Text = "照片路径"; this.lblSSvZhaoPian.TextAlign = System.Drawing.ContentAlignment.TopRight; // // btnSaveFileDangAn // - this.btnSaveFileDangAn.Location = new System.Drawing.Point(345, 53); + this.btnSaveFileDangAn.Location = new System.Drawing.Point(460, 66); + this.btnSaveFileDangAn.Margin = new System.Windows.Forms.Padding(4); this.btnSaveFileDangAn.Name = "btnSaveFileDangAn"; - this.btnSaveFileDangAn.Size = new System.Drawing.Size(27, 23); + this.btnSaveFileDangAn.Size = new System.Drawing.Size(36, 29); this.btnSaveFileDangAn.TabIndex = 12; this.btnSaveFileDangAn.Text = "…"; this.btnSaveFileDangAn.UseVisualStyleBackColor = true; // // txtSvDangAnPath // - this.txtSvDangAnPath.Location = new System.Drawing.Point(104, 55); + this.txtSvDangAnPath.Location = new System.Drawing.Point(139, 69); + this.txtSvDangAnPath.Margin = new System.Windows.Forms.Padding(4); this.txtSvDangAnPath.Name = "txtSvDangAnPath"; this.txtSvDangAnPath.ReadOnly = true; - this.txtSvDangAnPath.Size = new System.Drawing.Size(235, 21); + this.txtSvDangAnPath.Size = new System.Drawing.Size(312, 25); this.txtSvDangAnPath.TabIndex = 11; // // lblSSvDangAn // - this.lblSSvDangAn.Location = new System.Drawing.Point(6, 58); + this.lblSSvDangAn.Location = new System.Drawing.Point(8, 72); + this.lblSSvDangAn.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblSSvDangAn.Name = "lblSSvDangAn"; - this.lblSSvDangAn.Size = new System.Drawing.Size(92, 12); + this.lblSSvDangAn.Size = new System.Drawing.Size(123, 15); this.lblSSvDangAn.TabIndex = 10; this.lblSSvDangAn.Text = "档案路径"; this.lblSSvDangAn.TextAlign = System.Drawing.ContentAlignment.TopRight; @@ -912,9 +1091,10 @@ this.tpReciveFromAny.Controls.Add(this.lblRAZysx); this.tpReciveFromAny.Controls.Add(this.lblReciveAll); this.tpReciveFromAny.Location = new System.Drawing.Point(4, 4); + this.tpReciveFromAny.Margin = new System.Windows.Forms.Padding(4); this.tpReciveFromAny.Name = "tpReciveFromAny"; - this.tpReciveFromAny.Padding = new System.Windows.Forms.Padding(3); - this.tpReciveFromAny.Size = new System.Drawing.Size(443, 531); + this.tpReciveFromAny.Padding = new System.Windows.Forms.Padding(4); + this.tpReciveFromAny.Size = new System.Drawing.Size(593, 667); this.tpReciveFromAny.TabIndex = 6; this.tpReciveFromAny.Text = "同时多台终端通讯"; this.tpReciveFromAny.UseVisualStyleBackColor = true; @@ -924,9 +1104,10 @@ this.cbCloseTX.AutoSize = true; this.cbCloseTX.Checked = true; this.cbCloseTX.CheckState = System.Windows.Forms.CheckState.Checked; - this.cbCloseTX.Location = new System.Drawing.Point(96, 137); + this.cbCloseTX.Location = new System.Drawing.Point(128, 171); + this.cbCloseTX.Margin = new System.Windows.Forms.Padding(4); this.cbCloseTX.Name = "cbCloseTX"; - this.cbCloseTX.Size = new System.Drawing.Size(144, 16); + this.cbCloseTX.Size = new System.Drawing.Size(179, 19); this.cbCloseTX.TabIndex = 8; this.cbCloseTX.Text = "是否自动关闭通讯窗体"; this.cbCloseTX.UseVisualStyleBackColor = true; @@ -934,84 +1115,94 @@ // cbShowTX // this.cbShowTX.AutoSize = true; - this.cbShowTX.Location = new System.Drawing.Point(96, 115); + this.cbShowTX.Location = new System.Drawing.Point(128, 144); + this.cbShowTX.Margin = new System.Windows.Forms.Padding(4); this.cbShowTX.Name = "cbShowTX"; - this.cbShowTX.Size = new System.Drawing.Size(120, 16); + this.cbShowTX.Size = new System.Drawing.Size(149, 19); this.cbShowTX.TabIndex = 7; this.cbShowTX.Text = "是否显示通讯窗体"; this.cbShowTX.UseVisualStyleBackColor = true; // // btnStartTx // - this.btnStartTx.Location = new System.Drawing.Point(300, 337); + this.btnStartTx.Location = new System.Drawing.Point(400, 421); + this.btnStartTx.Margin = new System.Windows.Forms.Padding(4); this.btnStartTx.Name = "btnStartTx"; - this.btnStartTx.Size = new System.Drawing.Size(108, 23); + this.btnStartTx.Size = new System.Drawing.Size(144, 29); this.btnStartTx.TabIndex = 4; this.btnStartTx.Text = "开始并发采集"; this.btnStartTx.UseVisualStyleBackColor = true; // // txtEndIp // - this.txtEndIp.Location = new System.Drawing.Point(163, 76); + this.txtEndIp.Location = new System.Drawing.Point(217, 95); + this.txtEndIp.Margin = new System.Windows.Forms.Padding(4); this.txtEndIp.Name = "txtEndIp"; - this.txtEndIp.Size = new System.Drawing.Size(154, 21); + this.txtEndIp.Size = new System.Drawing.Size(204, 25); this.txtEndIp.TabIndex = 2; // // txtStartIP // - this.txtStartIP.Location = new System.Drawing.Point(163, 44); + this.txtStartIP.Location = new System.Drawing.Point(217, 55); + this.txtStartIP.Margin = new System.Windows.Forms.Padding(4); this.txtStartIP.Name = "txtStartIP"; - this.txtStartIP.Size = new System.Drawing.Size(154, 21); + this.txtStartIP.Size = new System.Drawing.Size(204, 25); this.txtStartIP.TabIndex = 2; // // lblEndIP // - this.lblEndIP.Location = new System.Drawing.Point(6, 79); + this.lblEndIP.Location = new System.Drawing.Point(8, 99); + this.lblEndIP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblEndIP.Name = "lblEndIP"; - this.lblEndIP.Size = new System.Drawing.Size(151, 12); + this.lblEndIP.Size = new System.Drawing.Size(201, 15); this.lblEndIP.TabIndex = 1; this.lblEndIP.Text = "终止IP地址"; this.lblEndIP.TextAlign = System.Drawing.ContentAlignment.TopRight; // // lblStartIP // - this.lblStartIP.Location = new System.Drawing.Point(6, 47); + this.lblStartIP.Location = new System.Drawing.Point(8, 59); + this.lblStartIP.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblStartIP.Name = "lblStartIP"; - this.lblStartIP.Size = new System.Drawing.Size(151, 12); + this.lblStartIP.Size = new System.Drawing.Size(201, 15); this.lblStartIP.TabIndex = 1; this.lblStartIP.Text = "起始IP地址"; this.lblStartIP.TextAlign = System.Drawing.ContentAlignment.TopRight; // // lblRAZysx3 // - this.lblRAZysx3.Location = new System.Drawing.Point(46, 290); + this.lblRAZysx3.Location = new System.Drawing.Point(61, 362); + this.lblRAZysx3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRAZysx3.Name = "lblRAZysx3"; - this.lblRAZysx3.Size = new System.Drawing.Size(351, 44); + this.lblRAZysx3.Size = new System.Drawing.Size(468, 55); this.lblRAZysx3.TabIndex = 1; this.lblRAZysx3.Text = "3.本例只作演示,且勿并发过多"; // // lblRAZysx2 // - this.lblRAZysx2.Location = new System.Drawing.Point(46, 240); + this.lblRAZysx2.Location = new System.Drawing.Point(61, 300); + this.lblRAZysx2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRAZysx2.Name = "lblRAZysx2"; - this.lblRAZysx2.Size = new System.Drawing.Size(351, 44); + this.lblRAZysx2.Size = new System.Drawing.Size(468, 55); this.lblRAZysx2.TabIndex = 1; this.lblRAZysx2.Text = "2.记录文件存放路径为 ..\\Data\\终端IP地址.wds"; // // lblRAZysx1 // - this.lblRAZysx1.Location = new System.Drawing.Point(46, 190); + this.lblRAZysx1.Location = new System.Drawing.Point(61, 238); + this.lblRAZysx1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRAZysx1.Name = "lblRAZysx1"; - this.lblRAZysx1.Size = new System.Drawing.Size(351, 44); + this.lblRAZysx1.Size = new System.Drawing.Size(468, 55); this.lblRAZysx1.TabIndex = 1; this.lblRAZysx1.Text = "1.该实例采用多进程模式,调用多个实例完成"; // // lblRAJilu // this.lblRAJilu.AutoSize = true; - this.lblRAJilu.Location = new System.Drawing.Point(209, 18); + this.lblRAJilu.Location = new System.Drawing.Point(279, 22); + this.lblRAJilu.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRAJilu.Name = "lblRAJilu"; - this.lblRAJilu.Size = new System.Drawing.Size(89, 12); + this.lblRAJilu.Size = new System.Drawing.Size(112, 15); this.lblRAJilu.TabIndex = 1; this.lblRAJilu.Text = "以采集记录为例"; // @@ -1019,9 +1210,10 @@ // this.lblRAZysx.AutoSize = true; this.lblRAZysx.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblRAZysx.Location = new System.Drawing.Point(21, 164); + this.lblRAZysx.Location = new System.Drawing.Point(28, 205); + this.lblRAZysx.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblRAZysx.Name = "lblRAZysx"; - this.lblRAZysx.Size = new System.Drawing.Size(57, 12); + this.lblRAZysx.Size = new System.Drawing.Size(71, 15); this.lblRAZysx.TabIndex = 0; this.lblRAZysx.Text = "注意事项"; // @@ -1029,53 +1221,59 @@ // this.lblReciveAll.AutoSize = true; this.lblReciveAll.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblReciveAll.Location = new System.Drawing.Point(21, 18); + this.lblReciveAll.Location = new System.Drawing.Point(28, 22); + this.lblReciveAll.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblReciveAll.Name = "lblReciveAll"; - this.lblReciveAll.Size = new System.Drawing.Size(109, 12); + this.lblReciveAll.Size = new System.Drawing.Size(135, 15); this.lblReciveAll.TabIndex = 0; this.lblReciveAll.Text = "同时多台终端通讯"; // // lblZdUdpData // this.lblZdUdpData.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblZdUdpData.Location = new System.Drawing.Point(652, 300); + this.lblZdUdpData.Location = new System.Drawing.Point(869, 375); + this.lblZdUdpData.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblZdUdpData.Name = "lblZdUdpData"; - this.lblZdUdpData.Size = new System.Drawing.Size(259, 12); + this.lblZdUdpData.Size = new System.Drawing.Size(345, 15); this.lblZdUdpData.TabIndex = 30; this.lblZdUdpData.Text = "终端UDP数据\r"; this.lblZdUdpData.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // txtUDP // - this.txtUDP.Location = new System.Drawing.Point(636, 315); + this.txtUDP.Location = new System.Drawing.Point(848, 394); + this.txtUDP.Margin = new System.Windows.Forms.Padding(4); this.txtUDP.Name = "txtUDP"; - this.txtUDP.Size = new System.Drawing.Size(295, 227); + this.txtUDP.Size = new System.Drawing.Size(392, 283); this.txtUDP.TabIndex = 29; this.txtUDP.Text = ""; // // txtLog // - this.txtLog.Location = new System.Drawing.Point(636, 77); + this.txtLog.Location = new System.Drawing.Point(848, 96); + this.txtLog.Margin = new System.Windows.Forms.Padding(4); this.txtLog.Name = "txtLog"; - this.txtLog.Size = new System.Drawing.Size(295, 214); + this.txtLog.Size = new System.Drawing.Size(392, 266); this.txtLog.TabIndex = 28; this.txtLog.Text = ""; // // lblState // this.lblState.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblState.Location = new System.Drawing.Point(652, 58); + this.lblState.Location = new System.Drawing.Point(869, 72); + this.lblState.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblState.Name = "lblState"; - this.lblState.Size = new System.Drawing.Size(257, 12); + this.lblState.Size = new System.Drawing.Size(343, 15); this.lblState.TabIndex = 33; this.lblState.TextAlign = System.Drawing.ContentAlignment.TopCenter; // // lblZdLinked // this.lblZdLinked.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblZdLinked.Location = new System.Drawing.Point(650, 37); + this.lblZdLinked.Location = new System.Drawing.Point(867, 46); + this.lblZdLinked.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblZdLinked.Name = "lblZdLinked"; - this.lblZdLinked.Size = new System.Drawing.Size(259, 13); + this.lblZdLinked.Size = new System.Drawing.Size(345, 16); this.lblZdLinked.TabIndex = 32; this.lblZdLinked.Text = "当前操作终端："; this.lblZdLinked.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; @@ -1083,9 +1281,10 @@ // lblZdLinkStateInfo // this.lblZdLinkStateInfo.Font = new System.Drawing.Font("宋体", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.lblZdLinkStateInfo.Location = new System.Drawing.Point(649, 13); + this.lblZdLinkStateInfo.Location = new System.Drawing.Point(865, 16); + this.lblZdLinkStateInfo.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); this.lblZdLinkStateInfo.Name = "lblZdLinkStateInfo"; - this.lblZdLinkStateInfo.Size = new System.Drawing.Size(260, 16); + this.lblZdLinkStateInfo.Size = new System.Drawing.Size(347, 20); this.lblZdLinkStateInfo.TabIndex = 31; this.lblZdLinkStateInfo.Text = "终端连接状态信息"; this.lblZdLinkStateInfo.TextAlign = System.Drawing.ContentAlignment.TopCenter; @@ -1094,11 +1293,21 @@ // this.saveFileDialogRecive.Filter = "所有文件|*.*"; // + // label19 + // + this.label19.Location = new System.Drawing.Point(10, 223); + this.label19.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(86, 18); + this.label19.TabIndex = 34; + this.label19.Text = "IP地址11:"; + this.label19.TextAlign = System.Drawing.ContentAlignment.TopRight; + // // Form1 // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(937, 546); + this.ClientSize = new System.Drawing.Size(1249, 682); this.Controls.Add(this.lblState); this.Controls.Add(this.lblZdLinked); this.Controls.Add(this.lblZdLinkStateInfo); @@ -1109,6 +1318,7 @@ this.Controls.Add(this.btntpRecive); this.Controls.Add(this.btntpConn); this.Controls.Add(this.axW4commsv21); + this.Margin = new System.Windows.Forms.Padding(4); this.Name = "Form1"; this.Text = "青花瓷考勤客户端2.0"; this.Load += new System.EventHandler(this.Form1_Load); @@ -1117,6 +1327,8 @@ this.tabControl1.ResumeLayout(false); this.tpConnection.ResumeLayout(false); this.tpConnection.PerformLayout(); + this.panel2.ResumeLayout(false); + this.panel2.PerformLayout(); ((System.ComponentModel.ISupportInitialize)(this.nudPort)).EndInit(); this.tpReciveFile.ResumeLayout(false); this.tpReciveFile.PerformLayout(); @@ -1135,23 +1347,6 @@ private System.Windows.Forms.Button btntpRecive; private System.Windows.Forms.Panel panel1; private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tpConnection; - private System.Windows.Forms.Button btnConnection; - private System.Windows.Forms.Button saveBt; - private System.Windows.Forms.TextBox txtValidate; - private System.Windows.Forms.RadioButton rbAdminValidate; - private System.Windows.Forms.RadioButton rbPassValidate; - private System.Windows.Forms.RadioButton rbNoValidate; - private System.Windows.Forms.Label lblValidateString; - private System.Windows.Forms.TextBox txtTimeout; - private System.Windows.Forms.NumericUpDown nudPort; - private System.Windows.Forms.Label lblConnTimeout; - private System.Windows.Forms.Label lblConnPort; - private System.Windows.Forms.Label lblConnIP; - private System.Windows.Forms.TextBox txtIP; - private System.Windows.Forms.Label lblLinkParameter; - private System.Windows.Forms.ComboBox cbLineMd; - private System.Windows.Forms.Label lblLinkModel; private System.Windows.Forms.TabPage tpReciveFile; private System.Windows.Forms.Label lblRZysx1; private System.Windows.Forms.Label lblRZysx; @@ -1191,43 +1386,69 @@ private System.Windows.Forms.Label lblZdUdpData; private System.Windows.Forms.RichTextBox txtUDP; private System.Windows.Forms.RichTextBox txtLog; - private System.Windows.Forms.Label label2; - private System.Windows.Forms.TextBox txtIP3; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.TextBox txtIP2; private System.Windows.Forms.Label lblState; private System.Windows.Forms.Label lblZdLinked; private System.Windows.Forms.Label lblZdLinkStateInfo; - private System.Windows.Forms.Button btnDisconnection; private System.Windows.Forms.SaveFileDialog saveFileDialogRecive; - private System.Windows.Forms.TextBox txtReciveZDPath; - private System.Windows.Forms.Label lblRSvFilePath; - private System.Windows.Forms.Label lblRZdFilePath; private System.Windows.Forms.Label label3; private System.Windows.Forms.Button stopButton; private System.Windows.Forms.Button button1; - private System.Windows.Forms.TextBox erpTextBox; - private System.Windows.Forms.TextBox passTextBox; - private System.Windows.Forms.TextBox userTextBox; - private System.Windows.Forms.Label label6; - private System.Windows.Forms.Label label5; - private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label7; private System.Windows.Forms.Button button2; private System.Windows.Forms.TextBox textBox1; private System.Windows.Forms.Label label8; private System.Windows.Forms.OpenFileDialog openFileDialogDangAn; - private System.Windows.Forms.Label label11; - private System.Windows.Forms.Label label10; - private System.Windows.Forms.Label label9; + private System.Windows.Forms.TabPage tpConnection; + private System.Windows.Forms.TextBox passTextBox; + private System.Windows.Forms.TextBox userTextBox; + private System.Windows.Forms.TextBox erpTextBox; + private System.Windows.Forms.TextBox txtReciveZDPath; + private System.Windows.Forms.Label lblRSvFilePath; + private System.Windows.Forms.Label lblRZdFilePath; + private System.Windows.Forms.Button btnDisconnection; + private System.Windows.Forms.Button btnConnection; + private System.Windows.Forms.Button saveBt; + private System.Windows.Forms.TextBox txtValidate; + private System.Windows.Forms.RadioButton rbAdminValidate; + private System.Windows.Forms.RadioButton rbPassValidate; + private System.Windows.Forms.RadioButton rbNoValidate; + private System.Windows.Forms.Label lblValidateString; + private System.Windows.Forms.Label label6; + private System.Windows.Forms.Label label5; + private System.Windows.Forms.Label label4; + private System.Windows.Forms.Label lblLinkParameter; + private System.Windows.Forms.ComboBox cbLineMd; + private System.Windows.Forms.Label lblLinkModel; + private System.Windows.Forms.Panel panel2; + private System.Windows.Forms.TextBox txtIP8; + private System.Windows.Forms.Label label13; + private System.Windows.Forms.TextBox txtIP7; + private System.Windows.Forms.Label label12; private System.Windows.Forms.TextBox txtIP6; + private System.Windows.Forms.Label label11; private System.Windows.Forms.TextBox txtIP5; + private System.Windows.Forms.Label label10; private System.Windows.Forms.TextBox txtIP4; - private System.Windows.Forms.Label label13; - private System.Windows.Forms.Label label12; - private System.Windows.Forms.TextBox txtIP8; - private System.Windows.Forms.TextBox txtIP7; - + private System.Windows.Forms.Label label9; + private System.Windows.Forms.TextBox txtIP3; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.TextBox txtTimeout; + private System.Windows.Forms.Label lblConnTimeout; + private System.Windows.Forms.TextBox txtIP2; + private System.Windows.Forms.NumericUpDown nudPort; + private System.Windows.Forms.Label lblConnPort; + private System.Windows.Forms.TextBox txtIP; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label14; + private System.Windows.Forms.TextBox txtIP9; + private System.Windows.Forms.Label label15; + private System.Windows.Forms.TextBox txtIP12; + private System.Windows.Forms.Label label18; + private System.Windows.Forms.TextBox txtIP11; + private System.Windows.Forms.Label label17; + private System.Windows.Forms.TextBox txtIP10; + private System.Windows.Forms.Label label16; + private System.Windows.Forms.Label label19; } } diff --git a/ClientForWEDS/Form1.cs b/ClientForWEDS/Form1.cs index d42a445..5547da7 100644 --- a/ClientForWEDS/Form1.cs +++ b/ClientForWEDS/Form1.cs @@ -24,6 +24,7 @@ namespace ClientForWEDS { public Form1() { InitializeComponent(); CheckForIllegalCrossThreadCalls = false; + panel2.VerticalScroll.Visible = false; } private void Form1_Load(object sender, EventArgs e) { @@ -42,6 +43,12 @@ namespace ClientForWEDS { txtIP6.Text = ConfigUtil.IP6; txtIP7.Text = ConfigUtil.IP7; txtIP8.Text = ConfigUtil.IP8; + txtIP9.Text = ConfigUtil.IP9; + txtIP10.Text = ConfigUtil.IP10; + txtIP11.Text = ConfigUtil.IP11; + txtIP12.Text = ConfigUtil.IP12; + + txtTimeout.Text = ConfigUtil.Timeout; nudPort.Text = ConfigUtil.Port; txtReciveZDPath.Text = ConfigUtil.ZDPath; @@ -377,7 +384,15 @@ namespace ClientForWEDS { if (txtIP7.Text.Length > 0) ipList.Add(txtIP7.Text); if (txtIP8.Text.Length > 0) - ipList.Add(txtIP8.Text); + ipList.Add(txtIP8.Text); + if (txtIP9.Text.Length > 0) + ipList.Add(txtIP9.Text); + if (txtIP10.Text.Length > 0) + ipList.Add(txtIP10.Text); + if (txtIP11.Text.Length > 0) + ipList.Add(txtIP11.Text); + if (txtIP12.Text.Length > 0) + ipList.Add(txtIP12.Text); _zdPath = txtReciveZDPath.Text.Trim(); on_off = false; ma.Set(); @@ -410,6 +425,10 @@ namespace ClientForWEDS { nutFile.SetValue(ConfigUtil.ConfigItem.IP6, txtIP6.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.IP7, txtIP7.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.IP8, txtIP8.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.IP9, txtIP9.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.IP10, txtIP10.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.IP11, txtIP11.Text.Trim()); + nutFile.SetValue(ConfigUtil.ConfigItem.IP12, txtIP12.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.Port, nudPort.Text.Trim()); nutFile.SetValue(ConfigUtil.ConfigItem.Timeout, txtTimeout.Text.Trim()); @@ -556,5 +575,8 @@ namespace ClientForWEDS { textBox1.Text = openFileDialogDangAn.FileName; } } + + + } }