Trang chủ Khám phá Trợ giúp
Đăng nhập
yct
/
parkMonitor_V2.0
1
1
Fork 0
Các tập tin Các vấn đề 0 Yêu cầu khéo về 0 Wiki
Browse Source

上海参展增加尝试从车位中获取凭证号，以及临时修改地感功能。普爱修改plc终端块与电子围栏块数据。

yct 5 năm trước cách đây
mục cha
9c008c4c03
commit
e4bc343caf
13 tập tin đã thay đổi với 349 bổ sung và 182 xóa
Split View Hiển thị tình trạng sai khác
  1. 6 5
      PLCLinker/centralController/App.config
  2. 213 122
      PLCLinker/centralController/FormCentralController.Designer.cs
  3. 16 0
      PLCLinker/centralController/FormCentralController.cs
  4. 5 1
      PLCLinker/centralController/FormSysConfig.cs
  5. 13 1
      PLCLinker/centralController/Monitor/Monitor.cs
  6. 30 2
      PLCLinker/centralController/Terminal/Terminal.cs
  7. 5 1
      PLCLinker/centralController/Terminal/TerminalSimul.cs
  8. 3 1
      PLCLinker/centralController/WebServer/WebServer.cs
  9. 1 1
      PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache
  10. BIN
      PLCLinker/centralController/obj/Release/centralController.csproj.GenerateResource.Cache
  11. 2 2
      PLCLinker/centralController/serversettings.json
  12. 3 3
      PLCLinker/newPLCS7/PLCS7.cs
  13. 52 43
      PLCLinker/newPLCS7/entity.cs

+ 6 - 5
PLCLinker/centralController/App.config
Xem Tập Tin 

@@ -12,15 +12,16 @@
 
     <add key="spacesInRow" value="15"/>
 
     <!--数据库信息-->
 
     <!--<add key="remoteDBConnStr" value="Data Source=59.175.148.85;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
 
-    <add key="remoteDBConnStr" value="Data Source=118.31.225.50;port=3306;uid=zx;pooling=true;max pool size=1024;pwd=ZhiXiang436070;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
 
+    <!--<add key="remoteDBConnStr" value="Data Source=118.31.225.50;port=3306;uid=zx;pooling=true;max pool size=1024;pwd=ZhiXiang436070;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
 
+    <add key="remoteDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=yct;pooling=true;max pool size=1024;pwd=tommi94;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>
 
     <!--<add key="remoteDBConnStr" value="Data Source=192.168.0.152;port=3306;uid=root;pooling=true;max pool size=1024;pwd=x5;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
 
     <!--<add key="remoteDBConnStr" value="Data Source=127.0.0.1;port=20000;uid=root;pooling=true;max pool size=1024;pwd=yct;database=zxpark_cloud_2;CharSet=utf8;Allow Zero Datetime=true;"/>-->
 
-    <!--<add key="localDBConnStr" value="Data Source=106.14.121.187;port=3306;uid=ubuntu;pooling=true;max pool size=1024;pwd=tommi94;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>-->
 
-    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=root;pooling=true;max pool size=1024;pwd=;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
 
+    <add key="localDBConnStr" value="Data Source=127.0.0.1;port=3306;uid=yct;pooling=true;max pool size=1024;pwd=tommi94;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>
 
+    <!--<add key="localDBConnStr" value="Data Source=118.31.225.50;port=3306;uid=zx;pooling=true;max pool size=1024;pwd=ZhiXiang436070;database=zxpark_local;CharSet=utf8;Allow Zero Datetime=true;"/>-->
 
     <add key="DBtimeout" value="3"/>
 
     <!--号牌机信息-->
 
     <add key="192.168.0.51" value="3"/>
 
-    <add key="192.168.0.50" value="4"/>
 
+    <add key="192.168.0.50" value="1"/>
 
     <add key="filterRatio" value="0.6"/>
 
     <!--PLC基本配置-->
 
     <!--<add key="PLC_ip_address" value="192.168.0.10" />-->
 
@@ -41,7 +42,7 @@
 
     <!--中控webServer端口,deprecated-->
 
     <add key="webPort" value="9000"/>
 
     <!--车库信息-->
 
-    <add key="garageID" value="7"/>
 
+    <add key="garageID" value="8"/>
 
     <!--日志写入地址配置文件-->
 
     <add key="LogAddress" value="c:\\c#workspace\\LogDemo\\LoggerTest" />
 
     <!--广告存放路径-->

+ 213 - 122
PLCLinker/centralController/FormCentralController.Designer.cs
Xem Tập Tin 

@@ -37,6 +37,7 @@
 
             this.dockSite_mainView = new DevComponents.DotNetBar.DockSite();
 
             this.bar_mainWin = new DevComponents.DotNetBar.Bar();
 
             this.testPanel = new DevComponents.DotNetBar.PanelDockContainer();
 
+            this.button5 = new System.Windows.Forms.Button();
 
             this.button4 = new System.Windows.Forms.Button();
 
             this.tableLayoutPanel3 = new System.Windows.Forms.TableLayoutPanel();
 
             this.label1 = new System.Windows.Forms.Label();
 
@@ -164,6 +165,7 @@
 
             this.dockContainerItem1 = new DevComponents.DotNetBar.DockContainerItem();
 
             this.panelDockContainer8 = new DevComponents.DotNetBar.PanelDockContainer();
 
             this.controlContainerItem1 = new DevComponents.DotNetBar.ControlContainerItem();
 
+            this.button6 = new System.Windows.Forms.Button();
 
             this.dockSite_mainView.SuspendLayout();
 
             ((System.ComponentModel.ISupportInitialize)(this.bar_mainWin)).BeginInit();
 
             this.bar_mainWin.SuspendLayout();
 
@@ -231,9 +233,10 @@
 
             this.dockSite4.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
 
             this.dockSite4.Dock = System.Windows.Forms.DockStyle.Bottom;
 
             this.dockSite4.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer();
 
-            this.dockSite4.Location = new System.Drawing.Point(0, 705);
 
+            this.dockSite4.Location = new System.Drawing.Point(0, 881);
 
+            this.dockSite4.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite4.Name = "dockSite4";
 
-            this.dockSite4.Size = new System.Drawing.Size(1203, 0);
 
+            this.dockSite4.Size = new System.Drawing.Size(1604, 0);
 
             this.dockSite4.TabIndex = 3;
 
             this.dockSite4.TabStop = false;
 
             // 
@@ -249,9 +252,10 @@
 
                         ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_mainWin, 624, 391))),
 
                         ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_side, 256, 391)))}, DevComponents.DotNetBar.eOrientation.Horizontal))),
 
             ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_bottom, 886, 153)))}, DevComponents.DotNetBar.eOrientation.Vertical);
 
-            this.dockSite_mainView.Location = new System.Drawing.Point(0, 121);
 
+            this.dockSite_mainView.Location = new System.Drawing.Point(0, 130);
 
+            this.dockSite_mainView.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite_mainView.Name = "dockSite_mainView";
 
-            this.dockSite_mainView.Size = new System.Drawing.Size(892, 584);
 
+            this.dockSite_mainView.Size = new System.Drawing.Size(1189, 751);
 
             this.dockSite_mainView.TabIndex = 8;
 
             this.dockSite_mainView.TabStop = false;
 
             // 
@@ -268,11 +272,11 @@
 
             this.bar_mainWin.CanDockRight = false;
 
             this.bar_mainWin.CanDockTop = false;
 
             this.bar_mainWin.CanHide = true;
 
-            this.bar_mainWin.Controls.Add(this.pdc_devStatus);
 
+            this.bar_mainWin.Controls.Add(this.testPanel);
 
             this.bar_mainWin.Controls.Add(this.NumMachineMonitorPanel);
 
             this.bar_mainWin.Controls.Add(this.paymentPanel);
 
             this.bar_mainWin.Controls.Add(this.ParkingSpaceMonitorPanel);
 
-            this.bar_mainWin.Controls.Add(this.testPanel);
 
+            this.bar_mainWin.Controls.Add(this.pdc_devStatus);
 
             this.bar_mainWin.DockTabAlignment = DevComponents.DotNetBar.eTabStripAlignment.Top;
 
             this.bar_mainWin.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
             this.bar_mainWin.IsMaximized = false;
 
@@ -284,10 +288,11 @@
 
             this.dci_devStatus});
 
             this.bar_mainWin.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
 
             this.bar_mainWin.Location = new System.Drawing.Point(0, 0);
 
+            this.bar_mainWin.Margin = new System.Windows.Forms.Padding(4);
 
             this.bar_mainWin.Name = "bar_mainWin";
 
-            this.bar_mainWin.SelectedDockTab = 4;
 
+            this.bar_mainWin.SelectedDockTab = 3;
 
             this.bar_mainWin.SingleLineColor = System.Drawing.SystemColors.ControlDarkDark;
 
-            this.bar_mainWin.Size = new System.Drawing.Size(630, 379);
 
+            this.bar_mainWin.Size = new System.Drawing.Size(840, 529);
 
             this.bar_mainWin.Stretch = true;
 
             this.bar_mainWin.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
 
             this.bar_mainWin.TabIndex = 0;
 
@@ -296,6 +301,8 @@
 
             // 
             // testPanel
 
             // 
+            this.testPanel.Controls.Add(this.button6);
 
+            this.testPanel.Controls.Add(this.button5);
 
             this.testPanel.Controls.Add(this.button4);
 
             this.testPanel.Controls.Add(this.tableLayoutPanel3);
 
             this.testPanel.Controls.Add(this.button3);
 
@@ -309,8 +316,9 @@
 
             this.testPanel.Controls.Add(this.tableLayoutPanel1);
 
             this.testPanel.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.testPanel.Location = new System.Drawing.Point(3, 28);
 
+            this.testPanel.Margin = new System.Windows.Forms.Padding(4);
 
             this.testPanel.Name = "testPanel";
 
-            this.testPanel.Size = new System.Drawing.Size(624, 348);
 
+            this.testPanel.Size = new System.Drawing.Size(834, 498);
 
             this.testPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.testPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.testPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -318,11 +326,22 @@
 
             this.testPanel.Style.GradientAngle = 90;
 
             this.testPanel.TabIndex = 38;
 
             // 
+            // button5
 
+            // 
+            this.button5.Location = new System.Drawing.Point(357, 168);
 
+            this.button5.Name = "button5";
 
+            this.button5.Size = new System.Drawing.Size(126, 23);
 
+            this.button5.TabIndex = 19;
 
+            this.button5.Text = "空闲车位个数";
 
+            this.button5.UseVisualStyleBackColor = true;
 
+            this.button5.Click += new System.EventHandler(this.button5_Click);
 
+            // 
             // button4
 
             // 
-            this.button4.Location = new System.Drawing.Point(325, 85);
 
+            this.button4.Location = new System.Drawing.Point(433, 106);
 
+            this.button4.Margin = new System.Windows.Forms.Padding(4);
 
             this.button4.Name = "button4";
 
-            this.button4.Size = new System.Drawing.Size(75, 23);
 
+            this.button4.Size = new System.Drawing.Size(100, 29);
 
             this.button4.TabIndex = 18;
 
             this.button4.Text = "tlp测试";
 
             this.button4.UseVisualStyleBackColor = true;
 
@@ -334,12 +353,13 @@
 
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
 
             this.tableLayoutPanel3.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
 
             this.tableLayoutPanel3.Controls.Add(this.label1, 0, 0);
 
-            this.tableLayoutPanel3.Location = new System.Drawing.Point(406, 43);
 
+            this.tableLayoutPanel3.Location = new System.Drawing.Point(541, 54);
 
+            this.tableLayoutPanel3.Margin = new System.Windows.Forms.Padding(4);
 
             this.tableLayoutPanel3.Name = "tableLayoutPanel3";
 
             this.tableLayoutPanel3.RowCount = 2;
 
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
 
             this.tableLayoutPanel3.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F));
 
-            this.tableLayoutPanel3.Size = new System.Drawing.Size(200, 100);
 
+            this.tableLayoutPanel3.Size = new System.Drawing.Size(267, 125);
 
             this.tableLayoutPanel3.TabIndex = 17;
 
             // 
             // label1
 
@@ -348,19 +368,20 @@
 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
 
             this.label1.AutoSize = true;
 
-            this.label1.Location = new System.Drawing.Point(10, 10);
 
-            this.label1.Margin = new System.Windows.Forms.Padding(10);
 
+            this.label1.Location = new System.Drawing.Point(13, 12);
 
+            this.label1.Margin = new System.Windows.Forms.Padding(13, 12, 13, 12);
 
             this.label1.Name = "label1";
 
-            this.label1.Size = new System.Drawing.Size(80, 30);
 
+            this.label1.Size = new System.Drawing.Size(107, 38);
 
             this.label1.TabIndex = 0;
 
             this.label1.Text = "label1";
 
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
 
             // 
             // button3
 
             // 
-            this.button3.Location = new System.Drawing.Point(131, 72);
 
+            this.button3.Location = new System.Drawing.Point(175, 90);
 
+            this.button3.Margin = new System.Windows.Forms.Padding(4);
 
             this.button3.Name = "button3";
 
-            this.button3.Size = new System.Drawing.Size(114, 23);
 
+            this.button3.Size = new System.Drawing.Size(152, 29);
 
             this.button3.TabIndex = 16;
 
             this.button3.Text = "终端id获取测试";
 
             this.button3.UseVisualStyleBackColor = true;
 
@@ -375,9 +396,10 @@
 
             this.groupPanel2.Controls.Add(this.pictureBox4);
 
             this.groupPanel2.Controls.Add(this.pictureBox5);
 
             this.groupPanel2.DisabledBackColor = System.Drawing.Color.Empty;
 
-            this.groupPanel2.Location = new System.Drawing.Point(349, 247);
 
+            this.groupPanel2.Location = new System.Drawing.Point(465, 309);
 
+            this.groupPanel2.Margin = new System.Windows.Forms.Padding(4);
 
             this.groupPanel2.Name = "groupPanel2";
 
-            this.groupPanel2.Size = new System.Drawing.Size(110, 115);
 
+            this.groupPanel2.Size = new System.Drawing.Size(147, 144);
 
             // 
             // 
             // 
@@ -415,9 +437,10 @@
 
             | System.Windows.Forms.AnchorStyles.Right)));
 
             this.pictureBox4.Image = global::centralController.Properties.Resources.car;
 
             this.pictureBox4.InitialImage = null;
 
-            this.pictureBox4.Location = new System.Drawing.Point(25, 48);
 
+            this.pictureBox4.Location = new System.Drawing.Point(33, 60);
 
+            this.pictureBox4.Margin = new System.Windows.Forms.Padding(4);
 
             this.pictureBox4.Name = "pictureBox4";
 
-            this.pictureBox4.Size = new System.Drawing.Size(57, 43);
 
+            this.pictureBox4.Size = new System.Drawing.Size(76, 54);
 
             this.pictureBox4.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 
             this.pictureBox4.TabIndex = 0;
 
             this.pictureBox4.TabStop = false;
 
@@ -427,9 +450,10 @@
 
             this.pictureBox5.Anchor = System.Windows.Forms.AnchorStyles.Top;
 
             this.pictureBox5.Image = global::centralController.Properties.Resources.numMachine;
 
             this.pictureBox5.InitialImage = null;
 
-            this.pictureBox5.Location = new System.Drawing.Point(30, 1);
 
+            this.pictureBox5.Location = new System.Drawing.Point(40, 1);
 
+            this.pictureBox5.Margin = new System.Windows.Forms.Padding(4);
 
             this.pictureBox5.Name = "pictureBox5";
 
-            this.pictureBox5.Size = new System.Drawing.Size(50, 29);
 
+            this.pictureBox5.Size = new System.Drawing.Size(67, 36);
 
             this.pictureBox5.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 
             this.pictureBox5.TabIndex = 14;
 
             this.pictureBox5.TabStop = false;
 
@@ -443,9 +467,10 @@
 
             this.groupPanel1.Controls.Add(this.pictureBox2);
 
             this.groupPanel1.Controls.Add(this.pictureBox3);
 
             this.groupPanel1.DisabledBackColor = System.Drawing.Color.Empty;
 
-            this.groupPanel1.Location = new System.Drawing.Point(214, 247);
 
+            this.groupPanel1.Location = new System.Drawing.Point(285, 309);
 
+            this.groupPanel1.Margin = new System.Windows.Forms.Padding(4);
 
             this.groupPanel1.Name = "groupPanel1";
 
-            this.groupPanel1.Size = new System.Drawing.Size(110, 115);
 
+            this.groupPanel1.Size = new System.Drawing.Size(147, 144);
 
             // 
             // 
             // 
@@ -483,9 +508,10 @@
 
             | System.Windows.Forms.AnchorStyles.Right)));
 
             this.pictureBox2.Image = global::centralController.Properties.Resources.car;
 
             this.pictureBox2.InitialImage = null;
 
-            this.pictureBox2.Location = new System.Drawing.Point(23, 53);
 
+            this.pictureBox2.Location = new System.Drawing.Point(31, 66);
 
+            this.pictureBox2.Margin = new System.Windows.Forms.Padding(4);
 
             this.pictureBox2.Name = "pictureBox2";
 
-            this.pictureBox2.Size = new System.Drawing.Size(61, 43);
 
+            this.pictureBox2.Size = new System.Drawing.Size(81, 54);
 
             this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 
             this.pictureBox2.TabIndex = 0;
 
             this.pictureBox2.TabStop = false;
 
@@ -497,18 +523,20 @@
 
             this.pictureBox3.Cursor = System.Windows.Forms.Cursors.Default;
 
             this.pictureBox3.Image = global::centralController.Properties.Resources.numMachine;
 
             this.pictureBox3.InitialImage = null;
 
-            this.pictureBox3.Location = new System.Drawing.Point(27, 1);
 
+            this.pictureBox3.Location = new System.Drawing.Point(36, 1);
 
+            this.pictureBox3.Margin = new System.Windows.Forms.Padding(4);
 
             this.pictureBox3.Name = "pictureBox3";
 
-            this.pictureBox3.Size = new System.Drawing.Size(55, 29);
 
+            this.pictureBox3.Size = new System.Drawing.Size(73, 36);
 
             this.pictureBox3.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
 
             this.pictureBox3.TabIndex = 14;
 
             this.pictureBox3.TabStop = false;
 
             // 
             // button2
 
             // 
-            this.button2.Location = new System.Drawing.Point(151, 101);
 
+            this.button2.Location = new System.Drawing.Point(201, 126);
 
+            this.button2.Margin = new System.Windows.Forms.Padding(4);
 
             this.button2.Name = "button2";
 
-            this.button2.Size = new System.Drawing.Size(75, 23);
 
+            this.button2.Size = new System.Drawing.Size(100, 29);
 
             this.button2.TabIndex = 8;
 
             this.button2.Text = "屏显测试";
 
             this.button2.UseVisualStyleBackColor = true;
 
@@ -516,16 +544,18 @@
 
             // 
             // dateTimePicker1
 
             // 
-            this.dateTimePicker1.Location = new System.Drawing.Point(240, 199);
 
+            this.dateTimePicker1.Location = new System.Drawing.Point(320, 249);
 
+            this.dateTimePicker1.Margin = new System.Windows.Forms.Padding(4);
 
             this.dateTimePicker1.Name = "dateTimePicker1";
 
-            this.dateTimePicker1.Size = new System.Drawing.Size(200, 21);
 
+            this.dateTimePicker1.Size = new System.Drawing.Size(265, 25);
 
             this.dateTimePicker1.TabIndex = 7;
 
             // 
             // button1
 
             // 
-            this.button1.Location = new System.Drawing.Point(142, 43);
 
+            this.button1.Location = new System.Drawing.Point(189, 54);
 
+            this.button1.Margin = new System.Windows.Forms.Padding(4);
 
             this.button1.Name = "button1";
 
-            this.button1.Size = new System.Drawing.Size(95, 23);
 
+            this.button1.Size = new System.Drawing.Size(127, 29);
 
             this.button1.TabIndex = 6;
 
             this.button1.Text = "号牌获取测试";
 
             this.button1.UseVisualStyleBackColor = true;
 
@@ -533,16 +563,18 @@
 
             // 
             // textBox2
 
             // 
-            this.textBox2.Location = new System.Drawing.Point(205, 16);
 
+            this.textBox2.Location = new System.Drawing.Point(273, 20);
 
+            this.textBox2.Margin = new System.Windows.Forms.Padding(4);
 
             this.textBox2.Name = "textBox2";
 
-            this.textBox2.Size = new System.Drawing.Size(100, 21);
 
+            this.textBox2.Size = new System.Drawing.Size(132, 25);
 
             this.textBox2.TabIndex = 5;
 
             // 
             // textBox1
 
             // 
-            this.textBox1.Location = new System.Drawing.Point(74, 16);
 
+            this.textBox1.Location = new System.Drawing.Point(99, 20);
 
+            this.textBox1.Margin = new System.Windows.Forms.Padding(4);
 
             this.textBox1.Name = "textBox1";
 
-            this.textBox1.Size = new System.Drawing.Size(100, 21);
 
+            this.textBox1.Size = new System.Drawing.Size(132, 25);
 
             this.textBox1.TabIndex = 4;
 
             // 
             // tableLayoutPanel1
 
@@ -552,19 +584,21 @@
 
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
 
             this.tableLayoutPanel1.Controls.Add(this.pictureBox1, 0, 1);
 
             this.tableLayoutPanel1.Controls.Add(this.labelX1, 0, 0);
 
-            this.tableLayoutPanel1.Location = new System.Drawing.Point(12, 194);
 
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(16, 242);
 
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
 
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
 
             this.tableLayoutPanel1.RowCount = 2;
 
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20F));
 
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 80F));
 
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(185, 168);
 
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(247, 210);
 
             this.tableLayoutPanel1.TabIndex = 3;
 
             // 
             // pictureBox1
 
             // 
-            this.pictureBox1.Location = new System.Drawing.Point(3, 36);
 
+            this.pictureBox1.Location = new System.Drawing.Point(4, 46);
 
+            this.pictureBox1.Margin = new System.Windows.Forms.Padding(4);
 
             this.pictureBox1.Name = "pictureBox1";
 
-            this.pictureBox1.Size = new System.Drawing.Size(179, 127);
 
+            this.pictureBox1.Size = new System.Drawing.Size(239, 159);
 
             this.pictureBox1.TabIndex = 2;
 
             this.pictureBox1.TabStop = false;
 
             // 
@@ -574,9 +608,10 @@
 
             // 
             // 
             this.labelX1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
-            this.labelX1.Location = new System.Drawing.Point(3, 3);
 
+            this.labelX1.Location = new System.Drawing.Point(4, 4);
 
+            this.labelX1.Margin = new System.Windows.Forms.Padding(4);
 
             this.labelX1.Name = "labelX1";
 
-            this.labelX1.Size = new System.Drawing.Size(179, 27);
 
+            this.labelX1.Size = new System.Drawing.Size(239, 34);
 
             this.labelX1.TabIndex = 3;
 
             this.labelX1.Text = "label1\r\nlable2";
 
             this.labelX1.TextAlignment = System.Drawing.StringAlignment.Center;
 
@@ -586,8 +621,9 @@
 
             this.NumMachineMonitorPanel.Controls.Add(this.flowLayoutPanel1);
 
             this.NumMachineMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.NumMachineMonitorPanel.Location = new System.Drawing.Point(3, 28);
 
+            this.NumMachineMonitorPanel.Margin = new System.Windows.Forms.Padding(4);
 
             this.NumMachineMonitorPanel.Name = "NumMachineMonitorPanel";
 
-            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(624, 348);
 
+            this.NumMachineMonitorPanel.Size = new System.Drawing.Size(834, 498);
 
             this.NumMachineMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.NumMachineMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.NumMachineMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -600,8 +636,9 @@
 
             this.flowLayoutPanel1.BackColor = System.Drawing.SystemColors.GradientActiveCaption;
 
             this.flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0);
 
+            this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(4);
 
             this.flowLayoutPanel1.Name = "flowLayoutPanel1";
 
-            this.flowLayoutPanel1.Size = new System.Drawing.Size(624, 348);
 
+            this.flowLayoutPanel1.Size = new System.Drawing.Size(834, 498);
 
             this.flowLayoutPanel1.TabIndex = 1;
 
             this.flowLayoutPanel1.Resize += new System.EventHandler(this.flowLayoutPanel1_Resize);
 
             // 
@@ -611,8 +648,9 @@
 
             this.paymentPanel.Controls.Add(this.tlp_paymentFilter);
 
             this.paymentPanel.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.paymentPanel.Location = new System.Drawing.Point(3, 28);
 
+            this.paymentPanel.Margin = new System.Windows.Forms.Padding(4);
 
             this.paymentPanel.Name = "paymentPanel";
 
-            this.paymentPanel.Size = new System.Drawing.Size(624, 348);
 
+            this.paymentPanel.Size = new System.Drawing.Size(834, 498);
 
             this.paymentPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.paymentPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.paymentPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -644,12 +682,13 @@
 
             this.dgvx_payment.DefaultCellStyle = dataGridViewCellStyle1;
 
             this.dgvx_payment.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.dgvx_payment.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
 
-            this.dgvx_payment.Location = new System.Drawing.Point(0, 66);
 
-            this.dgvx_payment.MinimumSize = new System.Drawing.Size(389, 0);
 
+            this.dgvx_payment.Location = new System.Drawing.Point(0, 82);
 
+            this.dgvx_payment.Margin = new System.Windows.Forms.Padding(4);
 
+            this.dgvx_payment.MinimumSize = new System.Drawing.Size(519, 0);
 
             this.dgvx_payment.Name = "dgvx_payment";
 
             this.dgvx_payment.RowTemplate.Height = 23;
 
             this.dgvx_payment.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
 
-            this.dgvx_payment.Size = new System.Drawing.Size(624, 282);
 
+            this.dgvx_payment.Size = new System.Drawing.Size(834, 416);
 
             this.dgvx_payment.TabIndex = 4;
 
             this.dgvx_payment.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dgvx_payment_CellEndEdit);
 
             // 
@@ -732,14 +771,14 @@
 
             // tlp_paymentFilter
 
             // 
             this.tlp_paymentFilter.ColumnCount = 7;
 
-            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
 
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 113F));
 
             this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
 
-            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
 
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 113F));
 
             this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33334F));
 
-            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 85F));
 
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 113F));
 
             this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 33.33332F));
 
-            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 97F));
 
-            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
 
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 138F));
 
+            this.tlp_paymentFilter.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 27F));
 
             this.tlp_paymentFilter.Controls.Add(this.dtp_paymentEndDate, 3, 0);
 
             this.tlp_paymentFilter.Controls.Add(this.lbx_paymentStartDate, 0, 0);
 
             this.tlp_paymentFilter.Controls.Add(this.lbx_paymentEndDate, 2, 0);
 
@@ -750,10 +789,11 @@
 
             this.tlp_paymentFilter.Dock = System.Windows.Forms.DockStyle.Top;
 
             this.tlp_paymentFilter.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
             this.tlp_paymentFilter.Location = new System.Drawing.Point(0, 0);
 
+            this.tlp_paymentFilter.Margin = new System.Windows.Forms.Padding(4);
 
             this.tlp_paymentFilter.Name = "tlp_paymentFilter";
 
             this.tlp_paymentFilter.RowCount = 1;
 
             this.tlp_paymentFilter.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
 
-            this.tlp_paymentFilter.Size = new System.Drawing.Size(624, 66);
 
+            this.tlp_paymentFilter.Size = new System.Drawing.Size(834, 82);
 
             this.tlp_paymentFilter.TabIndex = 3;
 
             // 
             // dtp_paymentEndDate
 
@@ -761,9 +801,10 @@
 
             this.dtp_paymentEndDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
 
             this.dtp_paymentEndDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
             this.dtp_paymentEndDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
-            this.dtp_paymentEndDate.Location = new System.Drawing.Point(263, 20);
 
+            this.dtp_paymentEndDate.Location = new System.Drawing.Point(349, 25);
 
+            this.dtp_paymentEndDate.Margin = new System.Windows.Forms.Padding(4);
 
             this.dtp_paymentEndDate.Name = "dtp_paymentEndDate";
 
-            this.dtp_paymentEndDate.Size = new System.Drawing.Size(84, 26);
 
+            this.dtp_paymentEndDate.Size = new System.Drawing.Size(111, 31);
 
             this.dtp_paymentEndDate.TabIndex = 12;
 
             // 
             // lbx_paymentStartDate
 
@@ -774,9 +815,10 @@
 
             this.lbx_paymentStartDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
             this.lbx_paymentStartDate.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.lbx_paymentStartDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
-            this.lbx_paymentStartDate.Location = new System.Drawing.Point(3, 3);
 
+            this.lbx_paymentStartDate.Location = new System.Drawing.Point(4, 4);
 
+            this.lbx_paymentStartDate.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_paymentStartDate.Name = "lbx_paymentStartDate";
 
-            this.lbx_paymentStartDate.Size = new System.Drawing.Size(79, 60);
 
+            this.lbx_paymentStartDate.Size = new System.Drawing.Size(105, 74);
 
             this.lbx_paymentStartDate.TabIndex = 3;
 
             this.lbx_paymentStartDate.Text = "起始日期:";
 
             // 
@@ -788,9 +830,10 @@
 
             this.lbx_paymentEndDate.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
             this.lbx_paymentEndDate.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.lbx_paymentEndDate.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
-            this.lbx_paymentEndDate.Location = new System.Drawing.Point(178, 3);
 
+            this.lbx_paymentEndDate.Location = new System.Drawing.Point(236, 4);
 
+            this.lbx_paymentEndDate.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_paymentEndDate.Name = "lbx_paymentEndDate";
 
-            this.lbx_paymentEndDate.Size = new System.Drawing.Size(79, 60);
 
+            this.lbx_paymentEndDate.Size = new System.Drawing.Size(105, 74);
 
             this.lbx_paymentEndDate.TabIndex = 4;
 
             this.lbx_paymentEndDate.Text = "截止日期:";
 
             // 
@@ -800,9 +843,10 @@
 
             this.btnx_paymentSearch.Anchor = System.Windows.Forms.AnchorStyles.Left;
 
             this.btnx_paymentSearch.ColorTable = DevComponents.DotNetBar.eButtonColor.OrangeWithBackground;
 
             this.btnx_paymentSearch.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
-            this.btnx_paymentSearch.Location = new System.Drawing.Point(528, 15);
 
+            this.btnx_paymentSearch.Location = new System.Drawing.Point(699, 19);
 
+            this.btnx_paymentSearch.Margin = new System.Windows.Forms.Padding(4);
 
             this.btnx_paymentSearch.Name = "btnx_paymentSearch";
 
-            this.btnx_paymentSearch.Size = new System.Drawing.Size(74, 35);
 
+            this.btnx_paymentSearch.Size = new System.Drawing.Size(99, 44);
 
             this.btnx_paymentSearch.Style = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled;
 
             this.btnx_paymentSearch.TabIndex = 7;
 
             this.btnx_paymentSearch.Text = "查询";
 
@@ -816,18 +860,20 @@
 
             this.lbx_paymentLicense.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
             this.lbx_paymentLicense.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.lbx_paymentLicense.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
-            this.lbx_paymentLicense.Location = new System.Drawing.Point(353, 3);
 
+            this.lbx_paymentLicense.Location = new System.Drawing.Point(468, 4);
 
+            this.lbx_paymentLicense.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_paymentLicense.Name = "lbx_paymentLicense";
 
-            this.lbx_paymentLicense.Size = new System.Drawing.Size(79, 60);
 
+            this.lbx_paymentLicense.Size = new System.Drawing.Size(105, 74);
 
             this.lbx_paymentLicense.TabIndex = 9;
 
             this.lbx_paymentLicense.Text = "车辆号牌:";
 
             // 
             // tb_paymentLicense
 
             // 
             this.tb_paymentLicense.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
 
-            this.tb_paymentLicense.Location = new System.Drawing.Point(438, 20);
 
+            this.tb_paymentLicense.Location = new System.Drawing.Point(581, 26);
 
+            this.tb_paymentLicense.Margin = new System.Windows.Forms.Padding(4);
 
             this.tb_paymentLicense.Name = "tb_paymentLicense";
 
-            this.tb_paymentLicense.Size = new System.Drawing.Size(84, 26);
 
+            this.tb_paymentLicense.Size = new System.Drawing.Size(110, 30);
 
             this.tb_paymentLicense.TabIndex = 10;
 
             // 
             // dtp_paymentStartDate
 
@@ -835,17 +881,19 @@
 
             this.dtp_paymentStartDate.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
 
             this.dtp_paymentStartDate.CalendarFont = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
             this.dtp_paymentStartDate.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
-            this.dtp_paymentStartDate.Location = new System.Drawing.Point(88, 20);
 
+            this.dtp_paymentStartDate.Location = new System.Drawing.Point(117, 25);
 
+            this.dtp_paymentStartDate.Margin = new System.Windows.Forms.Padding(4);
 
             this.dtp_paymentStartDate.Name = "dtp_paymentStartDate";
 
-            this.dtp_paymentStartDate.Size = new System.Drawing.Size(84, 26);
 
+            this.dtp_paymentStartDate.Size = new System.Drawing.Size(111, 31);
 
             this.dtp_paymentStartDate.TabIndex = 11;
 
             // 
             // ParkingSpaceMonitorPanel
 
             // 
             this.ParkingSpaceMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.ParkingSpaceMonitorPanel.Location = new System.Drawing.Point(3, 28);
 
+            this.ParkingSpaceMonitorPanel.Margin = new System.Windows.Forms.Padding(4);
 
             this.ParkingSpaceMonitorPanel.Name = "ParkingSpaceMonitorPanel";
 
-            this.ParkingSpaceMonitorPanel.Size = new System.Drawing.Size(624, 348);
 
+            this.ParkingSpaceMonitorPanel.Size = new System.Drawing.Size(834, 498);
 
             this.ParkingSpaceMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.ParkingSpaceMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.ParkingSpaceMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -859,8 +907,9 @@
 
             this.pdc_devStatus.Controls.Add(this.panel1);
 
             this.pdc_devStatus.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.pdc_devStatus.Location = new System.Drawing.Point(3, 28);
 
+            this.pdc_devStatus.Margin = new System.Windows.Forms.Padding(4);
 
             this.pdc_devStatus.Name = "pdc_devStatus";
 
-            this.pdc_devStatus.Size = new System.Drawing.Size(624, 348);
 
+            this.pdc_devStatus.Size = new System.Drawing.Size(834, 498);
 
             this.pdc_devStatus.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.pdc_devStatus.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.pdc_devStatus.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -874,8 +923,9 @@
 
             this.panel1.Controls.Add(this.tableLayoutPanel2);
 
             this.panel1.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.panel1.Location = new System.Drawing.Point(0, 0);
 
+            this.panel1.Margin = new System.Windows.Forms.Padding(4);
 
             this.panel1.Name = "panel1";
 
-            this.panel1.Size = new System.Drawing.Size(624, 348);
 
+            this.panel1.Size = new System.Drawing.Size(834, 498);
 
             this.panel1.TabIndex = 2;
 
             // 
             // tableLayoutPanel2
 
@@ -890,7 +940,8 @@
 
             this.tableLayoutPanel2.Controls.Add(this.lbx_PLC, 0, 0);
 
             this.tableLayoutPanel2.Controls.Add(this.lbx_web, 0, 1);
 
             this.tableLayoutPanel2.Controls.Add(this.lbx_led1Status, 1, 2);
 
-            this.tableLayoutPanel2.Location = new System.Drawing.Point(12, 12);
 
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(16, 15);
 
+            this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(4);
 
             this.tableLayoutPanel2.Name = "tableLayoutPanel2";
 
             this.tableLayoutPanel2.RowCount = 5;
 
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.99841F));
 
@@ -898,7 +949,7 @@
 
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 19.9984F));
 
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20.0024F));
 
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 20.0024F));
 
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(170, 190);
 
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(227, 238);
 
             this.tableLayoutPanel2.TabIndex = 1;
 
             // 
             // lbx_webStatus
 
@@ -909,9 +960,10 @@
 
             // 
             // 
             this.lbx_webStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
-            this.lbx_webStatus.Location = new System.Drawing.Point(106, 40);
 
+            this.lbx_webStatus.Location = new System.Drawing.Point(141, 51);
 
+            this.lbx_webStatus.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_webStatus.Name = "lbx_webStatus";
 
-            this.lbx_webStatus.Size = new System.Drawing.Size(43, 31);
 
+            this.lbx_webStatus.Size = new System.Drawing.Size(57, 39);
 
             this.lbx_webStatus.Symbol = "";
 
             this.lbx_webStatus.SymbolColor = System.Drawing.Color.Crimson;
 
             this.lbx_webStatus.SymbolSize = 25F;
 
@@ -924,9 +976,10 @@
 
             // 
             this.lbx_led1.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
             this.lbx_led1.Dock = System.Windows.Forms.DockStyle.Fill;
 
-            this.lbx_led1.Location = new System.Drawing.Point(3, 77);
 
+            this.lbx_led1.Location = new System.Drawing.Point(4, 98);
 
+            this.lbx_led1.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_led1.Name = "lbx_led1";
 
-            this.lbx_led1.Size = new System.Drawing.Size(79, 31);
 
+            this.lbx_led1.Size = new System.Drawing.Size(105, 39);
 
             this.lbx_led1.TabIndex = 4;
 
             this.lbx_led1.Text = "led屏1";
 
             this.lbx_led1.TextAlignment = System.Drawing.StringAlignment.Center;
 
@@ -939,9 +992,10 @@
 
             // 
             // 
             this.lbx_PLCStatus.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
-            this.lbx_PLCStatus.Location = new System.Drawing.Point(105, 3);
 
+            this.lbx_PLCStatus.Location = new System.Drawing.Point(140, 4);
 
+            this.lbx_PLCStatus.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_PLCStatus.Name = "lbx_PLCStatus";
 
-            this.lbx_PLCStatus.Size = new System.Drawing.Size(44, 31);
 
+            this.lbx_PLCStatus.Size = new System.Drawing.Size(59, 39);
 
             this.lbx_PLCStatus.Symbol = "";
 
             this.lbx_PLCStatus.SymbolColor = System.Drawing.Color.Crimson;
 
             this.lbx_PLCStatus.SymbolSize = 25F;
 
@@ -954,9 +1008,10 @@
 
             // 
             this.lbx_PLC.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
             this.lbx_PLC.Dock = System.Windows.Forms.DockStyle.Fill;
 
-            this.lbx_PLC.Location = new System.Drawing.Point(3, 3);
 
+            this.lbx_PLC.Location = new System.Drawing.Point(4, 4);
 
+            this.lbx_PLC.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_PLC.Name = "lbx_PLC";
 
-            this.lbx_PLC.Size = new System.Drawing.Size(79, 31);
 
+            this.lbx_PLC.Size = new System.Drawing.Size(105, 39);
 
             this.lbx_PLC.TabIndex = 0;
 
             this.lbx_PLC.Text = "PLC";
 
             this.lbx_PLC.TextAlignment = System.Drawing.StringAlignment.Center;
 
@@ -968,9 +1023,10 @@
 
             // 
             this.lbx_web.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
             this.lbx_web.Dock = System.Windows.Forms.DockStyle.Fill;
 
-            this.lbx_web.Location = new System.Drawing.Point(3, 40);
 
+            this.lbx_web.Location = new System.Drawing.Point(4, 51);
 
+            this.lbx_web.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_web.Name = "lbx_web";
 
-            this.lbx_web.Size = new System.Drawing.Size(79, 31);
 
+            this.lbx_web.Size = new System.Drawing.Size(105, 39);
 
             this.lbx_web.TabIndex = 1;
 
             this.lbx_web.Text = "web服务器";
 
             this.lbx_web.TextAlignment = System.Drawing.StringAlignment.Center;
 
@@ -983,9 +1039,10 @@
 
             // 
             // 
             this.lbx_led1Status.BackgroundStyle.CornerType = DevComponents.DotNetBar.eCornerType.Square;
 
-            this.lbx_led1Status.Location = new System.Drawing.Point(106, 77);
 
+            this.lbx_led1Status.Location = new System.Drawing.Point(141, 98);
 
+            this.lbx_led1Status.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_led1Status.Name = "lbx_led1Status";
 
-            this.lbx_led1Status.Size = new System.Drawing.Size(43, 31);
 
+            this.lbx_led1Status.Size = new System.Drawing.Size(57, 39);
 
             this.lbx_led1Status.Symbol = "";
 
             this.lbx_led1Status.SymbolColor = System.Drawing.Color.Crimson;
 
             this.lbx_led1Status.SymbolSize = 25F;
 
@@ -1042,10 +1099,11 @@
 
             this.bar_bottom.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
 
             this.dci_ParkingRecords});
 
             this.bar_bottom.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
 
-            this.bar_bottom.Location = new System.Drawing.Point(0, 382);
 
+            this.bar_bottom.Location = new System.Drawing.Point(0, 532);
 
+            this.bar_bottom.Margin = new System.Windows.Forms.Padding(4);
 
             this.bar_bottom.Name = "bar_bottom";
 
             this.bar_bottom.SelectedDockTab = 0;
 
-            this.bar_bottom.Size = new System.Drawing.Size(892, 202);
 
+            this.bar_bottom.Size = new System.Drawing.Size(1189, 219);
 
             this.bar_bottom.Stretch = true;
 
             this.bar_bottom.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
 
             this.bar_bottom.TabIndex = 1;
 
@@ -1056,8 +1114,9 @@
 
             this.RecordsMonitorPanel.Controls.Add(this.dgvx_parkingRecords);
 
             this.RecordsMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.RecordsMonitorPanel.Location = new System.Drawing.Point(3, 28);
 
+            this.RecordsMonitorPanel.Margin = new System.Windows.Forms.Padding(4);
 
             this.RecordsMonitorPanel.Name = "RecordsMonitorPanel";
 
-            this.RecordsMonitorPanel.Size = new System.Drawing.Size(886, 171);
 
+            this.RecordsMonitorPanel.Size = new System.Drawing.Size(1183, 188);
 
             this.RecordsMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.RecordsMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.RecordsMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -1090,9 +1149,10 @@
 
             this.dgvx_parkingRecords.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.dgvx_parkingRecords.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(208)))), ((int)(((byte)(215)))), ((int)(((byte)(229)))));
 
             this.dgvx_parkingRecords.Location = new System.Drawing.Point(0, 0);
 
+            this.dgvx_parkingRecords.Margin = new System.Windows.Forms.Padding(4);
 
             this.dgvx_parkingRecords.Name = "dgvx_parkingRecords";
 
             this.dgvx_parkingRecords.RowTemplate.Height = 23;
 
-            this.dgvx_parkingRecords.Size = new System.Drawing.Size(886, 171);
 
+            this.dgvx_parkingRecords.Size = new System.Drawing.Size(1183, 188);
 
             this.dgvx_parkingRecords.TabIndex = 0;
 
             // 
             // parkingRecordsID
 
@@ -1196,11 +1256,12 @@
 
             this.bar_side.Items.AddRange(new DevComponents.DotNetBar.BaseItem[] {
 
             this.dci_terminal});
 
             this.bar_side.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
 
-            this.bar_side.Location = new System.Drawing.Point(633, 0);
 
+            this.bar_side.Location = new System.Drawing.Point(843, 0);
 
+            this.bar_side.Margin = new System.Windows.Forms.Padding(4);
 
             this.bar_side.Name = "bar_side";
 
             this.bar_side.SelectedDockTab = 0;
 
             this.bar_side.SingleLineColor = System.Drawing.SystemColors.ActiveCaptionText;
 
-            this.bar_side.Size = new System.Drawing.Size(259, 379);
 
+            this.bar_side.Size = new System.Drawing.Size(346, 529);
 
             this.bar_side.Stretch = true;
 
             this.bar_side.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
 
             this.bar_side.TabIndex = 2;
 
@@ -1211,8 +1272,9 @@
 
             this.terminalMonitorPanel.Controls.Add(this.flp_Term);
 
             this.terminalMonitorPanel.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.terminalMonitorPanel.Location = new System.Drawing.Point(3, 28);
 
+            this.terminalMonitorPanel.Margin = new System.Windows.Forms.Padding(4);
 
             this.terminalMonitorPanel.Name = "terminalMonitorPanel";
 
-            this.terminalMonitorPanel.Size = new System.Drawing.Size(253, 348);
 
+            this.terminalMonitorPanel.Size = new System.Drawing.Size(340, 498);
 
             this.terminalMonitorPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.terminalMonitorPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.terminalMonitorPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -1225,9 +1287,10 @@
 
             this.flp_Term.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
 
             this.flp_Term.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.flp_Term.Location = new System.Drawing.Point(0, 0);
 
+            this.flp_Term.Margin = new System.Windows.Forms.Padding(4);
 
             this.flp_Term.Name = "flp_Term";
 
-            this.flp_Term.Padding = new System.Windows.Forms.Padding(5);
 
-            this.flp_Term.Size = new System.Drawing.Size(253, 348);
 
+            this.flp_Term.Padding = new System.Windows.Forms.Padding(7, 6, 7, 6);
 
+            this.flp_Term.Size = new System.Drawing.Size(340, 498);
 
             this.flp_Term.TabIndex = 0;
 
             // 
             // dci_terminal
 
@@ -1243,8 +1306,9 @@
 
             this.dockSite1.Dock = System.Windows.Forms.DockStyle.Left;
 
             this.dockSite1.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer();
 
             this.dockSite1.Location = new System.Drawing.Point(0, 0);
 
+            this.dockSite1.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite1.Name = "dockSite1";
 
-            this.dockSite1.Size = new System.Drawing.Size(0, 705);
 
+            this.dockSite1.Size = new System.Drawing.Size(0, 881);
 
             this.dockSite1.TabIndex = 0;
 
             this.dockSite1.TabStop = false;
 
             // 
@@ -1255,10 +1319,11 @@
 
             this.dockSite_notification.Controls.Add(this.bar_notification);
 
             this.dockSite_notification.Dock = System.Windows.Forms.DockStyle.Right;
 
             this.dockSite_notification.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer(new DevComponents.DotNetBar.DocumentBaseContainer[] {
 
-            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_notification, 308, 584)))}, DevComponents.DotNetBar.eOrientation.Vertical);
 
-            this.dockSite_notification.Location = new System.Drawing.Point(892, 121);
 
+            ((DevComponents.DotNetBar.DocumentBaseContainer)(new DevComponents.DotNetBar.DocumentBarContainer(this.bar_notification, 412, 751)))}, DevComponents.DotNetBar.eOrientation.Vertical);
 
+            this.dockSite_notification.Location = new System.Drawing.Point(1189, 130);
 
+            this.dockSite_notification.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite_notification.Name = "dockSite_notification";
 
-            this.dockSite_notification.Size = new System.Drawing.Size(311, 584);
 
+            this.dockSite_notification.Size = new System.Drawing.Size(415, 751);
 
             this.dockSite_notification.TabIndex = 1;
 
             this.dockSite_notification.TabStop = false;
 
             // 
@@ -1278,8 +1343,9 @@
 
             this.dci_warning});
 
             this.bar_notification.LayoutType = DevComponents.DotNetBar.eLayoutType.DockContainer;
 
             this.bar_notification.Location = new System.Drawing.Point(3, 0);
 
+            this.bar_notification.Margin = new System.Windows.Forms.Padding(4);
 
             this.bar_notification.Name = "bar_notification";
 
-            this.bar_notification.Size = new System.Drawing.Size(308, 584);
 
+            this.bar_notification.Size = new System.Drawing.Size(412, 751);
 
             this.bar_notification.Stretch = true;
 
             this.bar_notification.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
 
             this.bar_notification.TabIndex = 1;
 
@@ -1292,8 +1358,9 @@
 
             this.warningPanel.Controls.Add(this.progressBar1);
 
             this.warningPanel.DisabledBackColor = System.Drawing.Color.Empty;
 
             this.warningPanel.Location = new System.Drawing.Point(3, 23);
 
+            this.warningPanel.Margin = new System.Windows.Forms.Padding(4);
 
             this.warningPanel.Name = "warningPanel";
 
-            this.warningPanel.Size = new System.Drawing.Size(302, 558);
 
+            this.warningPanel.Size = new System.Drawing.Size(406, 725);
 
             this.warningPanel.Style.Alignment = System.Drawing.StringAlignment.Center;
 
             this.warningPanel.Style.BackColor1.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarBackground;
 
             this.warningPanel.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.BarDockedBorder;
 
@@ -1309,18 +1376,20 @@
 
             this.rtb_notification.Dock = System.Windows.Forms.DockStyle.Fill;
 
             this.rtb_notification.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
 
             this.rtb_notification.Location = new System.Drawing.Point(0, 0);
 
+            this.rtb_notification.Margin = new System.Windows.Forms.Padding(4);
 
             this.rtb_notification.Name = "rtb_notification";
 
             this.rtb_notification.ReadOnly = true;
 
-            this.rtb_notification.Size = new System.Drawing.Size(302, 537);
 
+            this.rtb_notification.Size = new System.Drawing.Size(406, 699);
 
             this.rtb_notification.TabIndex = 1;
 
             this.rtb_notification.Text = "";
 
             // 
             // progressBar1
 
             // 
             this.progressBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
 
-            this.progressBar1.Location = new System.Drawing.Point(0, 537);
 
+            this.progressBar1.Location = new System.Drawing.Point(0, 699);
 
+            this.progressBar1.Margin = new System.Windows.Forms.Padding(4);
 
             this.progressBar1.Name = "progressBar1";
 
-            this.progressBar1.Size = new System.Drawing.Size(302, 21);
 
+            this.progressBar1.Size = new System.Drawing.Size(406, 26);
 
             this.progressBar1.Step = 20;
 
             this.progressBar1.Style = System.Windows.Forms.ProgressBarStyle.Continuous;
 
             this.progressBar1.TabIndex = 0;
 
@@ -1335,9 +1404,10 @@
 
             // 
             this.dockSite8.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
 
             this.dockSite8.Dock = System.Windows.Forms.DockStyle.Bottom;
 
-            this.dockSite8.Location = new System.Drawing.Point(0, 705);
 
+            this.dockSite8.Location = new System.Drawing.Point(0, 881);
 
+            this.dockSite8.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite8.Name = "dockSite8";
 
-            this.dockSite8.Size = new System.Drawing.Size(1203, 0);
 
+            this.dockSite8.Size = new System.Drawing.Size(1604, 0);
 
             this.dockSite8.TabIndex = 7;
 
             this.dockSite8.TabStop = false;
 
             // 
@@ -1346,8 +1416,9 @@
 
             this.dockSite5.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
 
             this.dockSite5.Dock = System.Windows.Forms.DockStyle.Left;
 
             this.dockSite5.Location = new System.Drawing.Point(0, 0);
 
+            this.dockSite5.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite5.Name = "dockSite5";
 
-            this.dockSite5.Size = new System.Drawing.Size(0, 705);
 
+            this.dockSite5.Size = new System.Drawing.Size(0, 881);
 
             this.dockSite5.TabIndex = 4;
 
             this.dockSite5.TabStop = false;
 
             // 
@@ -1355,9 +1426,10 @@
 
             // 
             this.dockSite6.AccessibleRole = System.Windows.Forms.AccessibleRole.Window;
 
             this.dockSite6.Dock = System.Windows.Forms.DockStyle.Right;
 
-            this.dockSite6.Location = new System.Drawing.Point(1203, 0);
 
+            this.dockSite6.Location = new System.Drawing.Point(1604, 0);
 
+            this.dockSite6.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite6.Name = "dockSite6";
 
-            this.dockSite6.Size = new System.Drawing.Size(0, 705);
 
+            this.dockSite6.Size = new System.Drawing.Size(0, 881);
 
             this.dockSite6.TabIndex = 5;
 
             this.dockSite6.TabStop = false;
 
             // 
@@ -1368,8 +1440,9 @@
 
             this.dockSite_menu.Controls.Add(this.bar_shortcut);
 
             this.dockSite_menu.Dock = System.Windows.Forms.DockStyle.Top;
 
             this.dockSite_menu.Location = new System.Drawing.Point(0, 0);
 
+            this.dockSite_menu.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite_menu.Name = "dockSite_menu";
 
-            this.dockSite_menu.Size = new System.Drawing.Size(1203, 121);
 
+            this.dockSite_menu.Size = new System.Drawing.Size(1604, 130);
 
             this.dockSite_menu.TabIndex = 6;
 
             this.dockSite_menu.TabStop = false;
 
             // 
@@ -1389,9 +1462,10 @@
 
             this.btn_devices,
 
             this.btn_support});
 
             this.bar_Menu.Location = new System.Drawing.Point(0, 0);
 
+            this.bar_Menu.Margin = new System.Windows.Forms.Padding(4);
 
             this.bar_Menu.MenuBar = true;
 
             this.bar_Menu.Name = "bar_Menu";
 
-            this.bar_Menu.Size = new System.Drawing.Size(1203, 26);
 
+            this.bar_Menu.Size = new System.Drawing.Size(1604, 30);
 
             this.bar_Menu.Stretch = true;
 
             this.bar_Menu.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
 
             this.bar_Menu.TabIndex = 0;
 
@@ -1592,10 +1666,11 @@
 
             this.shortcut_sysInfo,
 
             this.shortcut_about,
 
             this.shortcut_close});
 
-            this.bar_shortcut.Location = new System.Drawing.Point(0, 27);
 
+            this.bar_shortcut.Location = new System.Drawing.Point(0, 31);
 
+            this.bar_shortcut.Margin = new System.Windows.Forms.Padding(4);
 
             this.bar_shortcut.MenuBar = true;
 
             this.bar_shortcut.Name = "bar_shortcut";
 
-            this.bar_shortcut.Size = new System.Drawing.Size(1203, 93);
 
+            this.bar_shortcut.Size = new System.Drawing.Size(1604, 98);
 
             this.bar_shortcut.Stretch = true;
 
             this.bar_shortcut.Style = DevComponents.DotNetBar.eDotNetBarStyle.Office2003;
 
             this.bar_shortcut.TabIndex = 1;
 
@@ -1606,9 +1681,10 @@
 
             // 
             this.panel_freeSpace.Controls.Add(this.lbx_freeSpace);
 
             this.panel_freeSpace.Dock = System.Windows.Forms.DockStyle.Right;
 
-            this.panel_freeSpace.Location = new System.Drawing.Point(875, 0);
 
+            this.panel_freeSpace.Location = new System.Drawing.Point(1167, 0);
 
+            this.panel_freeSpace.Margin = new System.Windows.Forms.Padding(4);
 
             this.panel_freeSpace.Name = "panel_freeSpace";
 
-            this.panel_freeSpace.Size = new System.Drawing.Size(328, 93);
 
+            this.panel_freeSpace.Size = new System.Drawing.Size(437, 98);
 
             this.panel_freeSpace.TabIndex = 3;
 
             // 
             // lbx_freeSpace
 
@@ -1623,8 +1699,9 @@
 
             this.lbx_freeSpace.FontBold = true;
 
             this.lbx_freeSpace.ForeColor = System.Drawing.Color.Tomato;
 
             this.lbx_freeSpace.Location = new System.Drawing.Point(0, 0);
 
+            this.lbx_freeSpace.Margin = new System.Windows.Forms.Padding(4);
 
             this.lbx_freeSpace.Name = "lbx_freeSpace";
 
-            this.lbx_freeSpace.Size = new System.Drawing.Size(328, 93);
 
+            this.lbx_freeSpace.Size = new System.Drawing.Size(437, 98);
 
             this.lbx_freeSpace.TabIndex = 2;
 
             this.lbx_freeSpace.Text = "currentFreeSpace";
 
             this.lbx_freeSpace.TextAlignment = System.Drawing.StringAlignment.Center;
 
@@ -1703,8 +1780,9 @@
 
             this.dockSite3.DocumentDockContainer = new DevComponents.DotNetBar.DocumentDockContainer();
 
             this.dockSite3.ForeColor = System.Drawing.SystemColors.ActiveCaptionText;
 
             this.dockSite3.Location = new System.Drawing.Point(0, 0);
 
+            this.dockSite3.Margin = new System.Windows.Forms.Padding(4);
 
             this.dockSite3.Name = "dockSite3";
 
-            this.dockSite3.Size = new System.Drawing.Size(1203, 0);
 
+            this.dockSite3.Size = new System.Drawing.Size(1604, 0);
 
             this.dockSite3.TabIndex = 2;
 
             this.dockSite3.TabStop = false;
 
             // 
@@ -1809,13 +1887,23 @@
 
             this.controlContainerItem1.MenuVisibility = DevComponents.DotNetBar.eMenuVisibility.VisibleAlways;
 
             this.controlContainerItem1.Name = "controlContainerItem1";
 
             // 
+            // button6
 
+            // 
+            this.button6.Location = new System.Drawing.Point(183, 179);
 
+            this.button6.Name = "button6";
 
+            this.button6.Size = new System.Drawing.Size(133, 34);
 
+            this.button6.TabIndex = 20;
 
+            this.button6.Text = "1终端地感测试";
 
+            this.button6.UseVisualStyleBackColor = true;
 
+            this.button6.Click += new System.EventHandler(this.button6_Click);
 
+            // 
             // centralController
 
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
 
             this.AutoSize = true;
 
             this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
 
-            this.ClientSize = new System.Drawing.Size(1203, 705);
 
+            this.ClientSize = new System.Drawing.Size(1604, 881);
 
             this.Controls.Add(this.dockSite_mainView);
 
             this.Controls.Add(this.dockSite_notification);
 
             this.Controls.Add(this.dockSite_menu);
 
@@ -1827,6 +1915,7 @@
 
             this.Controls.Add(this.dockSite8);
 
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
 
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
 
+            this.Margin = new System.Windows.Forms.Padding(4);
 
             this.Name = "centralController";
 
             this.Text = "智象停车中控端";
 
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
 
@@ -2008,6 +2097,8 @@
 
         private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn9;
 
         private DevComponents.DotNetBar.LabelX lbx_led1;
 
         private DevComponents.DotNetBar.LabelX lbx_led1Status;
 
+        private System.Windows.Forms.Button button5;
 
+        private System.Windows.Forms.Button button6;
 
     }
 
 }

+ 16 - 0
PLCLinker/centralController/FormCentralController.cs
Xem Tập Tin 

@@ -1092,5 +1092,21 @@ namespace centralController
 
                 }
 
             }
 
         }
 
+
 
+        private void button5_Click(object sender, EventArgs e)
 
+        {
 
+            MessageBox.Show("当前空闲车位数: "+Monitor.Monitor.ins.GetFreeSpaceCount(1)+"\n预约车位总数; "+ Monitor.Monitor.ins.GetFreeSpaceCount(3));
 
+        }
 
+
 
+        /// <summary>
 
+        /// 修改一号终端地感获取值
 
+        /// </summary>
 
+        /// <param name="sender"></param>
 
+        /// <param name="e"></param>
 
+        private void button6_Click(object sender, EventArgs e)
 
+        {
 
+            Monitor.Monitor.ChangeGroundStatus1 = !Monitor.Monitor.ChangeGroundStatus1;
 
+            MessageBox.Show("修改1号地感开关当前状态："+ Monitor.Monitor.ChangeGroundStatus1);
 
+        }
 
     }
 
 }

+ 5 - 1
PLCLinker/centralController/FormSysConfig.cs
Xem Tập Tin 

@@ -124,7 +124,11 @@ namespace centralController
 
 
         private void btnx_alterGarageId_Click(object sender, EventArgs e)
 
         {
 
-
 
+            try
 
+            {
 
+                Monitor.Monitor.garageID = int.Parse(tb_garageID.Text);
 
+            }
 
+            catch { MessageBox.Show("ÇëÊäÈëÊý×Ö"); }
 
         }
 
 
         private void btnx_alterDefaultLic_Click(object sender, EventArgs e)

+ 13 - 1
PLCLinker/centralController/Monitor/Monitor.cs
Xem Tập Tin 

@@ -122,6 +122,11 @@ namespace Monitor
 
         private static Queue<string> notificationQueue = new Queue<string>();
 
         private const int MAXLINES = 80;
 
 
+        /// <summary>
 
+        /// 临时添加
 
+        /// </summary>
 
+        public static bool ChangeGroundStatus1;
 
+
 
         private void PLCUpdate()
 
         {
 
             int linkCount = 0;
 
@@ -155,9 +160,16 @@ namespace Monitor
 
                                     for (int i = 0; i < plcTerminalCount; i++)
 
                                     {
 
                                         //一旦发现差异立刻更新
 
+                                        TerminalStru tsTemp = (TerminalStru)received[i];
 
                                         if (!Terminal.Terminal.terminalInfo[i].Equals(received[i]))
 
                                         {
 
-                                            Terminal.Terminal.terminalInfo[i] = (TerminalStru)received[i];
 
+                                            Terminal.Terminal.terminalInfo[i] = tsTemp;
 
+                                        }
 
+                                        //修改地感
 
+                                        if (Terminal.Terminal.terminalInfo[i].terminalID == 1 && ChangeGroundStatus1)
 
+                                        {
 
+                                            tsTemp.groundStatus = (tsTemp.groundStatus == (short)0) ? (short)1 : (short)0;
 
+                                            Terminal.Terminal.terminalInfo[i] = tsTemp;
 
                                         }
 
                                     }
 
                                 }

+ 30 - 2
PLCLinker/centralController/Terminal/Terminal.cs
Xem Tập Tin 

@@ -741,7 +741,35 @@ namespace Terminal
 
                         }
 
                         catch { }
 
                         Monitor.Monitor.SetNotification("无车位或凭证号，车位：" + parkingSpaceID + ",凭证号：" + receipt, parkMonitor.model.TextColor.Warning);
 
-                        return;
 
+                        bool getReceiptFromParkingSpace = false;
 
+                        if (parkingSpaceID != 0)
 
+                        {
 
+                            for (int i = 0; i < Monitor.Monitor.parkingSpaceInfo.Count; i++)
 
+                            {
 
+                                if (Monitor.Monitor.parkingSpaceInfo[i].parkingSpace == parkingSpaceID)
 
+                                {
 
+                                    int myReceipt = Monitor.Monitor.parkingSpaceInfo[i].receiptNum;
 
+                                    if(myReceipt != 0)
 
+                                    {
 
+                                        receipt = myReceipt;
 
+                                        getReceiptFromParkingSpace = true;
 
+                                    }
 
+                                    break;
 
+                                }
 
+                            }
 
+                        }
 
+                        if (!getReceiptFromParkingSpace)
 
+                        {
 
+                            //中控清除车牌、凭证号、号牌验证等信息
 
+                            ClearTerminal(term.terminalID, false);
 
+                            //停车流程确保已清除中控块完成信号
 
+                            ResetCompleteSignal();
 
+                            return;
 
+                        }
 
+                        else
 
+                        {
 
+                            Monitor.Monitor.SetNotification("从车位获取凭证号，车位：" + parkingSpaceID + ",凭证号：" + receipt, parkMonitor.model.TextColor.Warning);
 
+                        }
 
                     }
 
 
                     //中控清除车牌、凭证号、号牌验证等信息
 
@@ -770,7 +798,7 @@ namespace Terminal
 
                     else
 
                     {
 
                         parkingRecordsSql = "INSERT INTO parkingrecords (userID, numberPlate,parkingSpaceID,garageID,parkingRecordsState,realParkTime,receiptNum,parkingPrice)" +
 
-                            "values ('" + 30 + "','" + license + "','" + parkingSpaceID + "','" + Monitor.Monitor.garageID + "',3,'" + DateTime.Now.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss") + "','" + receipt + "',NULL);";
 
+                            "values ('" + 28 + "','" + license + "','" + parkingSpaceID + "','" + Monitor.Monitor.garageID + "',3,'" + DateTime.Now.ToLocalTime().ToString("yyyy-MM-dd HH:mm:ss") + "','" + receipt + "',NULL);";
 
                         Monitor.Monitor.SetNotification("管理员用户，插入停车记录，" + license + "停在" + parkingSpaceID, parkMonitor.model.TextColor.Info);
 
                         Log.WriteLog(LogType.process, LogFile.INFO, "管理员用户，插入停车记录，凭证号: " + receipt + "，终端块数据：" + term.ToString());
 
                     }

+ 5 - 1
PLCLinker/centralController/Terminal/TerminalSimul.cs
Xem Tập Tin 

@@ -56,6 +56,10 @@ namespace Terminal
 
                     }
 
                     if (!licenseCodeEncoding(carInfo, ref ts))
 
                         return 4;
 
+                    if(Monitor.Monitor.ins.GetFreeSpaceCount(1) == 0)
 
+                    {
 
+                        return 9;
 
+                    }
 
                     Monitor.Monitor.PLC.WriteToPLC(ts, PLCDataType.terminal);
 
                     return 0;
 
                 }
 
@@ -135,7 +139,7 @@ namespace Terminal
 
             int countdown = 10;
 
             while (!stopSimul && countdown-- > 0)
 
             {
 
-                //判断终端块是否有地感、为停车终端、空闲中，之后发送停车指令
 
+                //判断终端块是否有地感、为取车终端、空闲中，之后发送取车指令
 
                 if (Terminal.terminalInfo[1].groundStatus == 0
 
                     && Terminal.terminalInfo[1].terminalStatus == 2
 
                     && Terminal.terminalInfo[1].cmd == 0)

+ 3 - 1
PLCLinker/centralController/WebServer/WebServer.cs
Xem Tập Tin 

@@ -358,7 +358,9 @@ namespace centralController.WebServer
 
                                     returnMsg.cmd = "PARKFAILED";
 
                                     Monitor.Monitor.SetNotification("车辆" + msg.context.Split('.')[2] + "，终端" + id + "其他异常", parkMonitor.model.TextColor.Warning);
 
                                     Log.WriteLog(LogType.process, LogFile.ERROR, "凭证号" + msg.context + "出现未知异常，无法停车"); break;
 
-
 
+                                case 9:
 
+                                    returnMsg.cmd = "PARKFAILED";
 
+                                    Monitor.Monitor.SetNotification("车辆" + msg.context.Split('.')[2] + "，终端" + id + "无空闲车位", parkMonitor.model.TextColor.Warning);break;
 
                             }
 
                             returnMsg.userID = msg.userID;
 
                             returnMsg.garageID = Monitor.Monitor.garageID;

+ 1 - 1
PLCLinker/centralController/obj/Release/centralController.csproj.CoreCompileInputs.cache
Xem Tập Tin 

@@ -1 +1 @@
 
-67ee0d7b26f743e16c5a11d7d5b0f31390b7f07a
 
+3398d78de3fcc3fdbcb3ec2b3ec2c74f125bb553

BIN
PLCLinker/centralController/obj/Release/centralController.csproj.GenerateResource.Cache
Xem Tập Tin


+ 2 - 2
PLCLinker/centralController/serversettings.json
Xem Tập Tin 

@@ -1,7 +1,7 @@
 
 {
 
   "ssl": "false",
 
-  "host": "118.31.225.50",
 
-  "garageID": "7",
 
+  "host": "192.168.43.38",
 
+  "garageID": "8",
 
   "port": "9000",
 
   "size": "1024",
 
   "readerIdleTime": "10",

+ 3 - 3
PLCLinker/newPLCS7/PLCS7.cs
Xem Tập Tin 

@@ -27,7 +27,7 @@ namespace PLCS7
 
         central,
 
         parkingSpace,
 
         errorInfo,
 
-        scanInfo,
 
+        elecBoundary,
 
     }
 
     public abstract class AbstractPLCLinker : IPLCS7
 
     {
 
@@ -493,8 +493,8 @@ namespace PLCS7
 
                             object errorInfo = ReadStruFromPLC(new ErrorInfoStru(), errorInfoDB);
 
                             if (errorInfo != null) { result.Add(errorInfo); }
 
                             break;
 
-                        case PLCDataType.scanInfo:
 
-                            object scanInfo = ReadStruFromPLC(new ScanInfoStru(), scanInfoDB);
 
+                        case PLCDataType.elecBoundary:
 
+                            object scanInfo = ReadStruFromPLC(new ElecBoundaryStru(), scanInfoDB);
 
                             if (scanInfo != null) { result.Add(scanInfo); }
 
                             break;
 
                         default:

+ 52 - 43
PLCLinker/newPLCS7/entity.cs
Xem Tập Tin 

@@ -16,9 +16,17 @@ namespace PLCS7
 
         /// </summary>
 
         public short terminalID;
 
         /// <summary>
 
+        /// X坐标
 
+        /// </summary>
 
+        public int coordX;//PLC, 36, 2
 
+        /// <summary>
 
+        /// Y坐标
 
+        /// </summary>
 
+        public int coordY;//PLC, 40, 6
 
+        /// <summary>
 
         /// 终端状态，0暂停，1停车，2取车
 
         /// </summary>
 
-        public short terminalStatus;//终端写入
 
+        public short terminalStatus;//终端写入, 10
 
         /// <summary>
 
         /// 按钮状态，0缺省，1非注册，2注册，3预约
 
         /// </summary>
 
@@ -28,9 +36,13 @@ namespace PLCS7
 
         /// </summary>
 
         public short cmd;//终端写入
 
         /// <summary>
 
+        /// 允许停车，0缺省，1允许
 
+        /// </summary>
 
+        public short allowPark;//PLC写入, 16
 
+        /// <summary>
 
         /// 注册用户UserID
 
         /// </summary>
 
-        public int licenseCodeA;//终端写入
 
+        public int licenseCodeA;//终端写入, 18
 
         /// <summary>
 
         /// 注册用户号牌地域标记
 
         /// </summary>
 
@@ -46,50 +58,47 @@ namespace PLCS7
 
         /// <summary>
 
         /// 凭证号
 
         /// </summary>
 
-        public int receiptNum;//终端写入,24
 
+        public int receiptNum;//终端写入, 24, 34
 
         /// <summary>
 
-        /// 支付状态，0-1失败-2成功-3管理员放行
 
+        /// 启动对应号牌机
 
         /// </summary>
 
-        public short paymentStatus;//中控写入,28
 
+        public short numMachineLaunch;//46, 38
 
         /// <summary>
 
         /// 1-成功，2-号牌比对不成功
 
         /// </summary>
 
-        public short licVerification;//中控写入,30
 
-        /// <summary>
 
-        /// 停车费用，0-99999
 
-        /// </summary>
 
-        public short parkingFee;//中控写入
 
+        public short licVerification;//中控写入,30, 40
 
         /// <summary>
 
         /// 用户类型，0-1普通-2月卡-3季卡-4年卡VIP
 
         /// </summary>
 
-        public short userType;//中控写入,34
 
+        public short userType;//中控写入,34, 42
 
         /// <summary>
 
-        /// X坐标
 
+        /// 停车费用，0-99999
 
         /// </summary>
 
-        public int coordX;//PLC, 36
 
+        public short parkingFee;//中控写入
 
         /// <summary>
 
-        /// Y坐标
 
+        /// 支付状态，0-1失败-2成功-3管理员放行
 
         /// </summary>
 
-        public int coordY;//PLC,40
 
+        public short paymentStatus;//中控写入,28, 46
 
         /// <summary>
 
         /// 地感信号
 
         /// </summary>
 
-        public short groundStatus;//44
 
-        /// <summary>
 
-        /// 启动对应号牌机
 
-        /// </summary>
 
-        public short numMachineLaunch;//46
 
+        public short groundStatus;//44, 48
 
         /// <summary>
 
         /// 终端心跳
 
         /// </summary>
 
-        public short termHeartbeat;//48
 
+        public short termHeartbeat;//48, 50
 
 
         public override string ToString()
 
         {
 
-            return "[终端id(0):" + terminalID + ",终端状态(2)：" + terminalStatus + ",按钮状态(4)：" + btnStatus + ",终端指令(6)：" + cmd + ",用户id(8)：" + licenseCodeA + ","
 
-                + licenseCodeB + "," + licenseCodeC + "," + licenseCodeD + ",凭证号(24)：" + receiptNum + ",支付状态(28)：" + paymentStatus
 
-                + ",号牌验证(30)：" + licVerification + ",停车费用(32)：" + parkingFee + ",用户类型(34)：" + userType + ",X坐标(36)：" + coordX + ",Y坐标(40)：" + coordY +
 
-                ",地感信号(44)：" + groundStatus + ",启动号牌机(46)：" + numMachineLaunch + ",终端心跳(48):" + termHeartbeat + "]";
 
+            //return "[终端id(0):" + terminalID + ",终端状态(2)：" + terminalStatus + ",按钮状态(4)：" + btnStatus + ",终端指令(6)：" + cmd + ",用户id(8)：" + licenseCodeA + ","
 
+            //    + licenseCodeB + "," + licenseCodeC + "," + licenseCodeD + ",凭证号(24)：" + receiptNum + ",支付状态(28)：" + paymentStatus
 
+            //    + ",号牌验证(30)：" + licVerification + ",停车费用(32)：" + parkingFee + ",用户类型(34)：" + userType + ",X坐标(36)：" + coordX + ",Y坐标(40)：" + coordY +
 
+            //    ",地感信号(44)：" + groundStatus + ",启动号牌机(46)：" + numMachineLaunch + ",终端心跳(48):" + termHeartbeat + "]";
 
+
 
+            return "[终端id(0):" + terminalID + ",X坐标(2)：" + coordX + ",Y坐标(6)：" + coordY + ",终端功能(10)：" + terminalStatus + ",按钮状态(12)：" + btnStatus + ",停取指令(14)：" + cmd
 
+                + ",允许停车(16)：" + allowPark + ",用户id(18)：" + licenseCodeA + "," + licenseCodeB + "," + licenseCodeC + "," + licenseCodeD + ",凭证号(34)：" + receiptNum
 
+                + ",启动号牌机(38)：" + numMachineLaunch + ",号牌验证(40)：" + licVerification + ",用户类型(42)：" + userType + ",停车费用(44)：" + parkingFee 
+                + ",支付状态(46)：" + paymentStatus + ",地感信号(48)：" + groundStatus  + ",终端心跳(50):" + termHeartbeat + "]";
 
         }
 
 
         public override bool Equals(object obj)
 
@@ -365,7 +374,7 @@ namespace PLCS7
 
 
         public override string ToString()
 
         {
 
-            return "[错误1(0): "+errorOne+",错误2(2): "+errorTwo+", 错误3(4): "+errorThree+", 错误4(6): "+errorFour+"]";
 
+            return "[错误1(0): " + errorOne + ",错误2(2): " + errorTwo + ", 错误3(4): " + errorThree + ", 错误4(6): " + errorFour + "]";
 
         }
 
         public override int GetHashCode()
 
         {
 
@@ -388,36 +397,36 @@ namespace PLCS7
 
     /// <summary>
 
     /// 超限信息
 
     /// </summary>
 
-    public struct ScanInfoStru
 
+    public struct ElecBoundaryStru
 
     {
 
         /// <summary>
 
-        /// 终端1扫描状态。0空闲，1正确，2上超界，3下超界，4左超界，5右超界，6测量失败
 
+        /// 雷达启动
 
         /// </summary>
 
-        public short scanStateTerm1;
 
+        public short laserStart;
 
         /// <summary>
 
-        /// 终端2扫描状态
 
+        /// 当前轮距
 
         /// </summary>
 
-        public short scanStateTerm2;
 
+        public short currentWheelbase;
 
         /// <summary>
 
-        /// 终端3扫描状态
 
+        /// 安全与否
 
         /// </summary>
 
-        public short scanStateTerm3;
 
+        public short whetherSafe;
 
         /// <summary>
 
-        /// 终端4扫描状态
 
+        /// 边界状态。0空闲，1正确，2上超界，3下超界，4左超界，5右超界，6测量失败
 
         /// </summary>
 
-        public short scanStateTerm4;
 
+        public short boundaryStatus;
 
         /// <summary>
 
-        /// 终端5扫描状态
 
+        /// 备用1
 
         /// </summary>
 
-        public short scanStateTerm5;
 
+        public short noname1;
 
         /// <summary>
 
-        /// 终端6扫描状态
 
+        /// 备用2
 
         /// </summary>
 
-        public short scanStateTerm6;
 
+        public short noname2;
 
 
         public override string ToString()
 
         {
 
-            return "[终端1(0): " + scanStateTerm1 + ",终端2(2): " + scanStateTerm2 + ", 终端3(4): " + scanStateTerm3 + ", 终端4(6): " + scanStateTerm4 + ", 终端5(8): " + scanStateTerm5 + ", 终端6(10): " + scanStateTerm6 + "]";
 
+            return "[雷达启动(0): " + laserStart + ",当前轮距(2): " + currentWheelbase + ", 安全与否(4): " + whetherSafe + ", 边界状态(6): " + boundaryStatus + "]";
 
         }
 
         public override int GetHashCode()
 
         {
 
@@ -427,10 +436,10 @@ namespace PLCS7
 
         {
 
             if (obj == null) return false;
 
             else if ((object)this == obj) return true;
 
-            else if (obj.GetType().Equals(typeof(ErrorInfoStru)))
 
+            else if (obj.GetType().Equals(typeof(ElecBoundaryStru)))
 
             {
 
-                ErrorInfoStru eis = (ErrorInfoStru)obj;
 
-                if (eis.ToString().Equals(ToString())) return true;
 
+                ElecBoundaryStru ebs = (ElecBoundaryStru)obj;
 
+                if (ebs.ToString().Equals(ToString())) return true;
 
                 else return false;
 
             }
 
             else return false;