Quellcode durchsuchen

拧紧枪页面

Ge mingyu vor 1 Jahr
Ursprung
Commit
ea42d06723
29 geänderte Dateien mit 4655 neuen und 31 gelöschten Zeilen
  1. 9 4
      ProjectBase.Controls/CircleLabel.Designer.cs
  2. 10 2
      ProjectBase.Controls/CircleLabel.cs
  3. 146 0
      ProjectBase.Controls/LeftLabels.Designer.cs
  4. 35 0
      ProjectBase.Controls/LeftLabels.cs
  5. 120 0
      ProjectBase.Controls/LeftLabels.resx
  6. 22 0
      ProjectBase.Controls/ProjectBase.Controls.csproj
  7. 40 0
      ProjectBase.Controls/Properties/Resources.Designer.cs
  8. 12 0
      ProjectBase.Controls/Properties/Resources.resx
  9. BIN
      ProjectBase.Controls/Resources/绿色指示灯1.png
  10. BIN
      ProjectBase.Controls/Resources/绿色指示灯2.png
  11. BIN
      ProjectBase.Controls/Resources/绿色指示灯3.png
  12. BIN
      ProjectBase.Controls/Resources/绿色指示灯4.png
  13. 146 0
      ProjectBase.Controls/RightLabels.Designer.cs
  14. 35 0
      ProjectBase.Controls/RightLabels.cs
  15. 120 0
      ProjectBase.Controls/RightLabels.resx
  16. 1 1
      SIMDP.Project/App.config
  17. 423 0
      SIMDP.Project/Form/FormMonitorTighten.Designer.cs
  18. 33 1
      SIMDP.Project/Form/FormMonitorTighten.cs
  19. 3412 0
      SIMDP.Project/Form/FormMonitorTighten.resx
  20. 23 22
      SIMDP.Project/Form/MainForm.cs
  21. BIN
      SIMDP.Project/Images/Close2_32x32.png
  22. BIN
      SIMDP.Project/Images/绿色指示灯1.png
  23. BIN
      SIMDP.Project/Images/绿色指示灯2.png
  24. BIN
      SIMDP.Project/Images/绿色指示灯3.png
  25. BIN
      SIMDP.Project/Images/绿色指示灯4.png
  26. 11 1
      SIMDP.Project/Properties/Resources.Designer.cs
  27. 3 0
      SIMDP.Project/Properties/Resources.resx
  28. 53 0
      SIMDP.Project/RibbonPageHelper/RibbonPageHelper.cs
  29. 1 0
      SIMDP.Project/SIMDP.Project.csproj

+ 9 - 4
ProjectBase.Controls/CircleLabel.Designer.cs

@@ -34,24 +34,29 @@
             // label1
             // 
             this.label1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.label1.Font = new System.Drawing.Font("宋体", 15F);
+            this.label1.Font = new System.Drawing.Font("微软雅黑", 14F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            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.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(150, 150);
+            this.label1.Size = new System.Drawing.Size(112, 112);
             this.label1.TabIndex = 0;
-            this.label1.Text = "上";
+            this.label1.Text = "上";
             this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // CircleLabel
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(18F, 39F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Transparent;
             this.BackgroundImage = global::ProjectBase.Controls.Properties.Resources.绿色指示灯;
             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.Name = "CircleLabel";
+            this.Size = new System.Drawing.Size(112, 112);
             this.FontChanged += new System.EventHandler(this.CircleLabel_FontChanged);
             this.ResumeLayout(false);
 

+ 10 - 2
ProjectBase.Controls/CircleLabel.cs

@@ -49,7 +49,7 @@ namespace ProjectBase.Controls
             switch (WorkState)
             {
                 case LedState.OK:
-                    BackgroundImage = Properties.Resources.绿色指示灯;
+                    BackgroundImage = Properties.Resources.绿色指示灯4;
                     break;
                 case LedState.NG:
                     BackgroundImage = Properties.Resources.红色指示灯;
@@ -62,8 +62,8 @@ namespace ProjectBase.Controls
 
         public enum LedState
         {
-            OK = 1,
             NG = 0,
+            OK = 1,
             DEFAULT= -1,
 
         }
@@ -72,5 +72,13 @@ namespace ProjectBase.Controls
         {
             label1.Font = this.Font;
         }
+
+
+        [Browsable(true)]
+        public override string Text 
+        {
+            get { return label1.Text; }
+            set { label1.Text = value; }
+        }
     }
 }

+ 146 - 0
ProjectBase.Controls/LeftLabels.Designer.cs

@@ -0,0 +1,146 @@
+namespace ProjectBase.Controls
+{
+    partial class LeftLabels
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.LawnGreen;
+            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            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.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(194, 45);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "右上部螺栓";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
+            // 
+            // label2
+            // 
+            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.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(94, 45);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "扭矩";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label3
+            // 
+            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.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(94, 46);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "角度";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label4
+            // 
+            this.label4.BackColor = System.Drawing.Color.Aqua;
+            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.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(94, 45);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "69.3";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label5
+            // 
+            this.label5.BackColor = System.Drawing.Color.Aqua;
+            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.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(94, 46);
+            this.label5.TabIndex = 4;
+            this.label5.Text = "22.3";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 2;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.Controls.Add(this.label5, 1, 2);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2);
+            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.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.TabIndex = 5;
+            // 
+            // LeftLabels
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Name = "LeftLabels";
+            this.Size = new System.Drawing.Size(200, 136);
+            this.FontChanged += new System.EventHandler(this.LeftLabels_FontChanged);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+    }
+}

+ 35 - 0
ProjectBase.Controls/LeftLabels.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectBase.Controls
+{
+    public partial class LeftLabels : UserControl
+    {
+        public LeftLabels()
+        {
+            InitializeComponent();
+        }
+
+        private void LeftLabels_FontChanged(object sender, EventArgs e)
+        {
+            foreach (Control control in tableLayoutPanel1.Controls)
+            {
+                control.Font = this.Font;
+            }
+        }
+
+        [Browsable(true)]
+        public override string Text
+        {
+            get { return label1.Text; }
+            set { label1.Text = value; }
+        }
+    }
+}

+ 120 - 0
ProjectBase.Controls/LeftLabels.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 22 - 0
ProjectBase.Controls/ProjectBase.Controls.csproj

@@ -138,6 +138,12 @@
     <Compile Include="DocViewer\FrmWordView.Designer.cs">
       <DependentUpon>FrmWordView.cs</DependentUpon>
     </Compile>
+    <Compile Include="LeftLabels.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="LeftLabels.Designer.cs">
+      <DependentUpon>LeftLabels.cs</DependentUpon>
+    </Compile>
     <Compile Include="FrmSelectColumnDisplay.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -181,6 +187,12 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Include="RightLabels.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="RightLabels.Designer.cs">
+      <DependentUpon>RightLabels.cs</DependentUpon>
+    </Compile>
     <Compile Include="WinGridViewPager.cs">
       <SubType>UserControl</SubType>
     </Compile>
@@ -213,6 +225,9 @@
     <EmbeddedResource Include="FrmSelectColumnDisplay.resx">
       <DependentUpon>FrmSelectColumnDisplay.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="LeftLabels.resx">
+      <DependentUpon>LeftLabels.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Pager.resx">
       <DependentUpon>Pager.cs</DependentUpon>
     </EmbeddedResource>
@@ -227,6 +242,9 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <EmbeddedResource Include="RightLabels.resx">
+      <DependentUpon>RightLabels.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="WinGridViewPager.resx">
       <DependentUpon>WinGridViewPager.cs</DependentUpon>
     </EmbeddedResource>
@@ -246,6 +264,10 @@
     <Content Include="Icon\Edit.ico" />
     <Content Include="Icon\excel.ico" />
     <Content Include="Icon\filter.ico" />
+    <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" />

+ 40 - 0
ProjectBase.Controls/Properties/Resources.Designer.cs

@@ -109,5 +109,45 @@ namespace ProjectBase.Controls.Properties {
                 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);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

+ 12 - 0
ProjectBase.Controls/Properties/Resources.resx

@@ -133,4 +133,16 @@
   <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>
 </root>

BIN
ProjectBase.Controls/Resources/绿色指示灯1.png


BIN
ProjectBase.Controls/Resources/绿色指示灯2.png


BIN
ProjectBase.Controls/Resources/绿色指示灯3.png


BIN
ProjectBase.Controls/Resources/绿色指示灯4.png


+ 146 - 0
ProjectBase.Controls/RightLabels.Designer.cs

@@ -0,0 +1,146 @@
+namespace ProjectBase.Controls
+{
+    partial class RightLabels
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源,为 true;否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            this.label5 = new System.Windows.Forms.Label();
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.label3 = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.tableLayoutPanel1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // label5
+            // 
+            this.label5.BackColor = System.Drawing.Color.Aqua;
+            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.Name = "label5";
+            this.label5.Size = new System.Drawing.Size(94, 46);
+            this.label5.TabIndex = 4;
+            this.label5.Text = "22.3";
+            this.label5.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label1
+            // 
+            this.label1.BackColor = System.Drawing.Color.LawnGreen;
+            this.label1.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
+            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.Name = "label1";
+            this.label1.Size = new System.Drawing.Size(194, 45);
+            this.label1.TabIndex = 0;
+            this.label1.Text = "左上部螺栓";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
+            // 
+            // label2
+            // 
+            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.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(94, 45);
+            this.label2.TabIndex = 1;
+            this.label2.Text = "扭矩";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label3
+            // 
+            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.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(94, 46);
+            this.label3.TabIndex = 2;
+            this.label3.Text = "角度";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label4
+            // 
+            this.label4.BackColor = System.Drawing.Color.Aqua;
+            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.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(94, 45);
+            this.label4.TabIndex = 3;
+            this.label4.Text = "69.3";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 2;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
+            this.tableLayoutPanel1.Controls.Add(this.label5, 1, 2);
+            this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label3, 0, 2);
+            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.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.TabIndex = 6;
+            // 
+            // RightLabels
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.tableLayoutPanel1);
+            this.Name = "RightLabels";
+            this.Size = new System.Drawing.Size(200, 136);
+            this.FontChanged += new System.EventHandler(this.RightLabels_FontChanged);
+            this.tableLayoutPanel1.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label label4;
+    }
+}

+ 35 - 0
ProjectBase.Controls/RightLabels.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectBase.Controls
+{
+    public partial class RightLabels : UserControl
+    {
+        public RightLabels()
+        {
+            InitializeComponent();
+        }
+
+        private void RightLabels_FontChanged(object sender, EventArgs e)
+        {
+            foreach (Control control in tableLayoutPanel1.Controls)
+            {
+                control.Font = this.Font;
+            }
+        }
+
+        [Browsable(true)]
+        public override string Text
+        {
+            get { return label1.Text; }
+            set { label1.Text = value; }
+        }
+    }
+}

+ 120 - 0
ProjectBase.Controls/RightLabels.resx

@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

+ 1 - 1
SIMDP.Project/App.config

@@ -10,7 +10,7 @@
 		<add key="ComponentDbType" value="sqlserver" />
 		<!--默认登陆的用户ID-->
 		<add key="DefaultUser" value="123" />
-		<add key="Version" value="1.7.6" />
+		<add key="Version" value="1.8.1" />
 		<add key="ClientSettingsProvider.ServiceUri" value="" />
 	</appSettings>
 	<connectionStrings>

+ 423 - 0
SIMDP.Project/Form/FormMonitorTighten.Designer.cs

@@ -29,25 +29,448 @@ namespace SIMDP.Project
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMonitorTighten));
+            this.label1 = new System.Windows.Forms.Label();
+            this.label2 = new System.Windows.Forms.Label();
+            this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
+            this.leftLabels1 = new ProjectBase.Controls.LeftLabels();
+            this.circleLabel2 = new ProjectBase.Controls.CircleLabel();
+            this.leftLabels2 = new ProjectBase.Controls.LeftLabels();
+            this.circleLabel3 = new ProjectBase.Controls.CircleLabel();
+            this.circleLabel4 = new ProjectBase.Controls.CircleLabel();
+            this.circleLabel5 = new ProjectBase.Controls.CircleLabel();
+            this.rightLabels1 = new ProjectBase.Controls.RightLabels();
+            this.rightLabels2 = new ProjectBase.Controls.RightLabels();
+            this.tableLayoutPanel2 = new System.Windows.Forms.TableLayoutPanel();
+            this.leftLabels3 = new ProjectBase.Controls.LeftLabels();
+            this.label3 = new System.Windows.Forms.Label();
+            this.circleLabel6 = new ProjectBase.Controls.CircleLabel();
+            this.leftLabels4 = new ProjectBase.Controls.LeftLabels();
+            this.circleLabel7 = new ProjectBase.Controls.CircleLabel();
+            this.circleLabel8 = new ProjectBase.Controls.CircleLabel();
+            this.circleLabel9 = new ProjectBase.Controls.CircleLabel();
+            this.rightLabels3 = new ProjectBase.Controls.RightLabels();
+            this.rightLabels4 = 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.tableLayoutPanel1.SuspendLayout();
+            this.tableLayoutPanel2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
             this.SuspendLayout();
             // 
+            // label1
+            // 
+            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.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.TabIndex = 3;
+            this.label1.Text = "FEM自动拧紧设备";
+            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // label2
+            // 
+            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.Location = new System.Drawing.Point(3, 0);
+            this.label2.Name = "label2";
+            this.label2.Size = new System.Drawing.Size(502, 79);
+            this.label2.TabIndex = 0;
+            this.label2.Text = "装配车身号:LHG123451234512";
+            this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // tableLayoutPanel1
+            // 
+            this.tableLayoutPanel1.ColumnCount = 6;
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66668F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel1.Controls.Add(this.leftLabels1, 0, 1);
+            this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0);
+            this.tableLayoutPanel1.Controls.Add(this.circleLabel2, 2, 1);
+            this.tableLayoutPanel1.Controls.Add(this.leftLabels2, 0, 3);
+            this.tableLayoutPanel1.Controls.Add(this.circleLabel3, 2, 3);
+            this.tableLayoutPanel1.Controls.Add(this.circleLabel4, 3, 1);
+            this.tableLayoutPanel1.Controls.Add(this.circleLabel5, 3, 3);
+            this.tableLayoutPanel1.Controls.Add(this.rightLabels1, 4, 1);
+            this.tableLayoutPanel1.Controls.Add(this.rightLabels2, 4, 3);
+            this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel1.Name = "tableLayoutPanel1";
+            this.tableLayoutPanel1.RowCount = 5;
+            this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 13.04348F));
+            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.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.TabIndex = 5;
+            // 
+            // leftLabels1
+            // 
+            this.tableLayoutPanel1.SetColumnSpan(this.leftLabels1, 2);
+            this.leftLabels1.Font = new System.Drawing.Font("宋体", 12F);
+            this.leftLabels1.Location = new System.Drawing.Point(4, 83);
+            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.TabIndex = 1;
+            // 
+            // circleLabel2
+            // 
+            this.circleLabel2.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel2";
+            this.tableLayoutPanel1.SetRowSpan(this.circleLabel2, 2);
+            this.circleLabel2.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel2.TabIndex = 4;
+            this.circleLabel2.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // leftLabels2
+            // 
+            this.tableLayoutPanel1.SetColumnSpan(this.leftLabels2, 2);
+            this.leftLabels2.Font = new System.Drawing.Font("宋体", 12F);
+            this.leftLabels2.Location = new System.Drawing.Point(4, 347);
+            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.TabIndex = 1;
+            // 
+            // circleLabel3
+            // 
+            this.circleLabel3.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel3";
+            this.tableLayoutPanel1.SetRowSpan(this.circleLabel3, 2);
+            this.circleLabel3.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel3.TabIndex = 4;
+            this.circleLabel3.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // circleLabel4
+            // 
+            this.circleLabel4.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel4";
+            this.tableLayoutPanel1.SetRowSpan(this.circleLabel4, 2);
+            this.circleLabel4.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel4.TabIndex = 4;
+            this.circleLabel4.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // circleLabel5
+            // 
+            this.circleLabel5.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel5";
+            this.tableLayoutPanel1.SetRowSpan(this.circleLabel5, 2);
+            this.circleLabel5.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel5.TabIndex = 4;
+            this.circleLabel5.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // rightLabels1
+            // 
+            this.tableLayoutPanel1.SetColumnSpan(this.rightLabels1, 2);
+            this.rightLabels1.Font = new System.Drawing.Font("宋体", 12F);
+            this.rightLabels1.Location = new System.Drawing.Point(340, 83);
+            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.TabIndex = 5;
+            // 
+            // rightLabels2
+            // 
+            this.tableLayoutPanel1.SetColumnSpan(this.rightLabels2, 2);
+            this.rightLabels2.Font = new System.Drawing.Font("宋体", 12F);
+            this.rightLabels2.Location = new System.Drawing.Point(340, 347);
+            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.TabIndex = 5;
+            // 
+            // tableLayoutPanel2
+            // 
+            this.tableLayoutPanel2.ColumnCount = 6;
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66668F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 16.66667F));
+            this.tableLayoutPanel2.Controls.Add(this.leftLabels3, 0, 1);
+            this.tableLayoutPanel2.Controls.Add(this.label3, 0, 0);
+            this.tableLayoutPanel2.Controls.Add(this.circleLabel6, 2, 1);
+            this.tableLayoutPanel2.Controls.Add(this.leftLabels4, 0, 3);
+            this.tableLayoutPanel2.Controls.Add(this.circleLabel7, 2, 3);
+            this.tableLayoutPanel2.Controls.Add(this.circleLabel8, 3, 1);
+            this.tableLayoutPanel2.Controls.Add(this.circleLabel9, 3, 3);
+            this.tableLayoutPanel2.Controls.Add(this.rightLabels3, 4, 1);
+            this.tableLayoutPanel2.Controls.Add(this.rightLabels4, 4, 3);
+            this.tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tableLayoutPanel2.Location = new System.Drawing.Point(0, 0);
+            this.tableLayoutPanel2.Name = "tableLayoutPanel2";
+            this.tableLayoutPanel2.RowCount = 5;
+            this.tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 13.04348F));
+            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.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.TabIndex = 5;
+            // 
+            // leftLabels3
+            // 
+            this.tableLayoutPanel2.SetColumnSpan(this.leftLabels3, 2);
+            this.leftLabels3.Font = new System.Drawing.Font("宋体", 12F);
+            this.leftLabels3.Location = new System.Drawing.Point(4, 83);
+            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.TabIndex = 1;
+            // 
+            // label3
+            // 
+            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.Location = new System.Drawing.Point(3, 0);
+            this.label3.Name = "label3";
+            this.label3.Size = new System.Drawing.Size(506, 79);
+            this.label3.TabIndex = 0;
+            this.label3.Text = "搬出车身号:LHG123451234512";
+            this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // circleLabel6
+            // 
+            this.circleLabel6.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel6";
+            this.tableLayoutPanel2.SetRowSpan(this.circleLabel6, 2);
+            this.circleLabel6.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel6.TabIndex = 4;
+            this.circleLabel6.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // leftLabels4
+            // 
+            this.tableLayoutPanel2.SetColumnSpan(this.leftLabels4, 2);
+            this.leftLabels4.Font = new System.Drawing.Font("宋体", 12F);
+            this.leftLabels4.Location = new System.Drawing.Point(4, 347);
+            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.TabIndex = 1;
+            // 
+            // circleLabel7
+            // 
+            this.circleLabel7.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel7";
+            this.tableLayoutPanel2.SetRowSpan(this.circleLabel7, 2);
+            this.circleLabel7.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel7.TabIndex = 4;
+            this.circleLabel7.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // circleLabel8
+            // 
+            this.circleLabel8.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel8";
+            this.tableLayoutPanel2.SetRowSpan(this.circleLabel8, 2);
+            this.circleLabel8.Size = new System.Drawing.Size(75, 108);
+            this.circleLabel8.TabIndex = 4;
+            this.circleLabel8.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // circleLabel9
+            // 
+            this.circleLabel9.BackColor = System.Drawing.Color.Transparent;
+            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.Name = "circleLabel9";
+            this.tableLayoutPanel2.SetRowSpan(this.circleLabel9, 2);
+            this.circleLabel9.Size = new System.Drawing.Size(75, 109);
+            this.circleLabel9.TabIndex = 4;
+            this.circleLabel9.WorkState = ProjectBase.Controls.CircleLabel.LedState.OK;
+            // 
+            // rightLabels3
+            // 
+            this.tableLayoutPanel2.SetColumnSpan(this.rightLabels3, 2);
+            this.rightLabels3.Font = new System.Drawing.Font("宋体", 12F);
+            this.rightLabels3.Location = new System.Drawing.Point(344, 83);
+            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.TabIndex = 5;
+            // 
+            // rightLabels4
+            // 
+            this.tableLayoutPanel2.SetColumnSpan(this.rightLabels4, 2);
+            this.rightLabels4.Font = new System.Drawing.Font("宋体", 12F);
+            this.rightLabels4.Location = new System.Drawing.Point(344, 347);
+            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.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.Name = "label4";
+            this.label4.Size = new System.Drawing.Size(1024, 74);
+            this.label4.TabIndex = 6;
+            this.label4.Text = "label4";
+            this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            // 
+            // timer1
+            // 
+            this.timer1.Enabled = true;
+            this.timer1.Interval = 1000;
+            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, 84);
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            this.splitContainer1.Panel1.Controls.Add(this.tableLayoutPanel2);
+            // 
+            // splitContainer1.Panel2
+            // 
+            this.splitContainer1.Panel2.Controls.Add(this.tableLayoutPanel1);
+            this.splitContainer1.Size = new System.Drawing.Size(1024, 610);
+            this.splitContainer1.SplitterDistance = 512;
+            this.splitContainer1.TabIndex = 7;
+            // 
+            // btn_Close
+            // 
+            this.btn_Close.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btn_Close.AutoSize = true;
+            this.btn_Close.BackColor = System.Drawing.Color.Transparent;
+            this.btn_Close.FlatAppearance.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.btn_Close.FlatAppearance.BorderSize = 0;
+            this.btn_Close.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Transparent;
+            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.Name = "btn_Close";
+            this.btn_Close.Size = new System.Drawing.Size(83, 70);
+            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);
+            // 
             // FormMonitorTighten
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1024, 768);
             this.ControlBox = false;
+            this.Controls.Add(this.btn_Close);
+            this.Controls.Add(this.splitContainer1);
+            this.Controls.Add(this.label4);
+            this.Controls.Add(this.label1);
             this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             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);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
 
         private ProjectBase.Controls.CircleLabel circleLabel1;
+        private System.Windows.Forms.Label label1;
+        private ProjectBase.Controls.CircleLabel circleLabel2;
+        private ProjectBase.Controls.LeftLabels leftLabels1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+        private ProjectBase.Controls.LeftLabels leftLabels2;
+        private ProjectBase.Controls.CircleLabel circleLabel3;
+        private ProjectBase.Controls.CircleLabel circleLabel4;
+        private ProjectBase.Controls.CircleLabel circleLabel5;
+        private ProjectBase.Controls.RightLabels rightLabels1;
+        private ProjectBase.Controls.RightLabels rightLabels2;
+        private System.Windows.Forms.TableLayoutPanel tableLayoutPanel2;
+        private ProjectBase.Controls.LeftLabels leftLabels3;
+        private System.Windows.Forms.Label label3;
+        private ProjectBase.Controls.CircleLabel circleLabel6;
+        private ProjectBase.Controls.LeftLabels leftLabels4;
+        private ProjectBase.Controls.CircleLabel circleLabel7;
+        private ProjectBase.Controls.CircleLabel circleLabel8;
+        private ProjectBase.Controls.CircleLabel circleLabel9;
+        private ProjectBase.Controls.RightLabels rightLabels3;
+        private ProjectBase.Controls.RightLabels rightLabels4;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Timer timer1;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.Button btn_Close;
     }
 }

+ 33 - 1
SIMDP.Project/Form/FormMonitorTighten.cs

@@ -15,11 +15,43 @@ namespace SIMDP.Project
         public FormMonitorTighten()
         {
             InitializeComponent();
+
+            btn_Close.Parent = label1;
+
+            foreach (Control control1 in tableLayoutPanel1.Controls)
+            {
+                control1.Dock = DockStyle.Fill;
+            }
+            foreach (Control control1 in tableLayoutPanel2.Controls)
+            {
+                control1.Dock = DockStyle.Fill;
+            }
         }
 
-        private void circleLabel3_Load(object sender, EventArgs e)
+        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");
+        }
+
 
+        private void btn_Close_MouseMove(object sender, MouseEventArgs e)
+        {
+            btn_Close.BackgroundImage = global::SIMDP.Project.Properties.Resources.Close2_32x32;
+            btn_Close.BackgroundImageLayout = ImageLayout.Stretch;
+        }
+
+        private void btn_Close_MouseLeave(object sender, EventArgs e)
+        {
+            btn_Close.BackgroundImage = null;
+        }
+
+        private void btn_Close_Click(object sender, EventArgs e)
+        {
+            this.Close();
         }
     }
 }

Datei-Diff unterdrückt, da er zu groß ist
+ 3412 - 0
SIMDP.Project/Form/FormMonitorTighten.resx


+ 23 - 22
SIMDP.Project/Form/MainForm.cs

@@ -29,50 +29,42 @@ namespace SIMDP.Project
         SchedulerHelper task = new SchedulerHelper();
 
         private RedisHelper redis = new RedisHelper(0);
-  
-        UserIdleStatusHelper activityMonitor = new UserIdleStatusHelper(300000);//获取用户空闲状态类
+
+        UserIdleStatusHelper activityMonitor = new UserIdleStatusHelper(300000);
 
         public MainForm()
         {
             InitializeComponent();
 
-            DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle("Office 2019 Colorful");//设置主题样式
+            DevExpress.LookAndFeel.UserLookAndFeel.Default.SetSkinStyle("Office 2019 Colorful");
         }
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            //ToDo:最小化托盘显示
-            this.notifyIcon1.Visible = true;
-            this.ribbonControl.Minimized = true;
+            notifyIcon1.Visible = false;
+            ribbonControl.Minimized = true;
             task.Start();
             GetIpMac();
-            this.label_Version.Caption = "当前版本号:" + System.Configuration.ConfigurationManager.AppSettings["Version"];
+            label_Version.Caption = "当前版本号:" + System.Configuration.ConfigurationManager.AppSettings["Version"];
             string defaultUser = System.Configuration.ConfigurationManager.AppSettings["DefaultUser"];
-            if (defaultUser != null && defaultUser != "")
+            if (!string.IsNullOrEmpty(defaultUser))
             {
-                SysEnvironment.CurrentLoginID = defaultUser; //默认登录用户
-                //开启XX窗口
-                FormMonitorTighten form2 = new FormMonitorTighten();
-                form2.MdiParent = this;
-                form2.Show();
+                SysEnvironment.CurrentLoginID = defaultUser;
             }
             else
             {
                 LogIn();
             }
             InitRibbonPage();
+            InitMonitor();
+
             SysSubscribeEvent();
             barButtonItemReset_ItemClick(this, null);
-            // 刷卡登录界面
-            //FormSwipeToLogin form = new FormSwipeToLogin();
-            //form.Show();
 
-            //开启XX窗口
             FormCurrentTask form = new FormCurrentTask();
             form.MdiParent = this;
             form.Show();
 
-            //获取用户操作状态
             activityMonitor.Start();
             redis.Publish(SysEnvironment.UserOperateState, "");
         }
@@ -195,10 +187,19 @@ namespace SIMDP.Project
             Assembly asmb = Assembly.LoadFrom("SIMDP.View.dll");
             Type type = asmb.GetType("SIMDP.View.FormLogIn");
 
-            //  Type type = Type.GetType("SIMDP.View.FormLogIn");
             FormLogIn logIn = ChildWinManagement.LoadMdiForm(this, type) as FormLogIn;
-            this.xtraTabbedMdiManager1.Pages[0].ShowCloseButton = DevExpress.Utils.DefaultBoolean.False;
+            xtraTabbedMdiManager1.Pages[0].ShowCloseButton = DevExpress.Utils.DefaultBoolean.False;
             logIn.myRefresh += new FormLogIn.refresh(InitRibbonPage);
+
+        }
+
+        private Type[] Monitors = new Type[] { typeof(FormMonitorTighten) };
+        private void InitMonitor()
+        {
+            foreach (Type type in Monitors)
+            {
+                RibbonPageHelper.LoadExtraForm(type);
+            }
         }
 
         /// <summary>
@@ -382,11 +383,11 @@ namespace SIMDP.Project
             {
                 BeginInvoke(new Action(() =>
                 {
-                    RefreshUserState(channel,message);
+                    RefreshUserState(channel, message);
                 }));
                 return;
             }
-            
+
             if (activityMonitor.IsIdle)
             {
                 this.barStaticItem_Idle.Caption = "空闲";

BIN
SIMDP.Project/Images/Close2_32x32.png


BIN
SIMDP.Project/Images/绿色指示灯1.png


BIN
SIMDP.Project/Images/绿色指示灯2.png


BIN
SIMDP.Project/Images/绿色指示灯3.png


BIN
SIMDP.Project/Images/绿色指示灯4.png


+ 11 - 1
SIMDP.Project/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace SIMDP.Project.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员,请编辑 .ResX 文件,然后重新运行 ResGen
     // (以 /str 作为命令选项),或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -60,6 +60,16 @@ namespace SIMDP.Project.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap Close2_32x32 {
+            get {
+                object obj = ResourceManager.GetObject("Close2_32x32", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

+ 3 - 0
SIMDP.Project/Properties/Resources.resx

@@ -118,6 +118,9 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="Close2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Images\Close2_32x32.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>..\Images\绿色指示灯.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>

+ 53 - 0
SIMDP.Project/RibbonPageHelper/RibbonPageHelper.cs

@@ -215,5 +215,58 @@ namespace SIMDP.Project
 
             return tableForm;
         }
+
+        /// <summary>
+        /// 以扩展窗口的方式,唯一地加载窗体
+        /// </summary>
+        /// <param name="formType"></param>
+        public static void LoadExtraForm(Type formType)
+        {
+            bool bFound = false;
+            Form tableForm = null;
+
+            foreach (Form form in Application.OpenForms)
+            {
+                if (form.GetType() == formType)
+                {
+                    bFound = true;
+                    tableForm = form;
+                    break;
+                }
+            }
+            if (!bFound)
+            {
+                tableForm = (Form)Activator.CreateInstance(formType);
+            }
+
+            tableForm.BringToFront();
+            tableForm.Activate();
+
+
+
+            System.Windows.Forms.Screen[] screens = System.Windows.Forms.Screen.AllScreens;
+            Screen extendScreen = null;
+
+            if (screens.Length <= 1)
+            {
+                extendScreen = screens[0];
+            }
+            else
+            {
+                foreach (Screen screen in screens)
+                {
+                    if (!screen.Primary)
+                    {
+                        extendScreen = screen;
+                        break;
+                    }
+                }
+            }
+
+            tableForm.StartPosition = FormStartPosition.Manual;
+            tableForm.Location = new Point(extendScreen.Bounds.Left, extendScreen.Bounds.Top);
+            tableForm.WindowState = FormWindowState.Maximized;
+            tableForm.Show();
+        }
     }
 }

+ 1 - 0
SIMDP.Project/SIMDP.Project.csproj

@@ -272,6 +272,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="favicon.ico" />
+    <None Include="Images\Close2_32x32.png" />
     <None Include="Images\绿色指示灯.png" />
     <EmbeddedResource Include="Form\FormEditColor.resx">
       <DependentUpon>FormEditColor.cs</DependentUpon>