--

ProjectBase.Controls/CircleLabel.Designer.cs

@@ -34,10 +34,10 @@
             // label1
             // 
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 20F);
             this.label1.ForeColor = System.Drawing.Color.White;
             this.label1.Location = new System.Drawing.Point(0, 0);
-            this.label1.Margin = new System.Windows.Forms.Padding(6, 0, 6, 0);
+            this.label1.Margin = new System.Windows.Forms.Padding(8, 0, 8, 0);
             this.label1.Name = "label1";
             this.label1.Size = new System.Drawing.Size(112, 112);
             this.label1.TabIndex = 0;
@@ -46,15 +46,15 @@
             // 
             // CircleLabel
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(18F, 39F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(24F, 52F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Transparent;
-            this.BackgroundImage = global::ProjectBase.Controls.Properties.Resources.绿色指示灯;
+            this.BackgroundImage = global::ProjectBase.Controls.Properties.Resources.绿色指示灯5;
             this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.Controls.Add(this.label1);
             this.DoubleBuffered = true;
-            this.Font = new System.Drawing.Font("微软雅黑", 15F);
-            this.Margin = new System.Windows.Forms.Padding(6, 6, 6, 6);
+            this.Font = new System.Drawing.Font("微软雅黑", 20F);
+            this.Margin = new System.Windows.Forms.Padding(8, 8, 8, 8);
             this.Name = "CircleLabel";
             this.Size = new System.Drawing.Size(112, 112);
             this.FontChanged += new System.EventHandler(this.CircleLabel_FontChanged);

ProjectBase.Controls/CircleLabel.cs

@@ -49,7 +49,7 @@ namespace ProjectBase.Controls
             switch (WorkState)
             {
                 case LedState.OK:
-                    BackgroundImage = Properties.Resources.绿色指示灯4;
+                    BackgroundImage = Properties.Resources.绿色指示灯5;
                     break;
                 case LedState.NG:
                     BackgroundImage = Properties.Resources.红色指示灯;

ProjectBase.Controls/LeftLabels.Designer.cs

@@ -44,9 +44,10 @@
             this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label1.Font = new System.Drawing.Font("宋体", 15F);
-            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Location = new System.Drawing.Point(7, 0);
+            this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(194, 45);
+            this.label1.Size = new System.Drawing.Size(246, 60);
             this.label1.TabIndex = 0;
             this.label1.Text = "右上部螺栓";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
@@ -56,9 +57,10 @@
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label2.Font = new System.Drawing.Font("宋体", 15F);
-            this.label2.Location = new System.Drawing.Point(3, 45);
+            this.label2.Location = new System.Drawing.Point(7, 60);
+            this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(94, 45);
+            this.label2.Size = new System.Drawing.Size(116, 60);
             this.label2.TabIndex = 1;
             this.label2.Text = "扭矩";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -68,9 +70,10 @@
             this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label3.Font = new System.Drawing.Font("宋体", 15F);
-            this.label3.Location = new System.Drawing.Point(3, 90);
+            this.label3.Location = new System.Drawing.Point(7, 120);
+            this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(94, 46);
+            this.label3.Size = new System.Drawing.Size(116, 60);
             this.label3.TabIndex = 2;
             this.label3.Text = "角度";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -81,9 +84,10 @@
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label4.Font = new System.Drawing.Font("宋体", 15F);
-            this.label4.Location = new System.Drawing.Point(103, 45);
+            this.label4.Location = new System.Drawing.Point(137, 60);
+            this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(94, 45);
+            this.label4.Size = new System.Drawing.Size(116, 60);
             this.label4.TabIndex = 3;
             this.label4.Text = "69.3";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -94,9 +98,10 @@
             this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label5.Font = new System.Drawing.Font("宋体", 15F);
-            this.label5.Location = new System.Drawing.Point(103, 90);
+            this.label5.Location = new System.Drawing.Point(137, 120);
+            this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(94, 46);
+            this.label5.Size = new System.Drawing.Size(116, 60);
             this.label5.TabIndex = 4;
             this.label5.Text = "22.3";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -113,21 +118,24 @@
             this.tableLayoutPanel1.Controls.Add(this.label4, 1, 1);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 3;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(200, 136);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(260, 180);
             this.tableLayoutPanel1.TabIndex = 5;
             // 
             // LeftLabels
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(19F, 41F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.tableLayoutPanel1);
+            this.Font = new System.Drawing.Font("微软雅黑", 16F);
+            this.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
             this.Name = "LeftLabels";
-            this.Size = new System.Drawing.Size(200, 136);
+            this.Size = new System.Drawing.Size(260, 180);
             this.FontChanged += new System.EventHandler(this.LeftLabels_FontChanged);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.ResumeLayout(false);

ProjectBase.Controls/ProjectBase.Controls.csproj

@@ -264,12 +264,9 @@
     <Content Include="Icon\Edit.ico" />
     <Content Include="Icon\excel.ico" />
     <Content Include="Icon\filter.ico" />
+    <None Include="Resources\绿色指示灯5.png" />
     <None Include="Resources\绿色指示灯4.png" />
-    <None Include="Resources\绿色指示灯3.png" />
-    <None Include="Resources\绿色指示灯2.png" />
-    <None Include="Resources\绿色指示灯1.png" />
     <None Include="Resources\灰色指示灯.png" />
-    <None Include="Resources\绿色指示灯.png" />
     <None Include="Resources\红色指示灯.png" />
     <None Include="Icon\greenball.png" />
     <Content Include="Icon\ico_have2.gif" />

ProjectBase.Controls/Properties/Resources.Designer.cs

@@ -103,49 +103,9 @@ namespace ProjectBase.Controls.Properties {
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap 绿色指示灯 {
+        internal static System.Drawing.Bitmap 绿色指示灯5 {
             get {
-                object obj = ResourceManager.GetObject("绿色指示灯", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap 绿色指示灯1 {
-            get {
-                object obj = ResourceManager.GetObject("绿色指示灯1", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap 绿色指示灯2 {
-            get {
-                object obj = ResourceManager.GetObject("绿色指示灯2", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap 绿色指示灯3 {
-            get {
-                object obj = ResourceManager.GetObject("绿色指示灯3", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
-        /// </summary>
-        internal static System.Drawing.Bitmap 绿色指示灯4 {
-            get {
-                object obj = ResourceManager.GetObject("绿色指示灯4", resourceCulture);
+                object obj = ResourceManager.GetObject("绿色指示灯5", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }

ProjectBase.Controls/Properties/Resources.resx

@@ -130,19 +130,7 @@
   <data name="红色指示灯" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\红色指示灯.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="绿色指示灯" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\绿色指示灯.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="绿色指示灯1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\绿色指示灯1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="绿色指示灯2" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\绿色指示灯2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="绿色指示灯3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\绿色指示灯3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="绿色指示灯4" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\绿色指示灯4.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="绿色指示灯5" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\绿色指示灯5.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

ProjectBase.Controls/RightLabels.Designer.cs

@@ -43,9 +43,10 @@
             this.label5.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label5.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label5.Font = new System.Drawing.Font("宋体", 15F);
-            this.label5.Location = new System.Drawing.Point(103, 90);
+            this.label5.Location = new System.Drawing.Point(137, 120);
+            this.label5.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(94, 46);
+            this.label5.Size = new System.Drawing.Size(116, 60);
             this.label5.TabIndex = 4;
             this.label5.Text = "22.3";
             this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -57,9 +58,10 @@
             this.tableLayoutPanel1.SetColumnSpan(this.label1, 2);
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label1.Font = new System.Drawing.Font("宋体", 15F);
-            this.label1.Location = new System.Drawing.Point(3, 0);
+            this.label1.Location = new System.Drawing.Point(7, 0);
+            this.label1.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(194, 45);
+            this.label1.Size = new System.Drawing.Size(246, 60);
             this.label1.TabIndex = 0;
             this.label1.Text = "左上部螺栓";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
@@ -69,9 +71,10 @@
             this.label2.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label2.Font = new System.Drawing.Font("宋体", 15F);
-            this.label2.Location = new System.Drawing.Point(3, 45);
+            this.label2.Location = new System.Drawing.Point(7, 60);
+            this.label2.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(94, 45);
+            this.label2.Size = new System.Drawing.Size(116, 60);
             this.label2.TabIndex = 1;
             this.label2.Text = "扭矩";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -81,9 +84,10 @@
             this.label3.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label3.Font = new System.Drawing.Font("宋体", 15F);
-            this.label3.Location = new System.Drawing.Point(3, 90);
+            this.label3.Location = new System.Drawing.Point(7, 120);
+            this.label3.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(94, 46);
+            this.label3.Size = new System.Drawing.Size(116, 60);
             this.label3.TabIndex = 2;
             this.label3.Text = "角度";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -94,9 +98,10 @@
             this.label4.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.label4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.label4.Font = new System.Drawing.Font("宋体", 15F);
-            this.label4.Location = new System.Drawing.Point(103, 45);
+            this.label4.Location = new System.Drawing.Point(137, 60);
+            this.label4.Margin = new System.Windows.Forms.Padding(7, 0, 7, 0);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(94, 45);
+            this.label4.Size = new System.Drawing.Size(116, 60);
             this.label4.TabIndex = 3;
             this.label4.Text = "69.3";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -113,21 +118,24 @@
             this.tableLayoutPanel1.Controls.Add(this.label4, 1, 1);
             this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
             this.tableLayoutPanel1.Name = "tableLayoutPanel1";
             this.tableLayoutPanel1.RowCount = 3;
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 33.33333F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(200, 136);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(260, 180);
             this.tableLayoutPanel1.TabIndex = 6;
             // 
             // RightLabels
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(19F, 41F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.tableLayoutPanel1);
+            this.Font = new System.Drawing.Font("微软雅黑", 16F);
+            this.Margin = new System.Windows.Forms.Padding(7, 7, 7, 7);
             this.Name = "RightLabels";
-            this.Size = new System.Drawing.Size(200, 136);
+            this.Size = new System.Drawing.Size(260, 180);
             this.FontChanged += new System.EventHandler(this.RightLabels_FontChanged);
             this.tableLayoutPanel1.ResumeLayout(false);
             this.ResumeLayout(false);

SIMDP.Project/Form/FormMonitorTighten.Designer.cs

@@ -68,11 +68,11 @@ namespace SIMDP.Project
             // 
             this.label1.BackColor = System.Drawing.Color.RoyalBlue;
             this.label1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.label1.Font = new System.Drawing.Font("微软雅黑", 20F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 32F);
             this.label1.ForeColor = System.Drawing.Color.White;
             this.label1.Location = new System.Drawing.Point(0, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(1024, 84);
+            this.label1.Size = new System.Drawing.Size(1024, 170);
             this.label1.TabIndex = 3;
             this.label1.Text = "FEM自动拧紧设备";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -82,10 +82,10 @@ namespace SIMDP.Project
             this.label2.BackColor = System.Drawing.Color.PaleTurquoise;
             this.tableLayoutPanel1.SetColumnSpan(this.label2, 6);
             this.label2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label2.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.label2.Font = new System.Drawing.Font("微软雅黑", 15.5F);
             this.label2.Location = new System.Drawing.Point(3, 0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(502, 79);
+            this.label2.Size = new System.Drawing.Size(502, 60);
             this.label2.TabIndex = 0;
             this.label2.Text = "装配车身号：LHG123451234512";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -117,18 +117,19 @@ namespace SIMDP.Project
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.73913F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.73913F));
             this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.73913F));
-            this.tableLayoutPanel1.Size = new System.Drawing.Size(508, 610);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(508, 463);
             this.tableLayoutPanel1.TabIndex = 5;
             // 
             // leftLabels1
             // 
             this.tableLayoutPanel1.SetColumnSpan(this.leftLabels1, 2);
+            this.leftLabels1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.leftLabels1.Font = new System.Drawing.Font("宋体", 12F);
-            this.leftLabels1.Location = new System.Drawing.Point(4, 83);
+            this.leftLabels1.Location = new System.Drawing.Point(4, 64);
             this.leftLabels1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.leftLabels1.Name = "leftLabels1";
             this.tableLayoutPanel1.SetRowSpan(this.leftLabels1, 2);
-            this.leftLabels1.Size = new System.Drawing.Size(158, 108);
+            this.leftLabels1.Size = new System.Drawing.Size(160, 192);
             this.leftLabels1.TabIndex = 1;
             // 
             // circleLabel2
@@ -137,23 +138,24 @@ namespace SIMDP.Project
             this.circleLabel2.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel2.BackgroundImage")));
             this.circleLabel2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel2.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel2.Location = new System.Drawing.Point(172, 83);
-            this.circleLabel2.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel2.Location = new System.Drawing.Point(258, 195);
+            this.circleLabel2.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel2.Name = "circleLabel2";
             this.tableLayoutPanel1.SetRowSpan(this.circleLabel2, 2);
-            this.circleLabel2.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel2.Size = new System.Drawing.Size(114, 189);
             this.circleLabel2.TabIndex = 4;
             this.circleLabel2.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
             // leftLabels2
             // 
             this.tableLayoutPanel1.SetColumnSpan(this.leftLabels2, 2);
+            this.leftLabels2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.leftLabels2.Font = new System.Drawing.Font("宋体", 12F);
-            this.leftLabels2.Location = new System.Drawing.Point(4, 347);
+            this.leftLabels2.Location = new System.Drawing.Point(4, 264);
             this.leftLabels2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.leftLabels2.Name = "leftLabels2";
             this.tableLayoutPanel1.SetRowSpan(this.leftLabels2, 2);
-            this.leftLabels2.Size = new System.Drawing.Size(158, 109);
+            this.leftLabels2.Size = new System.Drawing.Size(160, 195);
             this.leftLabels2.TabIndex = 1;
             // 
             // circleLabel3
@@ -162,11 +164,11 @@ namespace SIMDP.Project
             this.circleLabel3.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel3.BackgroundImage")));
             this.circleLabel3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel3.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel3.Location = new System.Drawing.Point(172, 347);
-            this.circleLabel3.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel3.Location = new System.Drawing.Point(258, 495);
+            this.circleLabel3.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel3.Name = "circleLabel3";
             this.tableLayoutPanel1.SetRowSpan(this.circleLabel3, 2);
-            this.circleLabel3.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel3.Size = new System.Drawing.Size(114, 194);
             this.circleLabel3.TabIndex = 4;
             this.circleLabel3.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
@@ -176,11 +178,11 @@ namespace SIMDP.Project
             this.circleLabel4.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel4.BackgroundImage")));
             this.circleLabel4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel4.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel4.Location = new System.Drawing.Point(256, 83);
-            this.circleLabel4.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel4.Location = new System.Drawing.Point(384, 195);
+            this.circleLabel4.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel4.Name = "circleLabel4";
             this.tableLayoutPanel1.SetRowSpan(this.circleLabel4, 2);
-            this.circleLabel4.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel4.Size = new System.Drawing.Size(114, 189);
             this.circleLabel4.TabIndex = 4;
             this.circleLabel4.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
@@ -190,34 +192,36 @@ namespace SIMDP.Project
             this.circleLabel5.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel5.BackgroundImage")));
             this.circleLabel5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel5.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel5.Location = new System.Drawing.Point(256, 347);
-            this.circleLabel5.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel5.Location = new System.Drawing.Point(384, 495);
+            this.circleLabel5.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel5.Name = "circleLabel5";
             this.tableLayoutPanel1.SetRowSpan(this.circleLabel5, 2);
-            this.circleLabel5.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel5.Size = new System.Drawing.Size(114, 194);
             this.circleLabel5.TabIndex = 4;
             this.circleLabel5.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
             // rightLabels1
             // 
             this.tableLayoutPanel1.SetColumnSpan(this.rightLabels1, 2);
+            this.rightLabels1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rightLabels1.Font = new System.Drawing.Font("宋体", 12F);
-            this.rightLabels1.Location = new System.Drawing.Point(340, 83);
+            this.rightLabels1.Location = new System.Drawing.Point(340, 64);
             this.rightLabels1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rightLabels1.Name = "rightLabels1";
             this.tableLayoutPanel1.SetRowSpan(this.rightLabels1, 2);
-            this.rightLabels1.Size = new System.Drawing.Size(160, 108);
+            this.rightLabels1.Size = new System.Drawing.Size(164, 192);
             this.rightLabels1.TabIndex = 5;
             // 
             // rightLabels2
             // 
             this.tableLayoutPanel1.SetColumnSpan(this.rightLabels2, 2);
+            this.rightLabels2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rightLabels2.Font = new System.Drawing.Font("宋体", 12F);
-            this.rightLabels2.Location = new System.Drawing.Point(340, 347);
+            this.rightLabels2.Location = new System.Drawing.Point(340, 264);
             this.rightLabels2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rightLabels2.Name = "rightLabels2";
             this.tableLayoutPanel1.SetRowSpan(this.rightLabels2, 2);
-            this.rightLabels2.Size = new System.Drawing.Size(160, 109);
+            this.rightLabels2.Size = new System.Drawing.Size(164, 195);
             this.rightLabels2.TabIndex = 5;
             // 
             // tableLayoutPanel2
@@ -247,18 +251,21 @@ namespace SIMDP.Project
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.73913F));
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.73913F));
             this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 21.73913F));
-            this.tableLayoutPanel2.Size = new System.Drawing.Size(512, 610);
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(512, 463);
             this.tableLayoutPanel2.TabIndex = 5;
             // 
             // leftLabels3
             // 
             this.tableLayoutPanel2.SetColumnSpan(this.leftLabels3, 2);
+            this.leftLabels3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.leftLabels3.Font = new System.Drawing.Font("宋体", 12F);
-            this.leftLabels3.Location = new System.Drawing.Point(4, 83);
+            this.leftLabels3.Location = new System.Drawing.Point(4, 64);
             this.leftLabels3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.leftLabels3.Name = "leftLabels3";
             this.tableLayoutPanel2.SetRowSpan(this.leftLabels3, 2);
-            this.leftLabels3.Size = new System.Drawing.Size(158, 108);
+            this.leftLabels3.Size = new System.Drawing.Size(162, 192);
             this.leftLabels3.TabIndex = 1;
             // 
             // label3
@@ -266,10 +273,10 @@ namespace SIMDP.Project
             this.label3.BackColor = System.Drawing.Color.Moccasin;
             this.tableLayoutPanel2.SetColumnSpan(this.label3, 6);
             this.label3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label3.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.label3.Font = new System.Drawing.Font("微软雅黑", 15.5F);
             this.label3.Location = new System.Drawing.Point(3, 0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(506, 79);
+            this.label3.Size = new System.Drawing.Size(506, 60);
             this.label3.TabIndex = 0;
             this.label3.Text = "搬出车身号：LHG123451234512";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -280,23 +287,24 @@ namespace SIMDP.Project
             this.circleLabel6.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel6.BackgroundImage")));
             this.circleLabel6.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel6.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel6.Location = new System.Drawing.Point(174, 83);
-            this.circleLabel6.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel6.Location = new System.Drawing.Point(261, 195);
+            this.circleLabel6.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel6.Name = "circleLabel6";
             this.tableLayoutPanel2.SetRowSpan(this.circleLabel6, 2);
-            this.circleLabel6.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel6.Size = new System.Drawing.Size(116, 189);
             this.circleLabel6.TabIndex = 4;
             this.circleLabel6.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
             // leftLabels4
             // 
             this.tableLayoutPanel2.SetColumnSpan(this.leftLabels4, 2);
+            this.leftLabels4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.leftLabels4.Font = new System.Drawing.Font("宋体", 12F);
-            this.leftLabels4.Location = new System.Drawing.Point(4, 347);
+            this.leftLabels4.Location = new System.Drawing.Point(4, 264);
             this.leftLabels4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.leftLabels4.Name = "leftLabels4";
             this.tableLayoutPanel2.SetRowSpan(this.leftLabels4, 2);
-            this.leftLabels4.Size = new System.Drawing.Size(158, 109);
+            this.leftLabels4.Size = new System.Drawing.Size(162, 195);
             this.leftLabels4.TabIndex = 1;
             // 
             // circleLabel7
@@ -305,11 +313,11 @@ namespace SIMDP.Project
             this.circleLabel7.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel7.BackgroundImage")));
             this.circleLabel7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel7.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel7.Location = new System.Drawing.Point(174, 347);
-            this.circleLabel7.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel7.Location = new System.Drawing.Point(261, 495);
+            this.circleLabel7.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel7.Name = "circleLabel7";
             this.tableLayoutPanel2.SetRowSpan(this.circleLabel7, 2);
-            this.circleLabel7.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel7.Size = new System.Drawing.Size(116, 194);
             this.circleLabel7.TabIndex = 4;
             this.circleLabel7.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
@@ -319,11 +327,11 @@ namespace SIMDP.Project
             this.circleLabel8.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel8.BackgroundImage")));
             this.circleLabel8.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel8.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel8.Location = new System.Drawing.Point(259, 83);
-            this.circleLabel8.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel8.Location = new System.Drawing.Point(389, 195);
+            this.circleLabel8.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel8.Name = "circleLabel8";
             this.tableLayoutPanel2.SetRowSpan(this.circleLabel8, 2);
-            this.circleLabel8.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel8.Size = new System.Drawing.Size(116, 189);
             this.circleLabel8.TabIndex = 4;
             this.circleLabel8.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
@@ -333,44 +341,46 @@ namespace SIMDP.Project
             this.circleLabel9.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("circleLabel9.BackgroundImage")));
             this.circleLabel9.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
             this.circleLabel9.Font = new System.Drawing.Font("华文中宋", 14F);
-            this.circleLabel9.Location = new System.Drawing.Point(259, 347);
-            this.circleLabel9.Margin = new System.Windows.Forms.Padding(4);
+            this.circleLabel9.Location = new System.Drawing.Point(389, 495);
+            this.circleLabel9.Margin = new System.Windows.Forms.Padding(4, 70, 4, 4);
             this.circleLabel9.Name = "circleLabel9";
             this.tableLayoutPanel2.SetRowSpan(this.circleLabel9, 2);
-            this.circleLabel9.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel9.Size = new System.Drawing.Size(116, 194);
             this.circleLabel9.TabIndex = 4;
             this.circleLabel9.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
             // 
             // rightLabels3
             // 
             this.tableLayoutPanel2.SetColumnSpan(this.rightLabels3, 2);
+            this.rightLabels3.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rightLabels3.Font = new System.Drawing.Font("宋体", 12F);
-            this.rightLabels3.Location = new System.Drawing.Point(344, 83);
+            this.rightLabels3.Location = new System.Drawing.Point(344, 64);
             this.rightLabels3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rightLabels3.Name = "rightLabels3";
             this.tableLayoutPanel2.SetRowSpan(this.rightLabels3, 2);
-            this.rightLabels3.Size = new System.Drawing.Size(160, 108);
+            this.rightLabels3.Size = new System.Drawing.Size(164, 192);
             this.rightLabels3.TabIndex = 5;
             // 
             // rightLabels4
             // 
             this.tableLayoutPanel2.SetColumnSpan(this.rightLabels4, 2);
+            this.rightLabels4.Dock = System.Windows.Forms.DockStyle.Fill;
             this.rightLabels4.Font = new System.Drawing.Font("宋体", 12F);
-            this.rightLabels4.Location = new System.Drawing.Point(344, 347);
+            this.rightLabels4.Location = new System.Drawing.Point(344, 264);
             this.rightLabels4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.rightLabels4.Name = "rightLabels4";
             this.tableLayoutPanel2.SetRowSpan(this.rightLabels4, 2);
-            this.rightLabels4.Size = new System.Drawing.Size(160, 109);
+            this.rightLabels4.Size = new System.Drawing.Size(164, 195);
             this.rightLabels4.TabIndex = 5;
             // 
             // label4
             // 
             this.label4.BackColor = System.Drawing.Color.LemonChiffon;
             this.label4.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.label4.Font = new System.Drawing.Font("微软雅黑", 20F);
-            this.label4.Location = new System.Drawing.Point(0, 694);
+            this.label4.Font = new System.Drawing.Font("微软雅黑", 32F);
+            this.label4.Location = new System.Drawing.Point(0, 633);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(1024, 74);
+            this.label4.Size = new System.Drawing.Size(1024, 135);
             this.label4.TabIndex = 6;
             this.label4.Text = "label4";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -384,7 +394,7 @@ namespace SIMDP.Project
             // splitContainer1
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 84);
+            this.splitContainer1.Location = new System.Drawing.Point(0, 170);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
@@ -394,7 +404,7 @@ namespace SIMDP.Project
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.tableLayoutPanel1);
-            this.splitContainer1.Size = new System.Drawing.Size(1024, 610);
+            this.splitContainer1.Size = new System.Drawing.Size(1024, 463);
             this.splitContainer1.SplitterDistance = 512;
             this.splitContainer1.TabIndex = 7;
             // 

SIMDP.Project/RibbonPageHelper/RibbonPageHelper.cs

@@ -44,7 +44,7 @@ namespace SIMDP.Project
             foreach (MoMenuInfo firstInfo in moFirstList)
             {
                 //如果没有菜单的权限，则跳过
-                if (!BLLFactory<BlRoleRight>.Instance.Function(SysEnvironment.CurrentLoginID,firstInfo.ID)) continue;
+                if (!BLLFactory<BlRoleRight>.Instance.Function(SysEnvironment.CurrentLoginID, firstInfo.ID)) continue;
 
                 //添加页面（一级菜单）
                 RibbonPage page = new DevExpress.XtraBars.Ribbon.RibbonPage();
@@ -94,7 +94,13 @@ namespace SIMDP.Project
                         {
                             if (button.Tag != null && !string.IsNullOrEmpty(button.Tag.ToString()))
                             {
-                                if (button.Tag.ToString().Contains("View"))
+                                //添加FormMonitor 扩展窗口显示
+                                if (button.Tag.ToString().Contains("FormMonitor"))
+                                {
+                                    Type type = Type.GetType(button.Tag.ToString());
+                                    LoadExtraForm(type);
+                                }
+                                else if (button.Tag.ToString().Contains("View"))
                                 {
                                     Assembly asmb = Assembly.LoadFrom("SIMDP.View.dll");
                                     Type type = asmb.GetType(button.Tag.ToString());
@@ -210,7 +216,7 @@ namespace SIMDP.Project
 
             //tableForm.Dock = DockStyle.Fill;
             //tableForm.WindowState = FormWindowState.Maximized;
-             tableForm.BringToFront();
+            tableForm.BringToFront();
             tableForm.Activate();
 
             return tableForm;

SIMDP.View/SIMDP.View.csproj

@@ -642,6 +642,9 @@
     <Content Include="Images\Spline_32x32.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Images\TableCellMargins_32x32.png">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Images\Table_16x16.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>