更新了控件及拧紧界面布局

ProjectBase.Controls/LeftLabels.cs

@@ -26,10 +26,31 @@ namespace ProjectBase.Controls
         }
 
         [Browsable(true)]
-        public override string Text
+        public  string Com_Name
         {
             get { return label1.Text; }
             set { label1.Text = value; }
         }
+
+        [Browsable(true)]
+        public  string Torque_Value
+        {
+            get { return label4.Text; }
+            set { label4.Text = value; }
+        }
+
+        [Browsable(true)]
+        public  string Angle_Value
+        {
+            get { return label5.Text; }
+            set { label5.Text = value; }
+        }
+
+        [Browsable(true)]
+        public  string LED_Name
+        {
+            get { return circleLabel1.Text; }
+            set { circleLabel1.Text = value; }
+        }
     }
 }

ProjectBase.Controls/RightLabels.cs

@@ -26,10 +26,31 @@ namespace ProjectBase.Controls
         }
 
         [Browsable(true)]
-        public override string Text
+        public string Com_Name
         {
             get { return label1.Text; }
             set { label1.Text = value; }
         }
+
+        [Browsable(true)]
+        public string Torque_Value
+        {
+            get { return label4.Text; }
+            set { label4.Text = value; }
+        }
+
+        [Browsable(true)]
+        public string Angle_Value
+        {
+            get { return label5.Text; }
+            set { label5.Text = value; }
+        }
+
+        [Browsable(true)]
+        public string LED_Name
+        {
+            get { return circleLabel1.Text; }
+            set { circleLabel1.Text = value; }
+        }
     }
 }

ProjectBase.Controls/ProjectBase.Controls.csproj

@@ -90,10 +90,10 @@
       <DependentUpon>BaseDock.cs</DependentUpon>
     </Compile>
     <Compile Include="ChildWinManagement.cs" />
-    <Compile Include="CircleLabel.cs">
+    <Compile Include="FEM_Controls\CircleLabel.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="CircleLabel.Designer.cs">
+    <Compile Include="FEM_Controls\CircleLabel.Designer.cs">
       <DependentUpon>CircleLabel.cs</DependentUpon>
     </Compile>
     <Compile Include="CoolPrintPreviewControl.cs">
@@ -138,10 +138,10 @@
     <Compile Include="DocViewer\FrmWordView.Designer.cs">
       <DependentUpon>FrmWordView.cs</DependentUpon>
     </Compile>
-    <Compile Include="LeftLabels.cs">
+    <Compile Include="FEM_Controls\LeftLabels.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="LeftLabels.Designer.cs">
+    <Compile Include="FEM_Controls\LeftLabels.Designer.cs">
       <DependentUpon>LeftLabels.cs</DependentUpon>
     </Compile>
     <Compile Include="FrmSelectColumnDisplay.cs">
@@ -187,10 +187,10 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="RightLabels.cs">
+    <Compile Include="FEM_Controls\RightLabels.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="RightLabels.Designer.cs">
+    <Compile Include="FEM_Controls\RightLabels.Designer.cs">
       <DependentUpon>RightLabels.cs</DependentUpon>
     </Compile>
     <Compile Include="WinGridViewPager.cs">
@@ -201,7 +201,7 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="CircleLabel.resx">
+    <EmbeddedResource Include="FEM_Controls\CircleLabel.resx">
       <DependentUpon>CircleLabel.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="CoolPrintPreviewControl.resx">
@@ -226,7 +226,7 @@
     <EmbeddedResource Include="FrmSelectColumnDisplay.resx">
       <DependentUpon>FrmSelectColumnDisplay.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="LeftLabels.resx">
+    <EmbeddedResource Include="FEM_Controls\LeftLabels.resx">
       <DependentUpon>LeftLabels.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Pager.resx">
@@ -243,7 +243,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <EmbeddedResource Include="RightLabels.resx">
+    <EmbeddedResource Include="FEM_Controls\RightLabels.resx">
       <DependentUpon>RightLabels.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="WinGridViewPager.resx">

SIMDP.Project/Form/FormMonitorTighten.Designer.cs

@@ -33,20 +33,20 @@ namespace SIMDP.Project
             this.label1 = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.TagCom7 = new ProjectBase.Controls.LeftLabels();
+            this.TagCom8 = new ProjectBase.Controls.LeftLabels();
+            this.TagCom5 = new ProjectBase.Controls.RightLabels();
+            this.TagCom6 = new ProjectBase.Controls.RightLabels();
             this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.TagCom3 = new ProjectBase.Controls.LeftLabels();
             this.label3 = new System.Windows.Forms.Label();
+            this.TagCom4 = new ProjectBase.Controls.LeftLabels();
+            this.TagCom1 = new ProjectBase.Controls.RightLabels();
+            this.TagCom2 = new ProjectBase.Controls.RightLabels();
             this.label4 = new System.Windows.Forms.Label();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
             this.btn_Close = new System.Windows.Forms.Button();
-            this.leftLabels3 = new ProjectBase.Controls.LeftLabels();
-            this.leftLabels4 = new ProjectBase.Controls.LeftLabels();
-            this.rightLabels3 = new ProjectBase.Controls.RightLabels();
-            this.rightLabels4 = new ProjectBase.Controls.RightLabels();
-            this.leftLabels1 = new ProjectBase.Controls.LeftLabels();
-            this.leftLabels2 = new ProjectBase.Controls.LeftLabels();
-            this.rightLabels1 = new ProjectBase.Controls.RightLabels();
-            this.rightLabels2 = new ProjectBase.Controls.RightLabels();
             this.tableLayoutPanel1.SuspendLayout();
             this.tableLayoutPanel2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -63,7 +63,7 @@ namespace SIMDP.Project
             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, 170);
+            this.label1.Size = new System.Drawing.Size(911, 141);
             this.label1.TabIndex = 3;
             this.label1.Text = "FEM自动拧紧设备";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -78,7 +78,7 @@ namespace SIMDP.Project
             this.label2.Location = new System.Drawing.Point(0, 0);
             this.label2.Margin = new System.Windows.Forms.Padding(0);
             this.label2.Name = "label2";
-            this.label2.Size = new System.Drawing.Size(511, 60);
+            this.label2.Size = new System.Drawing.Size(457, 50);
             this.label2.TabIndex = 0;
             this.label2.Text = "装配车身号：LHG123451234512";
             this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
@@ -90,13 +90,13 @@ namespace SIMDP.Project
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.99999F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.99999F));
             this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 24.99999F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel1.Controls.Add(this.leftLabels1, 0, 1);
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+            this.tableLayoutPanel1.Controls.Add(this.TagCom7, 0, 1);
             this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
-            this.tableLayoutPanel1.Controls.Add(this.leftLabels2, 0, 3);
-            this.tableLayoutPanel1.Controls.Add(this.rightLabels1, 2, 1);
-            this.tableLayoutPanel1.Controls.Add(this.rightLabels2, 2, 3);
+            this.tableLayoutPanel1.Controls.Add(this.TagCom8, 0, 3);
+            this.tableLayoutPanel1.Controls.Add(this.TagCom5, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.TagCom6, 2, 3);
             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(0);
@@ -107,9 +107,73 @@ 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(511, 463);
+            this.tableLayoutPanel1.Size = new System.Drawing.Size(457, 387);
             this.tableLayoutPanel1.TabIndex = 5;
             // 
+            // TagCom7
+            // 
+            this.TagCom7.Angle_Value = "22.3";
+            this.tableLayoutPanel1.SetColumnSpan(this.TagCom7, 2);
+            this.TagCom7.Com_Name = "右上部螺栓";
+            this.TagCom7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom7.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom7.LED_Name = "右上";
+            this.TagCom7.Location = new System.Drawing.Point(0, 50);
+            this.TagCom7.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom7.Name = "TagCom7";
+            this.tableLayoutPanel1.SetRowSpan(this.TagCom7, 2);
+            this.TagCom7.Size = new System.Drawing.Size(228, 168);
+            this.TagCom7.TabIndex = 1;
+            this.TagCom7.Torque_Value = "69.3";
+            // 
+            // TagCom8
+            // 
+            this.TagCom8.Angle_Value = "22.3";
+            this.tableLayoutPanel1.SetColumnSpan(this.TagCom8, 2);
+            this.TagCom8.Com_Name = "右下部螺栓";
+            this.TagCom8.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom8.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom8.LED_Name = "右下";
+            this.TagCom8.Location = new System.Drawing.Point(0, 218);
+            this.TagCom8.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom8.Name = "TagCom8";
+            this.tableLayoutPanel1.SetRowSpan(this.TagCom8, 2);
+            this.TagCom8.Size = new System.Drawing.Size(228, 169);
+            this.TagCom8.TabIndex = 1;
+            this.TagCom8.Torque_Value = "69.3";
+            // 
+            // TagCom5
+            // 
+            this.TagCom5.Angle_Value = "22.3";
+            this.tableLayoutPanel1.SetColumnSpan(this.TagCom5, 2);
+            this.TagCom5.Com_Name = "左上部螺栓";
+            this.TagCom5.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom5.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom5.LED_Name = "左上";
+            this.TagCom5.Location = new System.Drawing.Point(228, 50);
+            this.TagCom5.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom5.Name = "TagCom5";
+            this.tableLayoutPanel1.SetRowSpan(this.TagCom5, 2);
+            this.TagCom5.Size = new System.Drawing.Size(229, 168);
+            this.TagCom5.TabIndex = 5;
+            this.TagCom5.Torque_Value = "69.3";
+            // 
+            // TagCom6
+            // 
+            this.TagCom6.Angle_Value = "22.3";
+            this.tableLayoutPanel1.SetColumnSpan(this.TagCom6, 2);
+            this.TagCom6.Com_Name = "左下部螺栓";
+            this.TagCom6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom6.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom6.LED_Name = "左下";
+            this.TagCom6.Location = new System.Drawing.Point(228, 218);
+            this.TagCom6.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom6.Name = "TagCom6";
+            this.tableLayoutPanel1.SetRowSpan(this.TagCom6, 2);
+            this.TagCom6.Size = new System.Drawing.Size(229, 169);
+            this.TagCom6.TabIndex = 5;
+            this.TagCom6.Torque_Value = "69.3";
+            // 
             // tableLayoutPanel2
             // 
             this.tableLayoutPanel2.ColumnCount = 4;
@@ -117,12 +181,12 @@ namespace SIMDP.Project
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
             this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 25F));
-            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 20F));
-            this.tableLayoutPanel2.Controls.Add(this.leftLabels3, 0, 1);
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 17F));
+            this.tableLayoutPanel2.Controls.Add(this.TagCom3, 0, 1);
             this.tableLayoutPanel2.Controls.Add(this.label3, 0, 0);
-            this.tableLayoutPanel2.Controls.Add(this.leftLabels4, 0, 3);
-            this.tableLayoutPanel2.Controls.Add(this.rightLabels3, 2, 1);
-            this.tableLayoutPanel2.Controls.Add(this.rightLabels4, 2, 3);
+            this.tableLayoutPanel2.Controls.Add(this.TagCom4, 0, 3);
+            this.tableLayoutPanel2.Controls.Add(this.TagCom1, 2, 1);
+            this.tableLayoutPanel2.Controls.Add(this.TagCom2, 2, 3);
             this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
             this.tableLayoutPanel2.Margin = new System.Windows.Forms.Padding(0);
@@ -133,9 +197,25 @@ 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, 463);
+            this.tableLayoutPanel2.Size = new System.Drawing.Size(453, 387);
             this.tableLayoutPanel2.TabIndex = 5;
             // 
+            // TagCom3
+            // 
+            this.TagCom3.Angle_Value = "22.3";
+            this.tableLayoutPanel2.SetColumnSpan(this.TagCom3, 2);
+            this.TagCom3.Com_Name = "右上部螺栓";
+            this.TagCom3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom3.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom3.LED_Name = "右上";
+            this.TagCom3.Location = new System.Drawing.Point(0, 50);
+            this.TagCom3.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom3.Name = "TagCom3";
+            this.tableLayoutPanel2.SetRowSpan(this.TagCom3, 2);
+            this.TagCom3.Size = new System.Drawing.Size(226, 168);
+            this.TagCom3.TabIndex = 1;
+            this.TagCom3.Torque_Value = "69.3";
+            // 
             // label3
             // 
             this.label3.BackColor = System.Drawing.Color.Moccasin;
@@ -146,33 +226,82 @@ namespace SIMDP.Project
             this.label3.Location = new System.Drawing.Point(0, 0);
             this.label3.Margin = new System.Windows.Forms.Padding(0);
             this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(512, 60);
+            this.label3.Size = new System.Drawing.Size(453, 50);
             this.label3.TabIndex = 0;
             this.label3.Text = "搬出车身号：LHG123451234512";
             this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
+            // TagCom4
+            // 
+            this.TagCom4.Angle_Value = "22.3";
+            this.tableLayoutPanel2.SetColumnSpan(this.TagCom4, 2);
+            this.TagCom4.Com_Name = "右下部螺栓";
+            this.TagCom4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom4.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom4.LED_Name = "右下";
+            this.TagCom4.Location = new System.Drawing.Point(0, 218);
+            this.TagCom4.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom4.Name = "TagCom4";
+            this.tableLayoutPanel2.SetRowSpan(this.TagCom4, 2);
+            this.TagCom4.Size = new System.Drawing.Size(226, 169);
+            this.TagCom4.TabIndex = 1;
+            this.TagCom4.Torque_Value = "69.3";
+            // 
+            // TagCom1
+            // 
+            this.TagCom1.Angle_Value = "22.3";
+            this.tableLayoutPanel2.SetColumnSpan(this.TagCom1, 2);
+            this.TagCom1.Com_Name = "左上部螺栓";
+            this.TagCom1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom1.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom1.LED_Name = "左上";
+            this.TagCom1.Location = new System.Drawing.Point(226, 50);
+            this.TagCom1.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom1.Name = "TagCom1";
+            this.tableLayoutPanel2.SetRowSpan(this.TagCom1, 2);
+            this.TagCom1.Size = new System.Drawing.Size(227, 168);
+            this.TagCom1.TabIndex = 5;
+            this.TagCom1.Torque_Value = "69.3";
+            // 
+            // TagCom2
+            // 
+            this.TagCom2.Angle_Value = "22.3";
+            this.tableLayoutPanel2.SetColumnSpan(this.TagCom2, 2);
+            this.TagCom2.Com_Name = "左下部螺栓";
+            this.TagCom2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.TagCom2.Font = new System.Drawing.Font("微软雅黑", 14F);
+            this.TagCom2.LED_Name = "左下";
+            this.TagCom2.Location = new System.Drawing.Point(226, 218);
+            this.TagCom2.Margin = new System.Windows.Forms.Padding(0);
+            this.TagCom2.Name = "TagCom2";
+            this.tableLayoutPanel2.SetRowSpan(this.TagCom2, 2);
+            this.TagCom2.Size = new System.Drawing.Size(227, 169);
+            this.TagCom2.TabIndex = 5;
+            this.TagCom2.Torque_Value = "69.3";
+            // 
             // label4
             // 
             this.label4.BackColor = System.Drawing.Color.LemonChiffon;
             this.label4.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.label4.Font = new System.Drawing.Font("微软雅黑", 32F);
-            this.label4.Location = new System.Drawing.Point(0, 633);
+            this.label4.Location = new System.Drawing.Point(0, 528);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(1024, 135);
+            this.label4.Size = new System.Drawing.Size(911, 112);
             this.label4.TabIndex = 6;
-            this.label4.Text = "label4";
+            this.label4.Text = "Time";
             this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // timer1
             // 
             this.timer1.Enabled = true;
-            this.timer1.Interval = 1000;
+            this.timer1.Interval = 2000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
             // splitContainer1
             // 
             this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitContainer1.Location = new System.Drawing.Point(0, 170);
+            this.splitContainer1.Location = new System.Drawing.Point(0, 141);
+            this.splitContainer1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitContainer1.Name = "splitContainer1";
             // 
             // splitContainer1.Panel1
@@ -182,8 +311,8 @@ namespace SIMDP.Project
             // splitContainer1.Panel2
             // 
             this.splitContainer1.Panel2.Controls.Add(this.tableLayoutPanel1);
-            this.splitContainer1.Size = new System.Drawing.Size(1024, 463);
-            this.splitContainer1.SplitterDistance = 512;
+            this.splitContainer1.Size = new System.Drawing.Size(911, 387);
+            this.splitContainer1.SplitterDistance = 453;
             this.splitContainer1.SplitterWidth = 1;
             this.splitContainer1.TabIndex = 7;
             // 
@@ -198,116 +327,21 @@ namespace SIMDP.Project
             this.btn_Close.FlatAppearance.MouseOverBackColor = System.Drawing.Color.Transparent;
             this.btn_Close.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
             this.btn_Close.ForeColor = System.Drawing.Color.Transparent;
-            this.btn_Close.Location = new System.Drawing.Point(933, 8);
+            this.btn_Close.Location = new System.Drawing.Point(829, 6);
+            this.btn_Close.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btn_Close.Name = "btn_Close";
-            this.btn_Close.Size = new System.Drawing.Size(83, 70);
+            this.btn_Close.Size = new System.Drawing.Size(73, 59);
             this.btn_Close.TabIndex = 8;
             this.btn_Close.UseVisualStyleBackColor = false;
             this.btn_Close.Click += new System.EventHandler(this.btn_Close_Click);
             this.btn_Close.MouseLeave += new System.EventHandler(this.btn_Close_MouseLeave);
             this.btn_Close.MouseMove += new System.Windows.Forms.MouseEventHandler(this.btn_Close_MouseMove);
             // 
-            // leftLabels3
-            // 
-            this.tableLayoutPanel2.SetColumnSpan(this.leftLabels3, 2);
-            this.leftLabels3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.leftLabels3.Font = new System.Drawing.Font("微软雅黑", 14F);
-            this.leftLabels3.Location = new System.Drawing.Point(0, 60);
-            this.leftLabels3.Margin = new System.Windows.Forms.Padding(0);
-            this.leftLabels3.Name = "leftLabels3";
-            this.tableLayoutPanel2.SetRowSpan(this.leftLabels3, 2);
-            this.leftLabels3.Size = new System.Drawing.Size(255, 200);
-            this.leftLabels3.TabIndex = 1;
-            // 
-            // leftLabels4
-            // 
-            this.tableLayoutPanel2.SetColumnSpan(this.leftLabels4, 2);
-            this.leftLabels4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.leftLabels4.Font = new System.Drawing.Font("微软雅黑", 14F);
-            this.leftLabels4.Location = new System.Drawing.Point(0, 260);
-            this.leftLabels4.Margin = new System.Windows.Forms.Padding(0);
-            this.leftLabels4.Name = "leftLabels4";
-            this.tableLayoutPanel2.SetRowSpan(this.leftLabels4, 2);
-            this.leftLabels4.Size = new System.Drawing.Size(255, 203);
-            this.leftLabels4.TabIndex = 1;
-            // 
-            // rightLabels3
-            // 
-            this.tableLayoutPanel2.SetColumnSpan(this.rightLabels3, 2);
-            this.rightLabels3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rightLabels3.Font = new System.Drawing.Font("微软雅黑", 14F);
-            this.rightLabels3.Location = new System.Drawing.Point(255, 60);
-            this.rightLabels3.Margin = new System.Windows.Forms.Padding(0);
-            this.rightLabels3.Name = "rightLabels3";
-            this.tableLayoutPanel2.SetRowSpan(this.rightLabels3, 2);
-            this.rightLabels3.Size = new System.Drawing.Size(257, 200);
-            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("微软雅黑", 14F);
-            this.rightLabels4.Location = new System.Drawing.Point(255, 260);
-            this.rightLabels4.Margin = new System.Windows.Forms.Padding(0);
-            this.rightLabels4.Name = "rightLabels4";
-            this.tableLayoutPanel2.SetRowSpan(this.rightLabels4, 2);
-            this.rightLabels4.Size = new System.Drawing.Size(257, 203);
-            this.rightLabels4.TabIndex = 5;
-            // 
-            // leftLabels1
-            // 
-            this.tableLayoutPanel1.SetColumnSpan(this.leftLabels1, 2);
-            this.leftLabels1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.leftLabels1.Font = new System.Drawing.Font("微软雅黑", 14F);
-            this.leftLabels1.Location = new System.Drawing.Point(0, 60);
-            this.leftLabels1.Margin = new System.Windows.Forms.Padding(0);
-            this.leftLabels1.Name = "leftLabels1";
-            this.tableLayoutPanel1.SetRowSpan(this.leftLabels1, 2);
-            this.leftLabels1.Size = new System.Drawing.Size(254, 200);
-            this.leftLabels1.TabIndex = 1;
-            // 
-            // leftLabels2
-            // 
-            this.tableLayoutPanel1.SetColumnSpan(this.leftLabels2, 2);
-            this.leftLabels2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.leftLabels2.Font = new System.Drawing.Font("微软雅黑", 14F);
-            this.leftLabels2.Location = new System.Drawing.Point(0, 260);
-            this.leftLabels2.Margin = new System.Windows.Forms.Padding(0);
-            this.leftLabels2.Name = "leftLabels2";
-            this.tableLayoutPanel1.SetRowSpan(this.leftLabels2, 2);
-            this.leftLabels2.Size = new System.Drawing.Size(254, 203);
-            this.leftLabels2.TabIndex = 1;
-            // 
-            // rightLabels1
-            // 
-            this.tableLayoutPanel1.SetColumnSpan(this.rightLabels1, 2);
-            this.rightLabels1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.rightLabels1.Font = new System.Drawing.Font("微软雅黑", 14F);
-            this.rightLabels1.Location = new System.Drawing.Point(254, 60);
-            this.rightLabels1.Margin = new System.Windows.Forms.Padding(0);
-            this.rightLabels1.Name = "rightLabels1";
-            this.tableLayoutPanel1.SetRowSpan(this.rightLabels1, 2);
-            this.rightLabels1.Size = new System.Drawing.Size(257, 200);
-            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("微软雅黑", 14F);
-            this.rightLabels2.Location = new System.Drawing.Point(254, 260);
-            this.rightLabels2.Margin = new System.Windows.Forms.Padding(0);
-            this.rightLabels2.Name = "rightLabels2";
-            this.tableLayoutPanel1.SetRowSpan(this.rightLabels2, 2);
-            this.rightLabels2.Size = new System.Drawing.Size(257, 203);
-            this.rightLabels2.TabIndex = 5;
-            // 
             // FormMonitorTighten
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1024, 768);
+            this.ClientSize = new System.Drawing.Size(911, 640);
             this.ControlBox = false;
             this.Controls.Add(this.btn_Close);
             this.Controls.Add(this.splitContainer1);
@@ -315,9 +349,11 @@ namespace SIMDP.Project
             this.Controls.Add(this.label1);
             this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "FormMonitorTighten";
             this.Text = "FEM拧紧设备";
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
+
             this.tableLayoutPanel1.ResumeLayout(false);
             this.tableLayoutPanel2.ResumeLayout(false);
             this.splitContainer1.Panel1.ResumeLayout(false);
@@ -333,18 +369,18 @@ namespace SIMDP.Project
 
         private ProjectBase.Controls.CircleLabel circleLabel1;
         private System.Windows.Forms.Label label1;
-        private ProjectBase.Controls.LeftLabels leftLabels1;
+        private ProjectBase.Controls.LeftLabels TagCom7;
         private System.Windows.Forms.Label label2;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
-        private ProjectBase.Controls.LeftLabels leftLabels2;
-        private ProjectBase.Controls.RightLabels rightLabels1;
-        private ProjectBase.Controls.RightLabels rightLabels2;
+        private ProjectBase.Controls.LeftLabels TagCom8;
+        private ProjectBase.Controls.RightLabels TagCom5;
+        private ProjectBase.Controls.RightLabels TagCom6;
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
-        private ProjectBase.Controls.LeftLabels leftLabels3;
+        private ProjectBase.Controls.LeftLabels TagCom3;
         private System.Windows.Forms.Label label3;
-        private ProjectBase.Controls.LeftLabels leftLabels4;
-        private ProjectBase.Controls.RightLabels rightLabels3;
-        private ProjectBase.Controls.RightLabels rightLabels4;
+        private ProjectBase.Controls.LeftLabels TagCom4;
+        private ProjectBase.Controls.RightLabels TagCom1;
+        private ProjectBase.Controls.RightLabels TagCom2;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.Timer timer1;
         private System.Windows.Forms.SplitContainer splitContainer1;

SIMDP.Project/Form/FormMonitorTighten.cs

@@ -31,10 +31,32 @@ namespace SIMDP.Project
         static string[] weekdays = { "星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六" };
 
 
+
         private void timer1_Tick(object sender, EventArgs e)
         {
             DateTime dateTimeNow = DateTime.Now;
             label4.Text = dateTimeNow.ToString("yy/MM/dd") + "  " + weekdays[Convert.ToInt32(dateTimeNow.DayOfWeek)] + "  " + dateTimeNow.ToString("HH:mm:ss");
+
+
+            //230213
+            TagCom1.Torque_Value = MXComponent_FEM02.old_torque1.ToString();
+            TagCom2.Torque_Value = MXComponent_FEM02.old_torque2.ToString();
+            TagCom3.Torque_Value = MXComponent_FEM02.old_torque3.ToString();
+            TagCom4.Torque_Value = MXComponent_FEM02.old_torque4.ToString();
+            TagCom5.Torque_Value = MXComponent_FEM02.torque1.ToString();
+            TagCom6.Torque_Value = MXComponent_FEM02.torque2.ToString();
+            TagCom7.Torque_Value = MXComponent_FEM02.torque3.ToString();
+            TagCom8.Torque_Value = MXComponent_FEM02.torque4.ToString();
+
+            TagCom1.Angle_Value = MXComponent_FEM02.old_angle1.ToString();
+            TagCom2.Angle_Value = MXComponent_FEM02.old_angle2.ToString();
+            TagCom3.Angle_Value = MXComponent_FEM02.old_angle3.ToString();
+            TagCom4.Angle_Value = MXComponent_FEM02.old_angle4.ToString();
+            TagCom5.Angle_Value = MXComponent_FEM02.angle1.ToString();
+            TagCom6.Angle_Value = MXComponent_FEM02.angle2.ToString();
+            TagCom7.Angle_Value = MXComponent_FEM02.angle3.ToString();
+            TagCom8.Angle_Value = MXComponent_FEM02.angle4.ToString();
+
         }
 
 
@@ -53,5 +75,8 @@ namespace SIMDP.Project
         {
             this.Close();
         }
+
+
+
     }
 }

SIMDP.Project/MXComponent_FEM02.cs

@@ -677,6 +677,32 @@ namespace SIMDP.Project
             LogHelper.log.Info($"FEM指针跳至 {SysEnvironment.Global_FEM_Pointer}");
         }
 
+        public static short itightRes1 = 0;
+        public static short itightRes2 = 0;
+        public static short itightRes3 = 0;
+        public static short itightRes4 = 0;
+        public static float torque1 = 0.0f;
+        public static float torque2 = 0.0f;
+        public static float torque3 = 0.0f;
+        public static float torque4 = 0.0f;
+        public static float angle1 = 0.0f;
+        public static float angle2 = 0.0f;
+        public static float angle3 = 0.0f;
+        public static float angle4 = 0.0f;
+
+        public static short old_itightRes1 = 0;
+        public static short old_itightRes2 = 0;
+        public static short old_itightRes3 = 0;
+        public static short old_itightRes4 = 0;
+        public static float old_torque1 = 0.0f;
+        public static float old_torque2 = 0.0f;
+        public static float old_torque3 = 0.0f;
+        public static float old_torque4 = 0.0f;
+        public static float old_angle1 = 0.0f;
+        public static float old_angle2 = 0.0f;
+        public static float old_angle3 = 0.0f;
+        public static float old_angle4 = 0.0f;
+
         public void 读取拧紧结果请求(object value)
         {
             bool signal = Convert.ToBoolean(value);
@@ -686,18 +712,33 @@ namespace SIMDP.Project
                 Write("读取拧紧结果完成", false);
                 return;
             }
-            Read("拧紧结果1", out short itightRes1);
-            Read("拧紧结果2", out short itightRes2);
-            Read("拧紧结果3", out short itightRes3);
-            Read("拧紧结果4", out short itightRes4);
-            Read("拧紧力矩1", out float moment1);
-            Read("拧紧力矩2", out float moment2);
-            Read("拧紧力矩3", out float moment3);
-            Read("拧紧力矩4", out float moment4);
-            Read("拧紧角度1", out float angle1);
-            Read("拧紧角度2", out float angle2);
-            Read("拧紧角度3", out float angle3);
-            Read("拧紧角度4", out float angle4);
+
+            //读取新的之前，把旧的值传到搬出工位
+            old_itightRes1 = itightRes1;
+            old_itightRes2 = itightRes2;
+            old_itightRes3 = itightRes3;
+            old_itightRes4 = itightRes4;
+            old_torque1 = torque1;
+            old_torque2 = torque2;
+            old_torque3 = torque3;
+            old_torque4 = torque4;
+            old_angle1 = angle1;
+            old_angle2 = angle2;
+            old_angle3 = angle3;
+            old_angle4 = angle4;
+
+            Read("拧紧结果1", out itightRes1);
+            Read("拧紧结果2", out itightRes2);
+            Read("拧紧结果3", out itightRes3);
+            Read("拧紧结果4", out itightRes4);
+            Read("拧紧力矩1", out torque1);
+            Read("拧紧力矩2", out torque2);
+            Read("拧紧力矩3", out torque3);
+            Read("拧紧力矩4", out torque4);
+            Read("拧紧角度1", out angle1);
+            Read("拧紧角度2", out angle2);
+            Read("拧紧角度3", out angle3);
+            Read("拧紧角度4", out angle4);
             try
             {
                 string curerntVIN = SysEnvironment.Global_Tighting_Pointer;
@@ -717,10 +758,10 @@ namespace SIMDP.Project
                     data.dict["状态2"] = GetTightResult(itightRes2);
                     data.dict["状态3"] = GetTightResult(itightRes3);
                     data.dict["状态4"] = GetTightResult(itightRes4);
-                    data.dict["力矩1"] = moment1.ToString();
-                    data.dict["力矩2"] = moment2.ToString();
-                    data.dict["力矩3"] = moment3.ToString();
-                    data.dict["力矩4"] = moment4.ToString();
+                    data.dict["力矩1"] = torque1.ToString();
+                    data.dict["力矩2"] = torque2.ToString();
+                    data.dict["力矩3"] = torque3.ToString();
+                    data.dict["力矩4"] = torque4.ToString();
                     data.dict["角度1"] = angle1.ToString();
                     data.dict["角度2"] = angle2.ToString();
                     data.dict["角度3"] = angle3.ToString();
@@ -740,10 +781,10 @@ namespace SIMDP.Project
                     data.dict["状态2"] = GetTightResult(itightRes2);
                     data.dict["状态3"] = GetTightResult(itightRes3);
                     data.dict["状态4"] = GetTightResult(itightRes4);
-                    data.dict["力矩1"] = moment1.ToString();
-                    data.dict["力矩2"] = moment2.ToString();
-                    data.dict["力矩3"] = moment3.ToString();
-                    data.dict["力矩4"] = moment4.ToString();
+                    data.dict["力矩1"] = torque1.ToString();
+                    data.dict["力矩2"] = torque2.ToString();
+                    data.dict["力矩3"] = torque3.ToString();
+                    data.dict["力矩4"] = torque4.ToString();
                     data.dict["角度1"] = angle1.ToString();
                     data.dict["角度2"] = angle2.ToString();
                     data.dict["角度3"] = angle3.ToString();