#004 增加分发功能

Analysis/AboutSoftwareInfo.designer.cs

@@ -1,354 +0,0 @@
-namespace NSAnalysis
-{
-    partial class AboutSoftwareInfo
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutSoftwareInfo));
-            this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
-            this.label2 = new System.Windows.Forms.Label();
-            this.labTitle = new System.Windows.Forms.Label();
-            this.gpBoxLicenceInfo = new Telerik.WinControls.UI.RadGroupBox();
-            this.labLicenseInfo = new System.Windows.Forms.Label();
-            this.rbtnCreateRequest = new Telerik.WinControls.UI.RadButton();
-            this.labelExpiryDateValue = new System.Windows.Forms.Label();
-            this.labelExpiryDate = new System.Windows.Forms.Label();
-            this.gpBoxGeneralInfo = new Telerik.WinControls.UI.RadGroupBox();
-            this.label4 = new System.Windows.Forms.Label();
-            this.labCopyRight = new System.Windows.Forms.Label();
-            this.label5 = new System.Windows.Forms.Label();
-            this.labVersion = new System.Windows.Forms.Label();
-            this.pictureBox2 = new System.Windows.Forms.PictureBox();
-            this.label_Version = new System.Windows.Forms.Label();
-            this.label3 = new System.Windows.Forms.Label();
-            ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit();
-            this.radTitleBar1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gpBoxLicenceInfo)).BeginInit();
-            this.gpBoxLicenceInfo.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.rbtnCreateRequest)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).BeginInit();
-            this.gpBoxGeneralInfo.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // radTitleBar1
-            // 
-            this.radTitleBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.radTitleBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            this.radTitleBar1.Controls.Add(this.label2);
-            this.radTitleBar1.Controls.Add(this.labTitle);
-            this.radTitleBar1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.radTitleBar1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            this.radTitleBar1.Location = new System.Drawing.Point(1, 1);
-            this.radTitleBar1.Name = "radTitleBar1";
-            // 
-            // 
-            // 
-            this.radTitleBar1.RootElement.ApplyShapeToControl = true;
-            this.radTitleBar1.RootElement.BorderHighlightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            this.radTitleBar1.Size = new System.Drawing.Size(836, 40);
-            this.radTitleBar1.TabIndex = 0;
-            this.radTitleBar1.TabStop = false;
-            this.radTitleBar1.Text = "DEMO12";
-            ((Telerik.WinControls.UI.RadTitleBarElement)(this.radTitleBar1.GetChildAt(0))).Text = "DEMO12";
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None;
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).LeftColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).TopColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).RightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
-            // 
-            // label2
-            // 
-            this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.label2.AutoSize = true;
-            this.label2.Image = ((System.Drawing.Image)(resources.GetObject("label2.Image")));
-            this.label2.Location = new System.Drawing.Point(334, -5);
-            this.label2.Name = "label2";
-            this.label2.Padding = new System.Windows.Forms.Padding(20, 15, 20, 15);
-            this.label2.Size = new System.Drawing.Size(40, 52);
-            this.label2.TabIndex = 1;
-            // 
-            // labTitle
-            // 
-            this.labTitle.Anchor = System.Windows.Forms.AnchorStyles.Top;
-            this.labTitle.AutoSize = true;
-            this.labTitle.Font = new System.Drawing.Font("微软雅黑", 14F);
-            this.labTitle.ForeColor = System.Drawing.Color.White;
-            this.labTitle.Location = new System.Drawing.Point(370, 8);
-            this.labTitle.Name = "labTitle";
-            this.labTitle.Size = new System.Drawing.Size(88, 25);
-            this.labTitle.TabIndex = 0;
-            this.labTitle.Text = "关于软件";
-            // 
-            // gpBoxLicenceInfo
-            // 
-            this.gpBoxLicenceInfo.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
-            this.gpBoxLicenceInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gpBoxLicenceInfo.Controls.Add(this.labLicenseInfo);
-            this.gpBoxLicenceInfo.Controls.Add(this.rbtnCreateRequest);
-            this.gpBoxLicenceInfo.Controls.Add(this.labelExpiryDateValue);
-            this.gpBoxLicenceInfo.Controls.Add(this.labelExpiryDate);
-            this.gpBoxLicenceInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.gpBoxLicenceInfo.ForeColor = System.Drawing.Color.White;
-            this.gpBoxLicenceInfo.HeaderText = "授权信息";
-            this.gpBoxLicenceInfo.Location = new System.Drawing.Point(22, 264);
-            this.gpBoxLicenceInfo.Name = "gpBoxLicenceInfo";
-            this.gpBoxLicenceInfo.Size = new System.Drawing.Size(790, 234);
-            this.gpBoxLicenceInfo.TabIndex = 38;
-            this.gpBoxLicenceInfo.Text = "授权信息";
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).ForeColor = System.Drawing.Color.White;
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(81)))), ((int)(((byte)(95)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).ForeColor = System.Drawing.Color.White;
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None;
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Text = "授权信息";
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).LineLimit = false;
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).ForeColor = System.Drawing.Color.White;
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Font = new System.Drawing.Font("Segoe UI", 11F);
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxLicenceInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Alignment = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // labLicenseInfo
-            // 
-            this.labLicenseInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labLicenseInfo.Location = new System.Drawing.Point(26, 99);
-            this.labLicenseInfo.Name = "labLicenseInfo";
-            this.labLicenseInfo.Size = new System.Drawing.Size(503, 21);
-            this.labLicenseInfo.TabIndex = 9;
-            this.labLicenseInfo.Text = "请将请求授权文件发送给海克斯康制造智能技术（青岛）有限公司";
-            // 
-            // rbtnCreateRequest
-            // 
-            this.rbtnCreateRequest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            this.rbtnCreateRequest.Font = new System.Drawing.Font("Segoe UI", 12F);
-            this.rbtnCreateRequest.ForeColor = System.Drawing.Color.White;
-            this.rbtnCreateRequest.Location = new System.Drawing.Point(33, 151);
-            this.rbtnCreateRequest.Name = "rbtnCreateRequest";
-            this.rbtnCreateRequest.Size = new System.Drawing.Size(170, 55);
-            this.rbtnCreateRequest.TabIndex = 13;
-            this.rbtnCreateRequest.Text = "创建请求授权文件";
-            this.rbtnCreateRequest.Click += new System.EventHandler(this.rbtnCreateRequest_Click);
-            this.rbtnCreateRequest.MouseLeave += new System.EventHandler(this.btn_MouseLeave);
-            this.rbtnCreateRequest.MouseHover += new System.EventHandler(this.btn_MouseHover);
-            ((Telerik.WinControls.UI.RadButtonElement)(this.rbtnCreateRequest.GetChildAt(0))).Text = "创建请求授权文件";
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.rbtnCreateRequest.GetChildAt(0).GetChildAt(2))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.rbtnCreateRequest.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
-            // 
-            // labelExpiryDateValue
-            // 
-            this.labelExpiryDateValue.AutoSize = true;
-            this.labelExpiryDateValue.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelExpiryDateValue.Location = new System.Drawing.Point(112, 49);
-            this.labelExpiryDateValue.Name = "labelExpiryDateValue";
-            this.labelExpiryDateValue.Size = new System.Drawing.Size(88, 21);
-            this.labelExpiryDateValue.TabIndex = 0;
-            this.labelExpiryDateValue.Text = "2017.04.20";
-            // 
-            // labelExpiryDate
-            // 
-            this.labelExpiryDate.AutoSize = true;
-            this.labelExpiryDate.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.labelExpiryDate.Location = new System.Drawing.Point(26, 50);
-            this.labelExpiryDate.Name = "labelExpiryDate";
-            this.labelExpiryDate.Size = new System.Drawing.Size(95, 21);
-            this.labelExpiryDate.TabIndex = 0;
-            this.labelExpiryDate.Text = "到期时间：";
-            // 
-            // gpBoxGeneralInfo
-            // 
-            this.gpBoxGeneralInfo.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
-            this.gpBoxGeneralInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.gpBoxGeneralInfo.Controls.Add(this.label4);
-            this.gpBoxGeneralInfo.Controls.Add(this.labCopyRight);
-            this.gpBoxGeneralInfo.Controls.Add(this.label5);
-            this.gpBoxGeneralInfo.Controls.Add(this.labVersion);
-            this.gpBoxGeneralInfo.Controls.Add(this.pictureBox2);
-            this.gpBoxGeneralInfo.Controls.Add(this.label_Version);
-            this.gpBoxGeneralInfo.Controls.Add(this.label3);
-            this.gpBoxGeneralInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            this.gpBoxGeneralInfo.ForeColor = System.Drawing.Color.White;
-            this.gpBoxGeneralInfo.HeaderText = "基本信息";
-            this.gpBoxGeneralInfo.Location = new System.Drawing.Point(22, 54);
-            this.gpBoxGeneralInfo.Name = "gpBoxGeneralInfo";
-            this.gpBoxGeneralInfo.Size = new System.Drawing.Size(790, 202);
-            this.gpBoxGeneralInfo.TabIndex = 37;
-            this.gpBoxGeneralInfo.Text = "基本信息";
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).ForeColor = System.Drawing.Color.White;
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(81)))), ((int)(((byte)(95)))));
-            ((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).ForeColor = System.Drawing.Color.White;
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
-            ((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None;
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Text = "基本信息";
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).LineLimit = false;
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).ForeColor = System.Drawing.Color.White;
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Font = new System.Drawing.Font("Segoe UI", 11F);
-            ((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Alignment = System.Drawing.ContentAlignment.MiddleLeft;
-            // 
-            // label4
-            // 
-            this.label4.Font = new System.Drawing.Font("Segoe UI", 12F);
-            this.label4.Location = new System.Drawing.Point(112, 43);
-            this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(316, 21);
-            this.label4.TabIndex = 31;
-            this.label4.Text = "海克斯康间隙面差分析系统";
-            // 
-            // labCopyRight
-            // 
-            this.labCopyRight.Font = new System.Drawing.Font("Segoe UI", 12F);
-            this.labCopyRight.Location = new System.Drawing.Point(112, 150);
-            this.labCopyRight.Name = "labCopyRight";
-            this.labCopyRight.Size = new System.Drawing.Size(316, 21);
-            this.labCopyRight.TabIndex = 0;
-            this.labCopyRight.Text = "海克斯康制造智能技术（青岛）有限公司";
-            // 
-            // label5
-            // 
-            this.label5.AutoSize = true;
-            this.label5.Font = new System.Drawing.Font("Segoe UI", 12F);
-            this.label5.Location = new System.Drawing.Point(25, 43);
-            this.label5.Name = "label5";
-            this.label5.Size = new System.Drawing.Size(95, 21);
-            this.label5.TabIndex = 32;
-            this.label5.Text = "软件名称：";
-            // 
-            // labVersion
-            // 
-            this.labVersion.AutoSize = true;
-            this.labVersion.Font = new System.Drawing.Font("Segoe UI", 12F);
-            this.labVersion.Location = new System.Drawing.Point(112, 96);
-            this.labVersion.Name = "labVersion";
-            this.labVersion.Size = new System.Drawing.Size(65, 21);
-            this.labVersion.TabIndex = 30;
-            this.labVersion.Text = "V1.0.0.0";
-            // 
-            // pictureBox2
-            // 
-            this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.pictureBox2.Image = global::NSAnalysis.Properties.Resources.hexagonlogotransparent;
-            this.pictureBox2.Location = new System.Drawing.Point(464, 31);
-            this.pictureBox2.Name = "pictureBox2";
-            this.pictureBox2.Size = new System.Drawing.Size(304, 100);
-            this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
-            this.pictureBox2.TabIndex = 29;
-            this.pictureBox2.TabStop = false;
-            // 
-            // label_Version
-            // 
-            this.label_Version.AutoSize = true;
-            this.label_Version.Font = new System.Drawing.Font("Segoe UI", 12F);
-            this.label_Version.Location = new System.Drawing.Point(25, 95);
-            this.label_Version.Name = "label_Version";
-            this.label_Version.Size = new System.Drawing.Size(95, 21);
-            this.label_Version.TabIndex = 0;
-            this.label_Version.Text = "软件版本：";
-            // 
-            // label3
-            // 
-            this.label3.AutoSize = true;
-            this.label3.Font = new System.Drawing.Font("Segoe UI", 12F);
-            this.label3.Location = new System.Drawing.Point(25, 150);
-            this.label3.Name = "label3";
-            this.label3.Size = new System.Drawing.Size(95, 21);
-            this.label3.TabIndex = 0;
-            this.label3.Text = "版权所有：";
-            // 
-            // AboutSoftwareInfo
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            this.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
-            this.BorderWidth = 0;
-            this.ClientSize = new System.Drawing.Size(838, 517);
-            this.Controls.Add(this.gpBoxLicenceInfo);
-            this.Controls.Add(this.gpBoxGeneralInfo);
-            this.Controls.Add(this.radTitleBar1);
-            this.Font = new System.Drawing.Font("Segoe UI", 8.25F);
-            this.ForeColor = System.Drawing.Color.White;
-            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
-            this.MaximizeBox = false;
-            this.Name = "AboutSoftwareInfo";
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "DEMO12";
-            this.Load += new System.EventHandler(this.AboutSoftwareInfo_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit();
-            this.radTitleBar1.ResumeLayout(false);
-            this.radTitleBar1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gpBoxLicenceInfo)).EndInit();
-            this.gpBoxLicenceInfo.ResumeLayout(false);
-            this.gpBoxLicenceInfo.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.rbtnCreateRequest)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).EndInit();
-            this.gpBoxGeneralInfo.ResumeLayout(false);
-            this.gpBoxGeneralInfo.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private Telerik.WinControls.UI.RadTitleBar radTitleBar1;
-        private System.Windows.Forms.Label label2;
-        private System.Windows.Forms.Label labTitle;
-        private Telerik.WinControls.UI.RadGroupBox gpBoxLicenceInfo;
-        private System.Windows.Forms.Label labelExpiryDate;
-        private System.Windows.Forms.Label labLicenseInfo;
-        private System.Windows.Forms.Label labelExpiryDateValue;
-        private Telerik.WinControls.UI.RadGroupBox gpBoxGeneralInfo;
-        private System.Windows.Forms.PictureBox pictureBox2;
-        private System.Windows.Forms.Label label_Version;
-        private System.Windows.Forms.Label labCopyRight;
-        private System.Windows.Forms.Label label3;
-        private System.Windows.Forms.Label labVersion;
-        private Telerik.WinControls.UI.RadButton rbtnCreateRequest;
-        private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.Label label5;
-    }
-}

Analysis/BaseUnit/FileSorter.cs

@@ -1,18 +1,23 @@
-using System;
+using BaseFunction;
-
+using NSAnalysis.DAL;
+using System;
 using System.Data;
 using System.Data.SqlClient;
 using System.IO;
 
 namespace NSAnalysis.BaseUnit
 {
-	internal class FileSorter
+	public class FileSorter
 	{
-		private readonly string _connectionString;
+		public TMeasureMSSQLDAL tmdal = new TMeasureMSSQLDAL();
 
-		public FileSorter(string connectionString)
+		//定义读取的位置
+		public int readRowIndex = 2; // 默认读取第3行（从0开始计数）
+
+		public int readColIndex = 1; // 默认读取第2列（从0开始计数）
+
+		public FileSorter()
 		{
-			_connectionString = connectionString;
 		}
 
 		public void ProcessFiles()
@@ -23,64 +28,129 @@ namespace NSAnalysis.BaseUnit
 				string sourceDir = task["sourceFile"].ToString();
 				string targetDir = task["targetFile"].ToString();
 				string modelCode = task["modelsCode"].ToString();
+				string position = task["position"].ToString();
 
+				string matchStr = $"{modelCode}_{position}";
+				// 打印信息
+				MyBase.TraceWriteLine($"Processing Task - Source: {sourceDir}, Target: {targetDir}, ModelCode: {modelCode} Position: {position} matchStr: {matchStr} ");
 				if (Directory.Exists(sourceDir))
 				{
-					ProcessDirectory(sourceDir, targetDir, modelCode);
+					
+
+					ProcessDirectory(sourceDir, targetDir, matchStr);
 				}
+				else
+				{
+					MyBase.TraceWriteLine($"Source directory does not exist: {sourceDir}");
+				}
+
 			}
 		}
 
 		private DataTable GetTaskRecords()
 		{
-			using (var connection = new SqlConnection(_connectionString))
+			SQLHelper.connStr = DatabaseDfn.SqlConnectStr();
-			{
+			DataTable dt = tmdal.SelectTaskByCondition("", "", "start");
-				var command = new SqlCommand(
-					"SELECT modelsCode, sourceFile, targetFile FROM CJLR_TASK_RELEASE WHERE status = 'start'",
-					connection);
 
-				var adapter = new SqlDataAdapter(command);
+			//打印 dt
-				var dt = new DataTable();
+			PrintDataTable(dt);
-				adapter.Fill(dt);
+			if (dt == null || dt.Rows.Count == 0)
-				return dt;
+			{
+				MyBase.TraceWriteLine("No tasks found.");
+				return null;
 			}
+			return dt;
 		}
 
 		private void ProcessDirectory(string sourceDir, string targetDir, string modelCode)
 		{
+			// 确保目标目录存在
 			if (!Directory.Exists(targetDir))
 			{
 				Directory.CreateDirectory(targetDir);
+				MyBase.TraceWriteLine($"Created target directory: {targetDir}");
 			}
 
 			foreach (string file in Directory.GetFiles(sourceDir, "*.csv"))
 			{
-				if (FileContainsModelCode(file, modelCode))
+				// 打印正在处理的文件
+				MyBase.TraceWriteLine($"Processing file: {file}");
+				if (MatchCsvValue(file, modelCode, readRowIndex, readColIndex))
 				{
 					string destFile = Path.Combine(targetDir, Path.GetFileName(file));
 					File.Move(file, destFile);
-					Console.WriteLine($"Moved: {file} -> {destFile}");
+					MyBase.TraceWriteLine($"Moved: {file} -> {destFile}");
+				}
+
+				else
+				{
+					MyBase.TraceWriteLine($"No match for file: {file}");
 				}
 			}
 		}
 
-		private bool FileContainsModelCode(string filePath, string modelCode)
+		/// <summary>
+		/// 检查CSV文件中指定行列的字符串是否匹配目标值
+		/// </summary>
+		/// <param name="filePath">CSV文件路径</param>
+		/// <param name="targetValue">要匹配的目标字符串</param>
+		/// <param name="rowIndex">行索引(从0开始)</param>
+		/// <param name="colIndex">列索引(从0开始)</param>
+		/// <returns>匹配成功返回true，否则false</returns>
+		public static bool MatchCsvValue(string filePath, string targetValue, int rowIndex, int colIndex)
 		{
 			try
 			{
-				string content = File.ReadAllText(filePath);
+				string[] lines = File.ReadAllLines(filePath);
-				return content.Contains(modelCode);
+
+				// 检查行索引是否有效
+				if (rowIndex < 0 || rowIndex >= lines.Length)
+					return false;
+
+				string[] columns = lines[rowIndex].Split(',');
+
+				// 检查列索引是否有效
+				if (colIndex < 0 || colIndex >= columns.Length)
+					return false;
+
+				return columns[colIndex].Trim().Equals(targetValue);
 			}
-			catch
+			catch (Exception ex)
 			{
+				MyBase.TraceWriteLine($"处理CSV文件时出错: {ex.Message}");
 				return false;
 			}
 		}
 
-		//private static void Main(string[] args)
+		public void test()
-		//{
+		{
-		//	var sorter = new FileSorter("Your_Connection_String");
+			//SQLHelper.connStr = DatabaseDfn.SqlConnectStr();
-		//	sorter.ProcessFiles();
+			//string testPath = @"D:\CJLR\DATA\Input\LLL\K0902906.csv";
-		//}
+			//bool result = MatchCsvValue(testPath, "X540_L", 3, 1);
+			//MyBase.TraceWriteLine($"匹配结果: {result}");
+		}
+
+		// 编写一个打印 DataTable 对象的方法，输入是对象
+		public static void PrintDataTable(DataTable dt)
+		{
+			if (dt == null || dt.Rows.Count == 0)
+			{
+				MyBase.TraceWriteLine("DataTable is empty or null.");
+				return;
+			}
+			foreach (DataColumn column in dt.Columns)
+			{
+				Console.Write($"{column.ColumnName}\t");
+			}
+			MyBase.TraceWriteLine("");
+			foreach (DataRow row in dt.Rows)
+			{
+				foreach (var item in row.ItemArray)
+				{
+					Console.Write($"{item}\t");
+				}
+				MyBase.TraceWriteLine("");
+			}
+		}
 	}
 }

Analysis/CjlrForm/AboutSoftwareInfo.designer.cs

@@ -0,0 +1,285 @@
+namespace NSAnalysis
+{
+    partial class AboutSoftwareInfo
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AboutSoftwareInfo));
+			this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
+			this.labTitle = new System.Windows.Forms.Label();
+			this.labelExpiryDateValue = new System.Windows.Forms.Label();
+			this.labelExpiryDate = new System.Windows.Forms.Label();
+			this.gpBoxGeneralInfo = new Telerik.WinControls.UI.RadGroupBox();
+			this.label4 = new System.Windows.Forms.Label();
+			this.labCopyRight = new System.Windows.Forms.Label();
+			this.label5 = new System.Windows.Forms.Label();
+			this.labVersion = new System.Windows.Forms.Label();
+			this.label_Version = new System.Windows.Forms.Label();
+			this.label3 = new System.Windows.Forms.Label();
+			this.pictureBox2 = new System.Windows.Forms.PictureBox();
+			this.label2 = new System.Windows.Forms.Label();
+			((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).BeginInit();
+			this.radTitleBar1.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).BeginInit();
+			this.gpBoxGeneralInfo.SuspendLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).BeginInit();
+			this.SuspendLayout();
+			// 
+			// radTitleBar1
+			// 
+			this.radTitleBar1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.radTitleBar1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			this.radTitleBar1.Controls.Add(this.label2);
+			this.radTitleBar1.Controls.Add(this.labTitle);
+			this.radTitleBar1.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+			this.radTitleBar1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			this.radTitleBar1.Location = new System.Drawing.Point(1, 1);
+			this.radTitleBar1.Name = "radTitleBar1";
+			// 
+			// 
+			// 
+			this.radTitleBar1.RootElement.ApplyShapeToControl = true;
+			this.radTitleBar1.RootElement.BorderHighlightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			this.radTitleBar1.Size = new System.Drawing.Size(779, 40);
+			this.radTitleBar1.TabIndex = 0;
+			this.radTitleBar1.TabStop = false;
+			this.radTitleBar1.Text = "DEMO12";
+			((Telerik.WinControls.UI.RadTitleBarElement)(this.radTitleBar1.GetChildAt(0))).Text = "DEMO12";
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).BackColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None;
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).LeftColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).TopColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).RightColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).BottomShadowColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor3 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).InnerColor4 = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.radTitleBar1.GetChildAt(0).GetChildAt(1))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.Default;
+			// 
+			// labTitle
+			// 
+			this.labTitle.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.labTitle.AutoSize = true;
+			this.labTitle.Font = new System.Drawing.Font("微软雅黑", 14F);
+			this.labTitle.ForeColor = System.Drawing.Color.White;
+			this.labTitle.Location = new System.Drawing.Point(341, 8);
+			this.labTitle.Name = "labTitle";
+			this.labTitle.Size = new System.Drawing.Size(88, 25);
+			this.labTitle.TabIndex = 0;
+			this.labTitle.Text = "关于软件";
+			// 
+			// labelExpiryDateValue
+			// 
+			this.labelExpiryDateValue.AutoSize = true;
+			this.labelExpiryDateValue.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelExpiryDateValue.Location = new System.Drawing.Point(112, 152);
+			this.labelExpiryDateValue.Name = "labelExpiryDateValue";
+			this.labelExpiryDateValue.Size = new System.Drawing.Size(88, 21);
+			this.labelExpiryDateValue.TabIndex = 0;
+			this.labelExpiryDateValue.Text = "2017.04.20";
+			// 
+			// labelExpiryDate
+			// 
+			this.labelExpiryDate.AutoSize = true;
+			this.labelExpiryDate.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.labelExpiryDate.Location = new System.Drawing.Point(26, 153);
+			this.labelExpiryDate.Name = "labelExpiryDate";
+			this.labelExpiryDate.Size = new System.Drawing.Size(95, 21);
+			this.labelExpiryDate.TabIndex = 0;
+			this.labelExpiryDate.Text = "到期时间：";
+			// 
+			// gpBoxGeneralInfo
+			// 
+			this.gpBoxGeneralInfo.AccessibleRole = System.Windows.Forms.AccessibleRole.Grouping;
+			this.gpBoxGeneralInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+			this.gpBoxGeneralInfo.Controls.Add(this.labelExpiryDateValue);
+			this.gpBoxGeneralInfo.Controls.Add(this.labelExpiryDate);
+			this.gpBoxGeneralInfo.Controls.Add(this.label4);
+			this.gpBoxGeneralInfo.Controls.Add(this.labCopyRight);
+			this.gpBoxGeneralInfo.Controls.Add(this.label5);
+			this.gpBoxGeneralInfo.Controls.Add(this.labVersion);
+			this.gpBoxGeneralInfo.Controls.Add(this.pictureBox2);
+			this.gpBoxGeneralInfo.Controls.Add(this.label_Version);
+			this.gpBoxGeneralInfo.Controls.Add(this.label3);
+			this.gpBoxGeneralInfo.Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			this.gpBoxGeneralInfo.ForeColor = System.Drawing.Color.White;
+			this.gpBoxGeneralInfo.HeaderText = "基本信息";
+			this.gpBoxGeneralInfo.Location = new System.Drawing.Point(22, 54);
+			this.gpBoxGeneralInfo.Name = "gpBoxGeneralInfo";
+			this.gpBoxGeneralInfo.Size = new System.Drawing.Size(738, 321);
+			this.gpBoxGeneralInfo.TabIndex = 37;
+			this.gpBoxGeneralInfo.Text = "基本信息";
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).BackColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).ForeColor = System.Drawing.Color.White;
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor2 = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(32)))), ((int)(((byte)(81)))), ((int)(((byte)(95)))));
+			((Telerik.WinControls.Primitives.BorderPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(0).GetChildAt(1))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).ForeColor = System.Drawing.Color.White;
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).Font = new System.Drawing.Font("Segoe UI", 11F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+			((Telerik.WinControls.Primitives.FillPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(0))).SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.None;
+			((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Text = "基本信息";
+			((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).LineLimit = false;
+			((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).ForeColor = System.Drawing.Color.White;
+			((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Font = new System.Drawing.Font("Segoe UI", 11F);
+			((Telerik.WinControls.Primitives.TextPrimitive)(this.gpBoxGeneralInfo.GetChildAt(0).GetChildAt(1).GetChildAt(2).GetChildAt(1))).Alignment = System.Drawing.ContentAlignment.MiddleLeft;
+			// 
+			// label4
+			// 
+			this.label4.AutoSize = true;
+			this.label4.Font = new System.Drawing.Font("Segoe UI", 12F);
+			this.label4.Location = new System.Drawing.Point(112, 43);
+			this.label4.Name = "label4";
+			this.label4.Size = new System.Drawing.Size(214, 21);
+			this.label4.TabIndex = 31;
+			this.label4.Text = "海克斯康间隙面差分析系统";
+			// 
+			// labCopyRight
+			// 
+			this.labCopyRight.Font = new System.Drawing.Font("Segoe UI", 12F);
+			this.labCopyRight.Location = new System.Drawing.Point(112, 210);
+			this.labCopyRight.Name = "labCopyRight";
+			this.labCopyRight.Size = new System.Drawing.Size(316, 21);
+			this.labCopyRight.TabIndex = 0;
+			this.labCopyRight.Text = "海克斯康制造智能技术（青岛）有限公司";
+			// 
+			// label5
+			// 
+			this.label5.AutoSize = true;
+			this.label5.Font = new System.Drawing.Font("Segoe UI", 12F);
+			this.label5.Location = new System.Drawing.Point(26, 43);
+			this.label5.Name = "label5";
+			this.label5.Size = new System.Drawing.Size(95, 21);
+			this.label5.TabIndex = 32;
+			this.label5.Text = "软件名称：";
+			// 
+			// labVersion
+			// 
+			this.labVersion.AutoSize = true;
+			this.labVersion.Font = new System.Drawing.Font("Segoe UI", 12F);
+			this.labVersion.Location = new System.Drawing.Point(112, 96);
+			this.labVersion.Name = "labVersion";
+			this.labVersion.Size = new System.Drawing.Size(65, 21);
+			this.labVersion.TabIndex = 30;
+			this.labVersion.Text = "V1.0.0.0";
+			// 
+			// label_Version
+			// 
+			this.label_Version.AutoSize = true;
+			this.label_Version.Font = new System.Drawing.Font("Segoe UI", 12F);
+			this.label_Version.Location = new System.Drawing.Point(26, 95);
+			this.label_Version.Name = "label_Version";
+			this.label_Version.Size = new System.Drawing.Size(95, 21);
+			this.label_Version.TabIndex = 0;
+			this.label_Version.Text = "软件版本：";
+			// 
+			// label3
+			// 
+			this.label3.AutoSize = true;
+			this.label3.Font = new System.Drawing.Font("Segoe UI", 12F);
+			this.label3.Location = new System.Drawing.Point(26, 210);
+			this.label3.Name = "label3";
+			this.label3.Size = new System.Drawing.Size(95, 21);
+			this.label3.TabIndex = 0;
+			this.label3.Text = "版权所有：";
+			// 
+			// pictureBox2
+			// 
+			this.pictureBox2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+			this.pictureBox2.BackColor = System.Drawing.Color.White;
+			this.pictureBox2.Image = global::NSAnalysis.Properties.Resources.Hexagon_logo_horz_Chinese_black;
+			this.pictureBox2.Location = new System.Drawing.Point(365, 31);
+			this.pictureBox2.Name = "pictureBox2";
+			this.pictureBox2.Size = new System.Drawing.Size(304, 100);
+			this.pictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
+			this.pictureBox2.TabIndex = 29;
+			this.pictureBox2.TabStop = false;
+			// 
+			// label2
+			// 
+			this.label2.Anchor = System.Windows.Forms.AnchorStyles.Top;
+			this.label2.AutoSize = true;
+			this.label2.Image = ((System.Drawing.Image)(resources.GetObject("label2.Image")));
+			this.label2.Location = new System.Drawing.Point(305, -5);
+			this.label2.Name = "label2";
+			this.label2.Padding = new System.Windows.Forms.Padding(20, 15, 20, 15);
+			this.label2.Size = new System.Drawing.Size(40, 52);
+			this.label2.TabIndex = 1;
+			// 
+			// AboutSoftwareInfo
+			// 
+			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+			this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
+			this.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
+			this.BorderWidth = 0;
+			this.ClientSize = new System.Drawing.Size(781, 400);
+			this.Controls.Add(this.gpBoxGeneralInfo);
+			this.Controls.Add(this.radTitleBar1);
+			this.Font = new System.Drawing.Font("Segoe UI", 8.25F);
+			this.ForeColor = System.Drawing.Color.White;
+			this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
+			this.MaximizeBox = false;
+			this.Name = "AboutSoftwareInfo";
+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+			this.Text = "DEMO12";
+			this.Load += new System.EventHandler(this.AboutSoftwareInfo_Load);
+			((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit();
+			this.radTitleBar1.ResumeLayout(false);
+			this.radTitleBar1.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.gpBoxGeneralInfo)).EndInit();
+			this.gpBoxGeneralInfo.ResumeLayout(false);
+			this.gpBoxGeneralInfo.PerformLayout();
+			((System.ComponentModel.ISupportInitialize)(this.pictureBox2)).EndInit();
+			this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private Telerik.WinControls.UI.RadTitleBar radTitleBar1;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.Label labTitle;
+        private System.Windows.Forms.Label labelExpiryDate;
+        private System.Windows.Forms.Label labelExpiryDateValue;
+        private Telerik.WinControls.UI.RadGroupBox gpBoxGeneralInfo;
+        private System.Windows.Forms.PictureBox pictureBox2;
+        private System.Windows.Forms.Label label_Version;
+        private System.Windows.Forms.Label labCopyRight;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.Label labVersion;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Label label5;
+    }
+}

Analysis/CjlrForm/FAddTolerance.cs

@@ -1,5 +1,5 @@
 using BaseFunction;
-using DAL;
+using NSAnalysis.DAL;
 using NSAnalysis.Model;
 using System;
 using System.Drawing;
@@ -40,7 +40,7 @@ namespace NSAnalysis
 			gFTS = fts;
 		}
 
-		private void SFAddCNC_Load(object sender, EventArgs e)
+		private void FAddTolerance_Load(object sender, EventArgs e)
 		{
 			rddl_ReadType.SelectedIndex = 0;
 			rddl_Position.SelectedIndex = 0;

Analysis/CjlrForm/FAddTolerance.designer.cs

@@ -499,7 +499,7 @@
 			this.Name = "FAddTolerance";
 			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
 			this.Text = "添加公差带";
-			this.Load += new System.EventHandler(this.SFAddCNC_Load);
+			this.Load += new System.EventHandler(this.FAddTolerance_Load);
 			((System.ComponentModel.ISupportInitialize)(this.radTitleBar1)).EndInit();
 			this.radTitleBar1.ResumeLayout(false);
 			this.radTitleBar1.PerformLayout();

Analysis/CjlrForm/FEditTolerance.cs

@@ -1,4 +1,4 @@
-using DAL;
+using NSAnalysis.DAL;
 using NSAnalysis.Model;
 using System;
 using System.Drawing;
@@ -174,5 +174,44 @@ namespace NSAnalysis
 		{
 			this.Close();
 		}
+
+		private void btn_sourceFile_Click(object sender, EventArgs e)
+		{
+			// 文件路径对话框
+			FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog
+			{
+				Description = "请选择源文件所在的文件夹",
+				ShowNewFolderButton = true
+			};
+			if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
+			{
+				rtb_sourceFilePath.Text = folderBrowserDialog.SelectedPath; // 设置源文件路径
+			}
+
+			else
+			{
+				// 显示未选择文件夹的提示信息
+				MessageBox.Show("未选择源文件夹", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			}
+
+		}
+
+		private void btn_targetFile_Click(object sender, EventArgs e)
+		{
+			FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog
+			{
+				Description = "请选择目标文件所在的文件夹",
+				ShowNewFolderButton = true
+			};
+			if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
+			{
+				rtb_targetFilePath.Text = folderBrowserDialog.SelectedPath; // 设置目标文件路径
+			}
+			else
+			{
+				// 显示未选择文件夹的提示信息
+				MessageBox.Show("未选择目标文件夹", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+			}
+		}
 	}
 }

Analysis/CjlrForm/FEditTolerance.designer.cs

@@ -29,11 +29,11 @@
         private void InitializeComponent()
         {
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FEditTolerance));
+			Telerik.WinControls.UI.RadListDataItem radListDataItem6 = new Telerik.WinControls.UI.RadListDataItem();
+			Telerik.WinControls.UI.RadListDataItem radListDataItem7 = new Telerik.WinControls.UI.RadListDataItem();
 			Telerik.WinControls.UI.RadListDataItem radListDataItem1 = new Telerik.WinControls.UI.RadListDataItem();
 			Telerik.WinControls.UI.RadListDataItem radListDataItem2 = new Telerik.WinControls.UI.RadListDataItem();
 			Telerik.WinControls.UI.RadListDataItem radListDataItem3 = new Telerik.WinControls.UI.RadListDataItem();
-			Telerik.WinControls.UI.RadListDataItem radListDataItem4 = new Telerik.WinControls.UI.RadListDataItem();
-			Telerik.WinControls.UI.RadListDataItem radListDataItem5 = new Telerik.WinControls.UI.RadListDataItem();
 			this.radTitleBar1 = new Telerik.WinControls.UI.RadTitleBar();
 			this.label2 = new System.Windows.Forms.Label();
 			this.labTitle = new System.Windows.Forms.Label();
@@ -190,6 +190,7 @@
 			this.btn_targetFile.Size = new System.Drawing.Size(50, 30);
 			this.btn_targetFile.TabIndex = 92;
 			this.btn_targetFile.Text = "浏览";
+			this.btn_targetFile.Click += new System.EventHandler(this.btn_targetFile_Click);
 			((Telerik.WinControls.UI.RadButtonElement)(this.btn_targetFile.GetChildAt(0))).Text = "浏览";
 			((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_targetFile.GetChildAt(0).GetChildAt(2))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
 			((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_targetFile.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
@@ -205,6 +206,7 @@
 			this.btn_sourceFile.Size = new System.Drawing.Size(50, 30);
 			this.btn_sourceFile.TabIndex = 91;
 			this.btn_sourceFile.Text = "浏览";
+			this.btn_sourceFile.Click += new System.EventHandler(this.btn_sourceFile_Click);
 			((Telerik.WinControls.UI.RadButtonElement)(this.btn_sourceFile.GetChildAt(0))).Text = "浏览";
 			((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_sourceFile.GetChildAt(0).GetChildAt(2))).InnerColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
 			((Telerik.WinControls.Primitives.BorderPrimitive)(this.btn_sourceFile.GetChildAt(0).GetChildAt(2))).ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(151)))), ((int)(((byte)(186)))));
@@ -257,12 +259,12 @@
 			this.rddl_Status.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
 			this.rddl_Status.Font = new System.Drawing.Font("微软雅黑", 11F);
 			this.rddl_Status.ForeColor = System.Drawing.Color.White;
-			radListDataItem1.Tag = "start";
+			radListDataItem6.Tag = "start";
-			radListDataItem1.Text = "启动";
+			radListDataItem6.Text = "启动";
-			radListDataItem2.Tag = "stop";
+			radListDataItem7.Tag = "stop";
-			radListDataItem2.Text = "暂停";
+			radListDataItem7.Text = "暂停";
-			this.rddl_Status.Items.Add(radListDataItem1);
+			this.rddl_Status.Items.Add(radListDataItem6);
-			this.rddl_Status.Items.Add(radListDataItem2);
+			this.rddl_Status.Items.Add(radListDataItem7);
 			this.rddl_Status.Location = new System.Drawing.Point(185, 366);
 			this.rddl_Status.Name = "rddl_Status";
 			this.rddl_Status.Size = new System.Drawing.Size(384, 25);
@@ -293,12 +295,12 @@
 			this.rddl_Position.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
 			this.rddl_Position.Font = new System.Drawing.Font("微软雅黑", 11F);
 			this.rddl_Position.ForeColor = System.Drawing.Color.White;
-			radListDataItem3.Tag = "L";
+			radListDataItem1.Tag = "L";
-			radListDataItem3.Text = "左侧";
+			radListDataItem1.Text = "左侧";
-			radListDataItem4.Tag = "R";
+			radListDataItem2.Tag = "R";
-			radListDataItem4.Text = "右侧";
+			radListDataItem2.Text = "右侧";
-			this.rddl_Position.Items.Add(radListDataItem3);
+			this.rddl_Position.Items.Add(radListDataItem1);
-			this.rddl_Position.Items.Add(radListDataItem4);
+			this.rddl_Position.Items.Add(radListDataItem2);
 			this.rddl_Position.Location = new System.Drawing.Point(185, 319);
 			this.rddl_Position.Name = "rddl_Position";
 			this.rddl_Position.Size = new System.Drawing.Size(384, 25);
@@ -329,9 +331,9 @@
 			this.rddl_ReadType.DropDownStyle = Telerik.WinControls.RadDropDownStyle.DropDownList;
 			this.rddl_ReadType.Font = new System.Drawing.Font("微软雅黑", 11F);
 			this.rddl_ReadType.ForeColor = System.Drawing.Color.White;
-			radListDataItem5.Tag = "2";
+			radListDataItem3.Tag = "2";
-			radListDataItem5.Text = "文件内容";
+			radListDataItem3.Text = "文件内容";
-			this.rddl_ReadType.Items.Add(radListDataItem5);
+			this.rddl_ReadType.Items.Add(radListDataItem3);
 			this.rddl_ReadType.Location = new System.Drawing.Point(185, 272);
 			this.rddl_ReadType.Name = "rddl_ReadType";
 			this.rddl_ReadType.Size = new System.Drawing.Size(384, 25);

Analysis/CjlrForm/FSoftwareSetup.designer.cs

@@ -119,7 +119,7 @@
 			this.cbStartIOT.AutoSize = true;
 			this.cbStartIOT.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.cbStartIOT.ForeColor = System.Drawing.Color.White;
-			this.cbStartIOT.Location = new System.Drawing.Point(274, 75);
+			this.cbStartIOT.Location = new System.Drawing.Point(268, 75);
 			this.cbStartIOT.Name = "cbStartIOT";
 			this.cbStartIOT.Size = new System.Drawing.Size(63, 25);
 			this.cbStartIOT.TabIndex = 489;
@@ -131,7 +131,7 @@
 			// 
 			this.label20.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.label20.ForeColor = System.Drawing.Color.White;
-			this.label20.Location = new System.Drawing.Point(29, 76);
+			this.label20.Location = new System.Drawing.Point(28, 76);
 			this.label20.Name = "label20";
 			this.label20.Size = new System.Drawing.Size(234, 21);
 			this.label20.TabIndex = 488;
@@ -143,7 +143,7 @@
 			this.rtbIOTAddress.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
 			this.rtbIOTAddress.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.rtbIOTAddress.ForeColor = System.Drawing.Color.White;
-			this.rtbIOTAddress.Location = new System.Drawing.Point(270, 109);
+			this.rtbIOTAddress.Location = new System.Drawing.Point(268, 116);
 			this.rtbIOTAddress.Name = "rtbIOTAddress";
 			this.rtbIOTAddress.Size = new System.Drawing.Size(565, 27);
 			this.rtbIOTAddress.TabIndex = 487;
@@ -154,7 +154,7 @@
 			// 
 			this.label19.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.label19.ForeColor = System.Drawing.Color.White;
-			this.label19.Location = new System.Drawing.Point(65, 113);
+			this.label19.Location = new System.Drawing.Point(62, 119);
 			this.label19.Name = "label19";
 			this.label19.Size = new System.Drawing.Size(200, 21);
 			this.label19.TabIndex = 486;
@@ -167,7 +167,7 @@
 			this.rtbnSaveSetup.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
 			this.rtbnSaveSetup.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.rtbnSaveSetup.ForeColor = System.Drawing.Color.White;
-			this.rtbnSaveSetup.Location = new System.Drawing.Point(592, 442);
+			this.rtbnSaveSetup.Location = new System.Drawing.Point(592, 598);
 			this.rtbnSaveSetup.Name = "rtbnSaveSetup";
 			this.rtbnSaveSetup.Size = new System.Drawing.Size(138, 47);
 			this.rtbnSaveSetup.TabIndex = 476;
@@ -200,7 +200,7 @@
 			this.rbtnCancel.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
 			this.rbtnCancel.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.rbtnCancel.ForeColor = System.Drawing.Color.White;
-			this.rbtnCancel.Location = new System.Drawing.Point(770, 443);
+			this.rbtnCancel.Location = new System.Drawing.Point(770, 599);
 			this.rbtnCancel.Name = "rbtnCancel";
 			this.rbtnCancel.Size = new System.Drawing.Size(138, 47);
 			this.rbtnCancel.TabIndex = 477;
@@ -232,7 +232,7 @@
 			this.cbAnalysisCSV.AutoSize = true;
 			this.cbAnalysisCSV.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.cbAnalysisCSV.ForeColor = System.Drawing.Color.White;
-			this.cbAnalysisCSV.Location = new System.Drawing.Point(268, 193);
+			this.cbAnalysisCSV.Location = new System.Drawing.Point(268, 202);
 			this.cbAnalysisCSV.Name = "cbAnalysisCSV";
 			this.cbAnalysisCSV.Size = new System.Drawing.Size(63, 25);
 			this.cbAnalysisCSV.TabIndex = 513;
@@ -243,7 +243,7 @@
 			// 
 			this.label14.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.label14.ForeColor = System.Drawing.Color.White;
-			this.label14.Location = new System.Drawing.Point(25, 193);
+			this.label14.Location = new System.Drawing.Point(25, 205);
 			this.label14.Name = "label14";
 			this.label14.Size = new System.Drawing.Size(237, 21);
 			this.label14.TabIndex = 512;
@@ -255,7 +255,7 @@
 			this.rtbCarTypebyVIN.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
 			this.rtbCarTypebyVIN.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.rtbCarTypebyVIN.ForeColor = System.Drawing.Color.White;
-			this.rtbCarTypebyVIN.Location = new System.Drawing.Point(268, 147);
+			this.rtbCarTypebyVIN.Location = new System.Drawing.Point(268, 159);
 			this.rtbCarTypebyVIN.Name = "rtbCarTypebyVIN";
 			this.rtbCarTypebyVIN.Size = new System.Drawing.Size(567, 27);
 			this.rtbCarTypebyVIN.TabIndex = 515;
@@ -266,7 +266,7 @@
 			// 
 			this.label10.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.label10.ForeColor = System.Drawing.Color.White;
-			this.label10.Location = new System.Drawing.Point(63, 151);
+			this.label10.Location = new System.Drawing.Point(62, 162);
 			this.label10.Name = "label10";
 			this.label10.Size = new System.Drawing.Size(200, 21);
 			this.label10.TabIndex = 514;
@@ -278,7 +278,7 @@
 			this.rtbReportPath.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(27)))), ((int)(((byte)(60)))), ((int)(((byte)(68)))));
 			this.rtbReportPath.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.rtbReportPath.ForeColor = System.Drawing.Color.White;
-			this.rtbReportPath.Location = new System.Drawing.Point(268, 224);
+			this.rtbReportPath.Location = new System.Drawing.Point(268, 243);
 			this.rtbReportPath.Name = "rtbReportPath";
 			this.rtbReportPath.Size = new System.Drawing.Size(567, 27);
 			this.rtbReportPath.TabIndex = 516;
@@ -289,7 +289,7 @@
 			// 
 			this.label1.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.label1.ForeColor = System.Drawing.Color.White;
-			this.label1.Location = new System.Drawing.Point(26, 224);
+			this.label1.Location = new System.Drawing.Point(25, 248);
 			this.label1.Name = "label1";
 			this.label1.Size = new System.Drawing.Size(237, 21);
 			this.label1.TabIndex = 517;
@@ -302,7 +302,7 @@
 			this.radButton1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
 			this.radButton1.Font = new System.Drawing.Font("Segoe UI", 12F);
 			this.radButton1.ForeColor = System.Drawing.Color.White;
-			this.radButton1.Location = new System.Drawing.Point(853, 222);
+			this.radButton1.Location = new System.Drawing.Point(853, 244);
 			this.radButton1.Name = "radButton1";
 			this.radButton1.Size = new System.Drawing.Size(55, 31);
 			this.radButton1.TabIndex = 518;
@@ -333,7 +333,7 @@
 			this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
 			this.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(44)))), ((int)(((byte)(109)))), ((int)(((byte)(124)))));
 			this.BorderWidth = 0;
-			this.ClientSize = new System.Drawing.Size(935, 516);
+			this.ClientSize = new System.Drawing.Size(935, 672);
 			this.Controls.Add(this.radButton1);
 			this.Controls.Add(this.label1);
 			this.Controls.Add(this.rtbReportPath);

Analysis/CjlrForm/FToleranceSetup.cs

@@ -1,4 +1,4 @@
-using DAL;
+using NSAnalysis.DAL;
 using System;
 using System.Collections.Generic;
 using System.Data;

Analysis/DAL/SQLHelper.cs

@@ -3,7 +3,7 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Windows.Forms;
 
-namespace DAL
+namespace NSAnalysis.DAL
 {
 	public class SQLHelper
 	{

Analysis/DAL/TMeasureMSSQLDAL.cs

@@ -5,7 +5,7 @@ using System.Data;
 using System.Data.SqlClient;
 using System.Text;
 
-namespace DAL
+namespace NSAnalysis.DAL
 {
 	public class TMeasureMSSQLDAL
 	{
@@ -18,12 +18,7 @@ namespace DAL
 			return int.Parse(dt.Rows[0][0].ToString());
 		}
 
-		public string SelectNo6MeasureResult()
+
-		{
-			string strSql = "select top 6 CarID from TMeasureResult order by MeasureDate desc";
-			DataTable dt = SQLHelper.ExecuteQuery(strSql, CommandType.Text);
-			return dt.Rows[5][0].ToString();
-		}
 
 		public DataTable SelectNewestTMeasureResult()
 		{
@@ -194,6 +189,11 @@ namespace DAL
 			return dt.Rows.Count > 0; // 任务存在返回 true，否则返回 false
 		}
 
+
+
+
+
+
 		#endregion
 
 		#region	Insert Function
@@ -337,6 +337,7 @@ namespace DAL
 
 		#region	Delete Function
 
+		// 删除指定车型的分发配置
 		public int DeleteOneTolerance(string modelsCode)
 		{
 			// 使用参数化查询以防止 SQL 注入
@@ -344,9 +345,9 @@ namespace DAL
 
 			// 创建一个 SqlParameter 来替代直接拼接字符串
 			SqlParameter[] parameters = new SqlParameter[]
-		{
+				{
-		 new SqlParameter("@modelsCode", modelsCode),
+				 new SqlParameter("@modelsCode", modelsCode),
-		};
+				};
 
 			// 执行非查询操作
 			return SQLHelper.ExecuteNonQuery(strOle, parameters, CommandType.Text);

Analysis/Define/Define.cs

@@ -135,23 +135,8 @@ namespace NSAnalysis
 			strNextSenseCSVEH3Path = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "NextsenseCSVEH3Path");
 			strNextSenseCSVEHYPath = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "NextsenseCSVEHYPath");
 			strNextSenseSelfMeasurePath = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "NextseneSelfMeasurePath");
-			dFPY = double.Parse(FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "FPY"));
-			dFPY2 = double.Parse(FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "FPY2"));
-			strCarModel = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "CarModel");
-			strEquipNo = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "EquipmentNo");
-			strEquipName = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "EquipmentName");
-			iStartIOTFlag = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "StartIOTFlag");
-			strIOTAddress = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "IOTAddress");
-			strIOTCarTypeAddress = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "IOTCarTypeAddr");
-			iShowCarDataFlag = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "ShowDataFlag");
-			strShowCarLR = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "ShowData");
-			dTolerancePer = FileIni.ReadDouble(ConfigDfn.strConfigFile, strSection, "TolerancePercentage");
-			dExceptionTolerancePer = FileIni.ReadDouble(strConfigFile, strSection, "ExceptionPercentage");
 			strPwd = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "Password");
-			strCOMPort = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "COMPort");
-
 			iCreateReportFlag = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "CreateReportFlag");
-			strStationName = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "StationName");
 			strUploadPath = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "tavascanUploadPath");
 			strUploadPath2 = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "blacklabelUploadPath");
 			dLevel2 = double.Parse(FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "Level2Times"));
@@ -162,25 +147,8 @@ namespace NSAnalysis
 			iRecordEncoderFlag = FileIni.ReadInt(strConfigFile, strSection, "RecordEncoderFlag");
 			iIncludeRangeFlag = FileIni.ReadInt(strConfigFile, strSection, "IncludeRangeFlag");
 			iMeasureItemsCount = FileIni.ReadInt(strConfigFile, strSection, "MeasureCarItemsCount");
-			iFailedCarCount = FileIni.ReadInt(strConfigFile, strSection, "ContinuousCarCount");
 
 			#endregion 读取系统配置参数
-
-			#region 读[PLC] 参数
-
-			strSection = "PLC";
-			strPLCIP = FileIni.ReadString(ConfigDfn.strConfigFile, strSection, "ModbusTcp_IP");
-
-			#endregion 读[PLC] 参数
-
-			#region 读[Timer] 参数
-
-			strSection = "Timer";
-			gtm1_60 = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "TimerFixedStorage") * 1000;
-			gtmRMIDMode = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "TimerRefreshMIDMode") * 1000;
-			gtmRCMMStatus = FileIni.ReadInt(ConfigDfn.strConfigFile, strSection, "TimerRefreshCMMStatus") * 1000;
-
-			#endregion 读[Timer] 参数
 		}
 
 		public static void LoadConfigFile()
@@ -189,10 +157,7 @@ namespace NSAnalysis
 			{
 				#region 检查DLL是否存在
 
-				//if (!File.Exists(Application.StartupPath + "\\Fwlib32.dll"))
+
-				//    MyBase.TraceWriteLine("错误：Fwlib32.dll 文件丢失，程序将不能正确运行！");
-				//else
-				//    MyBase.TraceWriteLine("Fwlib32.dll 文件存在！");
 
 				#endregion 检查DLL是否存在
 
@@ -233,90 +198,7 @@ namespace NSAnalysis
 		}
 	}
 
-	public class PLCDfn
+	
-	{
-		/// <summary>
-		/// 上料完成状态 10=OK,其他=false
-		/// </summary>
-		public static int CmmPartOk = -1;
-
-		/// <summary>
-		/// 清除测量结果标志位
-		/// </summary>
-		public static int CMMResultClear = -1;
-
-		/// <summary>
-		/// PLC心跳状态: 0 1 定时闪烁
-		/// </summary>
-		public static bool bPlcLiveHeart = false;
-
-		/// <summary>
-		/// CMM外部急停（PLC给出）
-		/// </summary>
-		public static bool bCMMEmengency = false;
-
-		/// <summary>
-		/// PLC当前模式10：手动；20：自动；30：联机自动；40：脱机运行
-		/// </summary>
-		public static int bPLCMode;
-
-		/// <summary>
-		/// PLC自动运行
-		/// </summary>
-		public static bool bAllowHome = false;
-
-		/// <summary>
-		/// 托盘到位状态：10：托盘到位；0 ：默认
-		/// </summary>
-		public static int TrayStatus;
-
-		/// <summary>
-		/// 允许启动指令：0=禁止启动, 1611或10 = 允许启动, -1= 未知（PLC未连接）
-		/// </summary>
-		public static int StartCmd = -1;
-
-		/// <summary>
-		/// 启动测量：10：开始测量；0 ：默认
-		/// </summary>
-		public static int NSStartMeasure;
-
-		public static int CarPassFlag;
-
-		/// <summary>
-		/// 读码完成：10：默认为；0 ：默认
-		/// </summary>
-		public static int ReadVINFinishFlag;
-
-		/// <summary>
-		/// 从工位1流向工位2：10：station1-&gt;2；0 ：默认
-		/// </summary>
-		public static int Station1To2;
-
-		/// <summary>
-		/// 从工位2流向工位3：10：station1-&gt;2；0 ：默认
-		/// </summary>
-		public static int Station2To3;
-
-		/// <summary>
-		/// 工件ID
-		/// </summary>
-		public static string PartID = "";
-
-		/// <summary>
-		/// 1：EH3；2：EHY
-		/// </summary>
-		public static int CarType;
-
-		/// <summary>
-		/// PLC心跳状态: 0 1 定时闪烁
-		/// </summary>
-		public static bool bPlcLiveTick = false;
-	}
-
-	public class HYPLCDfn
-	{
-		public static int testValue = 1;
-	}
 
 	public class DatabaseDfn
 	{

Analysis/FormMain.cs

@@ -9,11 +9,9 @@ using System.Collections.Generic;
 using System.Data;
 using System.Drawing;
 using System.IO;
-using System.IO.Ports;
 using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading;
 using System.Windows.Forms;
 using Telerik.WinControls;
 using Telerik.WinControls.UI;
@@ -36,22 +34,6 @@ namespace NSAnalysis
 		private int iCurrentMeasureItemsFailedCount = 0;
 		#region PLC相关变量
 
-		private bool bStopPlcNormal = false;
-		private static int HeartBeatCount = 0;
-		private bool bPlcLiveTickLast = false;
-
-		private Thread m_ThreadReconnectPLC = null;
-		private int m_ReConnectNum = 0;
-		private bool bTickt = true;
-		private int iLastNSStartMeasure = 0;
-		private int iLastCarPassFlag = 0;
-		private int iLastStation1To2 = 0;
-		private int iLastStation2To3 = 0;
-		private int iLastReadVINFinishFlag = 0;
-
-		private SerialPort serialTestPort = null;
-
-		private SerialPort serialPort = null;
 		private int iLastMesureCount = 0;
 
 		#endregion PLC相关变量
@@ -109,34 +91,12 @@ namespace NSAnalysis
 			rdtpEndTime.Text = DateTime.Now.ToString("yyyy-MM-dd");
 
 			#endregion 初始化全局变量
-			//需要显示车身数据  不分析csv文件
+			
-			if (ConfigDfn.iShowCarDataFlag == 1)
-			{
-				MyBase.TraceWriteLine(" 进入显示车身模式！显示车身界面。");
-				lpcShowCarData_Click(null, null);
-				//serialPort = new SerialPort(ConfigDfn.strCOMPort, 115200, Parity.None, 8, StopBits.One); // 设置串口参数
-				//serialPort.DataReceived += new SerialDataReceivedEventHandler(DataAutoReceivedHandler); // 注册数据接收事件处理方法
-				//serialPort.Open(); // 打开串口
-				//if (serialPort.IsOpen)
-				//{
-				//    MyBase.TraceWriteLine(ConfigDfn.strCOMPort + "打开成功O(∩_∩)O");
-				//}
-				//else
-				//{
-				//    MyBase.TraceWriteLine(ConfigDfn.strCOMPort + "打开失败！");
-				//    MessageBox.Show(ConfigDfn.strCOMPort + "打开失败！请检查扫抢串口设置是否正确。", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
-				//}
-			}
-			else
-			{
-				MyBase.TraceWriteLine(" 进入不显示车身模式！");
-			}
 			if (ConfigDfn.iAnalysisCSVFlag == 1)
 			{
 				MyBase.TraceWriteLine(" 进入解析CSV文件模式，开始解析扫码CSV文件！");
 				tmReadNextsenseCSV.Interval = 500;
 				tmReadNextsenseCSV.Start();
-				//tmdal.updateMaintenceInfoEmpty();
 			}
 			else
 			{
@@ -184,7 +144,17 @@ namespace NSAnalysis
 				//    MyBase.TraceWriteLine(strTip + " ；点击了否按钮，不创建目录！");
 				//}
 			}
-			initLPCControl();
+			lpcSoftwareSetup.labPicture.Click += new EventHandler(lpcSoftwareSetup_Click);
+			lpcSoftwareSetup.labText.Click += new EventHandler(lpcSoftwareSetup_Click);
+
+			lpcToleranceSetup.labPicture.Click += new EventHandler(lpcToleranceSetup_Click);
+			lpcToleranceSetup.labText.Click += new EventHandler(lpcToleranceSetup_Click);
+
+			lpcAboutSoftware.labPicture.Click += new EventHandler(lpcAboutSoftware_Click);
+			lpcAboutSoftware.labText.Click += new EventHandler(lpcAboutSoftware_Click);
+
+			lpcShowLog.labPicture.Click += new EventHandler(lpcShowLog_Click);
+			lpcShowLog.labText.Click += new EventHandler(lpcShowLog_Click);
 
 			//tmdal.updateMaintenceInfoEmpty();
 			//iLastMesureCount = tmdal.SelectTMeasureResultCount();
@@ -293,26 +263,7 @@ namespace NSAnalysis
 			#endregion 分页相关
 		}
 
-		private void initLPCControl()
-		{
-			lpcSoftwareSetup.labPicture.Click += new EventHandler(lpcSoftwareSetup_Click);
-			lpcSoftwareSetup.labText.Click += new EventHandler(lpcSoftwareSetup_Click);
 
-			lpcToleranceSetup.labPicture.Click += new EventHandler(lpcToleranceSetup_Click);
-			lpcToleranceSetup.labText.Click += new EventHandler(lpcToleranceSetup_Click);
-
-			lpcAboutSoftware.labPicture.Click += new EventHandler(lpcAboutSoftware_Click);
-			lpcAboutSoftware.labText.Click += new EventHandler(lpcAboutSoftware_Click);
-
-			lpcUploadIOTTest.labPicture.Click += new EventHandler(lpcUploadIOTTest_Click);
-			lpcUploadIOTTest.labText.Click += new EventHandler(lpcUploadIOTTest_Click);
-
-			lpcTestGetCarTye.labPicture.Click += new EventHandler(lpcTestGetCarTye_Click);
-			lpcTestGetCarTye.labText.Click += new EventHandler(lpcTestGetCarTye_Click);
-
-			lpcShowLog.labPicture.Click += new EventHandler(lpcShowLog_Click);
-			lpcShowLog.labText.Click += new EventHandler(lpcShowLog_Click);
-		}
 
 		private void FormMain_FormClosing(object sender, FormClosingEventArgs e)
 		{
@@ -1802,6 +1753,8 @@ namespace NSAnalysis
 		private void lpcShowCarData_Load(object sender, EventArgs e)
 		{
 		}
+
+	
 	}
 
 	#endregion

Analysis/FormMain.designer.cs

@@ -143,10 +143,8 @@ namespace NSAnalysis
 			this.SMResult = new System.Windows.Forms.DataGridViewTextBoxColumn();
 			this.rpvpSetup = new Telerik.WinControls.UI.RadPageViewPage();
 			this.lpcToleranceSetup = new UserControlClass.LabPictureControl();
-			this.lpcTestGetCarTye = new UserControlClass.LabPictureControl();
 			this.lpcShowLog = new UserControlClass.LabPictureControl();
 			this.lpcSoftwareSetup = new UserControlClass.LabPictureControl();
-			this.lpcUploadIOTTest = new UserControlClass.LabPictureControl();
 			this.lpcAboutSoftware = new UserControlClass.LabPictureControl();
 			this.tmSystem = new System.Windows.Forms.Timer(this.components);
 			this.tmReadNextsenseCSV = new System.Windows.Forms.Timer(this.components);
@@ -1813,10 +1811,8 @@ namespace NSAnalysis
 			// rpvpSetup
 			// 
 			this.rpvpSetup.Controls.Add(this.lpcToleranceSetup);
-			this.rpvpSetup.Controls.Add(this.lpcTestGetCarTye);
 			this.rpvpSetup.Controls.Add(this.lpcShowLog);
 			this.rpvpSetup.Controls.Add(this.lpcSoftwareSetup);
-			this.rpvpSetup.Controls.Add(this.lpcUploadIOTTest);
 			this.rpvpSetup.Controls.Add(this.lpcAboutSoftware);
 			this.rpvpSetup.Font = new System.Drawing.Font("Segoe UI", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
 			this.rpvpSetup.Image = ((System.Drawing.Image)(resources.GetObject("rpvpSetup.Image")));
@@ -1834,27 +1830,12 @@ namespace NSAnalysis
 			this.lpcToleranceSetup.LabelPoint = new System.Drawing.Point(3, 59);
 			this.lpcToleranceSetup.LabelText = "数据分发";
 			this.lpcToleranceSetup.LabelTopImage = global::NSAnalysis.Properties.Resources.Config;
-			this.lpcToleranceSetup.Location = new System.Drawing.Point(168, 37);
+			this.lpcToleranceSetup.Location = new System.Drawing.Point(166, 37);
 			this.lpcToleranceSetup.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.lpcToleranceSetup.Name = "lpcToleranceSetup";
 			this.lpcToleranceSetup.Size = new System.Drawing.Size(113, 85);
 			this.lpcToleranceSetup.TabIndex = 458;
 			// 
-			// lpcTestGetCarTye
-			// 
-			this.lpcTestGetCarTye.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-			this.lpcTestGetCarTye.Font = new System.Drawing.Font("Segoe UI", 9.75F);
-			this.lpcTestGetCarTye.ForeColor = System.Drawing.Color.White;
-			this.lpcTestGetCarTye.LabelPoint = new System.Drawing.Point(3, 59);
-			this.lpcTestGetCarTye.LabelText = "获取车型测试";
-			this.lpcTestGetCarTye.LabelTopImage = global::NSAnalysis.Properties.Resources.downloadCarType;
-			this.lpcTestGetCarTye.Location = new System.Drawing.Point(484, 37);
-			this.lpcTestGetCarTye.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-			this.lpcTestGetCarTye.Name = "lpcTestGetCarTye";
-			this.lpcTestGetCarTye.Size = new System.Drawing.Size(113, 85);
-			this.lpcTestGetCarTye.TabIndex = 457;
-			this.lpcTestGetCarTye.Click += new System.EventHandler(this.lpcTestGetCarTye_Click);
-			// 
 			// lpcShowLog
 			// 
 			this.lpcShowLog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
@@ -1863,7 +1844,7 @@ namespace NSAnalysis
 			this.lpcShowLog.LabelPoint = new System.Drawing.Point(2, 59);
 			this.lpcShowLog.LabelText = "显示LOG";
 			this.lpcShowLog.LabelTopImage = global::NSAnalysis.Properties.Resources.LOG;
-			this.lpcShowLog.Location = new System.Drawing.Point(662, 37);
+			this.lpcShowLog.Location = new System.Drawing.Point(322, 37);
 			this.lpcShowLog.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.lpcShowLog.Name = "lpcShowLog";
 			this.lpcShowLog.Size = new System.Drawing.Size(86, 85);
@@ -1885,21 +1866,6 @@ namespace NSAnalysis
 			this.lpcSoftwareSetup.TabIndex = 453;
 			this.lpcSoftwareSetup.Click += new System.EventHandler(this.lpcSoftwareSetup_Click);
 			// 
-			// lpcUploadIOTTest
-			// 
-			this.lpcUploadIOTTest.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-			this.lpcUploadIOTTest.Font = new System.Drawing.Font("Segoe UI", 9.75F);
-			this.lpcUploadIOTTest.ForeColor = System.Drawing.Color.White;
-			this.lpcUploadIOTTest.LabelPoint = new System.Drawing.Point(3, 59);
-			this.lpcUploadIOTTest.LabelText = "上传IOT测试";
-			this.lpcUploadIOTTest.LabelTopImage = global::NSAnalysis.Properties.Resources.upload;
-			this.lpcUploadIOTTest.Location = new System.Drawing.Point(326, 37);
-			this.lpcUploadIOTTest.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-			this.lpcUploadIOTTest.Name = "lpcUploadIOTTest";
-			this.lpcUploadIOTTest.Size = new System.Drawing.Size(113, 85);
-			this.lpcUploadIOTTest.TabIndex = 451;
-			this.lpcUploadIOTTest.Click += new System.EventHandler(this.lpcUploadIOTTest_Click);
-			// 
 			// lpcAboutSoftware
 			// 
 			this.lpcAboutSoftware.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
@@ -1908,7 +1874,7 @@ namespace NSAnalysis
 			this.lpcAboutSoftware.LabelPoint = new System.Drawing.Point(2, 59);
 			this.lpcAboutSoftware.LabelText = "关于软件";
 			this.lpcAboutSoftware.LabelTopImage = global::NSAnalysis.Properties.Resources.About32;
-			this.lpcAboutSoftware.Location = new System.Drawing.Point(791, 37);
+			this.lpcAboutSoftware.Location = new System.Drawing.Point(451, 37);
 			this.lpcAboutSoftware.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
 			this.lpcAboutSoftware.Name = "lpcAboutSoftware";
 			this.lpcAboutSoftware.Size = new System.Drawing.Size(86, 85);
@@ -2077,7 +2043,6 @@ namespace NSAnalysis
         private Telerik.WinControls.UI.CommandBarSeparator commandBarSeparator4;
         private Telerik.WinControls.UI.RadLabelElement radLabelElement2;
         private Telerik.WinControls.UI.RadLabelElement rleReadCSVStatus;
-        private LabPictureControl lpcUploadIOTTest;
         private System.Windows.Forms.Label labCarType;
         private System.Windows.Forms.Label label24;
         private LabPictureControl lpcShowLog;
@@ -2099,7 +2064,6 @@ namespace NSAnalysis
         private System.Windows.Forms.DataGridViewTextBoxColumn MeasureValue;
         private System.Windows.Forms.DataGridViewTextBoxColumn MDate;
         private System.Windows.Forms.DataGridViewTextBoxColumn MResult;
-        private LabPictureControl lpcTestGetCarTye;
         private LabPictureControl lpcSoftwareSetup;
 		private LabPictureControl lpcToleranceSetup;
 	}

Analysis/FormMain.resx

@@ -150,65 +150,6 @@
         IHTCfZQWuRBGlIrQoi/wc3unYB2yIezXtu/xFw+lctWAOpr3s5YWKFgAon3/xnp3cjPKCDsamCTUelHG
         M5zL/kBDiUN9j/R9EOdzZ+k8yb/At2NlgydJjTKiVtSdVKk/m/kVANjAPs34ScEaMJfVMw3t6bm6s6lp
         qEc4R0mJ+26dgwn6qipE706fjsJ1VnvEI8VA/PC3/lOjX79/AdonQT85iOsDAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="rpvpAnalysis.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AkVCAAngM/SOwAAAoNJREFU
-        SEu1lsvLTWEUh7cIJQbEwIRipoSRiRiIAf4AxcB1YGJgIkWhFBHKyOQrA5JigmKipIQJGZCJWwauySWX
-        iOf5etfu/XbrHMftV0/tvd61fr/O2e9+z2kG1GRYAUfgGjyFtwWvrblmj71/rSmwGa7Ce/jxC+yx1xln
-        f1ujYDlo8h26AbdhS8Hr7rozzuqh10AaC9vgNXQN5Q0shpDX1rJePfTSs69s2A1fIDOS+zANQlPBWtYr
-        X0HPvuFbIUJvwTG4At9KTd7BKgh5bS3W7XXGWT2s6al3Kr+yF2DjdZgByl16DsJYHsK+gtf1mr2xs/XQ
-        y7reS2CEJsEliOG9UGsjxFoXN5LPODbhBqilV/SaYVar1eCziIaTMAZC+yHWupyA+XC53Nsb0kOv6DXD
-        rGFNgIsQi/IRNFgK2+EV1OuBz24lqONgzV5nnNVDr3rGLDObRdDL+HNSq3kEM8Gv72apBb1mzTKz2VUK
-        f8J5GA0LoNe7nGFmc6Eq+CoMcjQGO0F5RGbrgZ71K2lm+/J72G+ChbAHPkA0ZnyCZaCGIOvRQy899TbD
-        upnN83Kzw5sid+MZqE26PIDp4I/BnVLrokf9dphh3cz22azxptJRqE0Cd7KGsZvnwkvIevWoZYZ1M5sn
-        5eYseO6qOXAXapPgIIyHkNeHIOvVQy+ltxnWzWzPU08ejzcPhHul1uUxzIKurLmWzeilp95xuvnq9dwY
-        GQ6MOPKKJsINyGYyzGzWQ31c9sNPNRu66veJu5i1DoaH3KFZU4bPeByEvD4AWW+GWe3jOgxZU4ZH4SlY
-        C+7S06WW9WaY1WoePIOs8V9ihlmt/EPm3xP/SXja/A/0NoOspvkJxD7h7QqkS00AAAAASUVORK5CYII=
-</value>
-  </data>
-  <data name="rpvpSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AEGATc06Xu77gAAAihJREFU
-        WEft1j1rFUEUgOH1IwYLCzEKSSAQVLBRkkZ/gEYs468w1iJoY6ud2gqKIfEXWAh2GhNrP8DYRcEETaNi
-        YSHq+152YLKe3J1ELiLcAw8sO2fO7MfM7Fb96Mf/GIPYj0MYrXnsOdt6EgdwGlcwjwW8wErNY8/ZZo65
-        9vnrGMclLOIzfhUy1z72tcaWYx8uwDv7iWiQEva1hrWsWRSHMYfviIomX7FW8zjKSaxlTWt3jUk8RVQk
-        ccDbOIcjNY89Z1vUJ7H2BMI4jueIOiYvcRY7sAvOfnls2GZO1Dd5hmPYEMN4hKhD4t05gOFd3MNy7S58
-        eoY5bU/iIRyzEwO4jrbJdgs7YVxEc468wkkY5uZtTY51A3tQnccnRInJF5xBir24hm/I8+5jN8y1T97W
-        5JiO3VmvUUJuFc5g372PbgRHcQc/kPLe4CBc+/bJa0Qcu1rKTmzGYhZ1d3uCD3iPj8hfnRfgpCy9AFdF
-        8Stwe3W+uN1GOZpF6StYxzQ6E8EJ0TYJb8I4hddotnvONsPcZntuwyQ0fK8ujSg5cWlNwXDJufTe1vJl
-        aM6WlmEKNwc3iahD4iaTLiLaiGxr24iceH9sRClO4DGijomTy3Xe3Io91zbxrO0YXWMMTqaSj5EDquRj
-        ZE1rF4Wfzhn4ONsmZzf2tYa1ij/HebieL2O7PyT23dYPSTOG4D5wFQ/g75d39q7msedsM8dc+/Qk/slP
-        aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="rpvpSetup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU
-        WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+
-        613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e
-        Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT
-        4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3
-        z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr
-        Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj
-        uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ
-        dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH
-        qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm
-        fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0
-        E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf
-        d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm
-        okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau
-        DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8
-        LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV
-        bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl
-        8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi
-        n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx
-        f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/
-        ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg==
 </value>
   </data>
   <metadata name="DimensionID.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
@@ -235,11 +176,21 @@
   <metadata name="MResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="rpvpAnalysis.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        iVBORw0KGgoAAAANSUhEUgAAAAUAAAAECAYAAABGM/VAAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
+        iVBORw0KGgoAAAANSUhEUgAAAB4AAAAYCAYAAADtaU2/AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
-        vAAADrwBlbxySQAAACFJREFUGFdjEHXq/o+OGf4DAbIACDCAAEwCLgADCAEGBgDP4STWpID5ywAAAABJ
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AkVCAAngM/SOwAAAoNJREFU
-        RU5ErkJggg==
+        SEu1lsvLTWEUh7cIJQbEwIRipoSRiRiIAf4AxcB1YGJgIkWhFBHKyOQrA5JigmKipIQJGZCJWwauySWX
+        iOf5etfu/XbrHMftV0/tvd61fr/O2e9+z2kG1GRYAUfgGjyFtwWvrblmj71/rSmwGa7Ce/jxC+yx1xln
+        f1ujYDlo8h26AbdhS8Hr7rozzuqh10AaC9vgNXQN5Q0shpDX1rJePfTSs69s2A1fIDOS+zANQlPBWtYr
+        X0HPvuFbIUJvwTG4At9KTd7BKgh5bS3W7XXGWT2s6al3Kr+yF2DjdZgByl16DsJYHsK+gtf1mr2xs/XQ
+        y7reS2CEJsEliOG9UGsjxFoXN5LPODbhBqilV/SaYVar1eCziIaTMAZC+yHWupyA+XC53Nsb0kOv6DXD
+        rGFNgIsQi/IRNFgK2+EV1OuBz24lqONgzV5nnNVDr3rGLDObRdDL+HNSq3kEM8Gv72apBb1mzTKz2VUK
+        f8J5GA0LoNe7nGFmc6Eq+CoMcjQGO0F5RGbrgZ71K2lm+/J72G+ChbAHPkA0ZnyCZaCGIOvRQy899TbD
+        upnN83Kzw5sid+MZqE26PIDp4I/BnVLrokf9dphh3cz22azxptJRqE0Cd7KGsZvnwkvIevWoZYZ1M5sn
+        5eYseO6qOXAXapPgIIyHkNeHIOvVQy+ltxnWzWzPU08ejzcPhHul1uUxzIKurLmWzeilp95xuvnq9dwY
+        GQ6MOPKKJsINyGYyzGzWQ31c9sNPNRu66veJu5i1DoaH3KFZU4bPeByEvD4AWW+GWe3jOgxZU4ZH4SlY
+        C+7S06WW9WaY1WoePIOs8V9ihlmt/EPm3xP/SXja/A/0NoOspvkJxD7h7QqkS00AAAAASUVORK5CYII=
 </value>
   </data>
   <data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -300,6 +251,48 @@
   <metadata name="SMResult.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <data name="rpvpSearch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AEGATc06Xu77gAAAihJREFU
+        WEft1j1rFUEUgOH1IwYLCzEKSSAQVLBRkkZ/gEYs468w1iJoY6ud2gqKIfEXWAh2GhNrP8DYRcEETaNi
+        YSHq+152YLKe3J1ELiLcAw8sO2fO7MfM7Fb96Mf/GIPYj0MYrXnsOdt6EgdwGlcwjwW8wErNY8/ZZo65
+        9vnrGMclLOIzfhUy1z72tcaWYx8uwDv7iWiQEva1hrWsWRSHMYfviIomX7FW8zjKSaxlTWt3jUk8RVQk
+        ccDbOIcjNY89Z1vUJ7H2BMI4jueIOiYvcRY7sAvOfnls2GZO1Dd5hmPYEMN4hKhD4t05gOFd3MNy7S58
+        eoY5bU/iIRyzEwO4jrbJdgs7YVxEc468wkkY5uZtTY51A3tQnccnRInJF5xBir24hm/I8+5jN8y1T97W
+        5JiO3VmvUUJuFc5g372PbgRHcQc/kPLe4CBc+/bJa0Qcu1rKTmzGYhZ1d3uCD3iPj8hfnRfgpCy9AFdF
+        8Stwe3W+uN1GOZpF6StYxzQ6E8EJ0TYJb8I4hddotnvONsPcZntuwyQ0fK8ujSg5cWlNwXDJufTe1vJl
+        aM6WlmEKNwc3iahD4iaTLiLaiGxr24iceH9sRClO4DGijomTy3Xe3Io91zbxrO0YXWMMTqaSj5EDquRj
+        ZE1rF4Wfzhn4ONsmZzf2tYa1ij/HebieL2O7PyT23dYPSTOG4D5wFQ/g75d39q7msedsM8dc+/Qk/slP
+        aT/60aOoqt9oGogfMlqpmgAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="rpvpSetup.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
+        JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAAB3RJTUUH5AQOAhEQGbTF3QAABH1JREFU
+        WEe111mobmMcx/FtnnKcDJlFiDLPM+UgQy50RIZSCDdKUUKIQm7IkIgoKQ7HPAtlvJFypSjKPBbKPP8+
+        613/09rLepe95fzqe1rredd+hv/4nJn/oLXDHeHP8FfLH+H+sF5Y7jo2/BK+Dx+0eP49LA7/m1YJq00e
+        Z+mS4NS3hc1abmzHrg59rdoyL+0floanw6mhNrJCuC9Y7CwDrU4Jxh4PKxmIHODE8FQwfniYkw4I7wYT
+        4tdwe9gu7BHeDj+Fg0PJ+HfhvbBf2DrcHHxX83wcjg6jcvJ3Qp3mivB5+87X9fxG2CCUFoZXgt++CO+3
+        z1+GK4O5vNvEkWFQTMbsPvQHGwdikWeC03wdHgoHhb72CtzzVfg5vBgODbRJeCyYm0uGYqsZtJCPnLwr
+        Jzww7BrGAsohdgm+XddARxcGcz8fVjcwJAHH558F7hjTgrBlyzoGRrRb4MLfwhkGpokVBJydsoaT97Vj
+        uCow6Ustj7ZjfutrrVCuvSesEUYl2u2Wz5myJL1OD8+FywKfb9Gye1Af/HZ2qFSkfYNCJThZYlTyXEqJ
+        dgHH5yWLvxz2bN4m324YBOuKBiIWeCSc07xNtH34JHwTBK+/myW1XXm9OIhiec5cD4YKOBM7XS1uk3cH
+        qYcHQtWFHYJva/M2d2cwpxTXMy4Nx4UmUDUWtd0HYHp53k01/mV2svibwdhOwYKXh7dCpd0F4brJYyOm
+        fz38GGodAWnjTVfjI7VdeXWSbpER7QKOz5nPyS3elxhgtZXDzkEZ73bH9YOYOjPcGqxpI80/gk5TGZI0
+        E+mCbaPA5E7el+B9LZjHARScrcKQfGPNOW9A8NmAgLMBZu9rm/Bq2DzYwJNh2gY2Dcs24DLBHDeEkwMf
+        d/NfkZHn/Cig+K3ioavzg3xXDW3w2dB1pXmk60nh+rDMBaLSZcILdDUmr4gnPudjOiQIuIsCszu5xQXm
+        okDnhZsmj41s6IVg7lrHmg7WBMrx4ZrwRKhOdm9wGqo0rEon2gUcn3OJk9fi2wbf7t28TaxW1fXDIDau
+        DSeEf1zhRLAeoI3qaqK5pMI9HMr/vhU3fF4btfiScG7zNhEracPfhsOCvxuVywQraKn9UqzCOZ08lwl8
+        LL1sitn53eLdUuxAPwQNbqhXzJKTuMkwl37eb6kkGAWRPBfp3GZhPi+zd6XS1oXkrjB4Fyi5w6mEXFBV
+        bZr4T5qhG+1DsjH9QKs/zcCQ1H0BYqeuUV1pqfsEjaUaz5D8xufuhU7eVd2mp15IbIA5faT01pVMUxHl
+        8tYpNJZulyyJA9H+UeDzKt+0ZrglmJvrprrhiCBifShHXaOqYnGLlupZYxF8Jf1CnvtNtAs4zzasy9bi
+        n4ajwqiOCbUJ6FpuMoJPh9RSdbVuhqhwiow8l2qiXcDxec1jcW1/TrJL8eBU7nB1jdINlWITdu92yqsx
+        f1N5zswCjs+Z/V9P3pcJhoLFZcJiWqpCpLFIS2MqXF/mGE29+cpNhlsEpfiAZ7VdeV3uUpzKDV0E7Tz/
+        ez4z8zeeNDGa23P9IwAAAABJRU5ErkJggg==
+</value>
+  </data>
   <metadata name="tmSystem.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
@@ -310,7 +303,7 @@
     <value>310, 14</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>61</value>
+    <value>65</value>
   </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

Analysis/NXSAnalysis.csproj

@@ -69,7 +69,8 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>HexagonTransparent.ico</ApplicationIcon>
+    <ApplicationIcon>
+    </ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Covert, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -114,10 +115,10 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AboutSoftwareInfo.cs">
+    <Compile Include="CjlrForm\AboutSoftwareInfo.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="AboutSoftwareInfo.designer.cs">
+    <Compile Include="CjlrForm\AboutSoftwareInfo.designer.cs">
       <DependentUpon>AboutSoftwareInfo.cs</DependentUpon>
     </Compile>
     <Compile Include="BaseUnit\Base.cs" />
@@ -133,53 +134,53 @@
       <DependentUpon>FormMain.cs</DependentUpon>
     </Compile>
     <Compile Include="Model\CjlrTaskReleaseModel.cs" />
-    <Compile Include="UserControl\LabPictureControl.cs">
+    <Compile Include="CjlrForm\LabPictureControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
-    <Compile Include="UserControl\LabPictureControl.designer.cs">
+    <Compile Include="CjlrForm\LabPictureControl.designer.cs">
       <DependentUpon>LabPictureControl.cs</DependentUpon>
     </Compile>
     <Compile Include="DAL\SQLHelper.cs" />
     <Compile Include="Model\TMeasureDataModel.cs" />
     <Compile Include="DAL\TMeasureMSSQLDAL.cs" />
     <Compile Include="Model\TMeasureResultModel.cs" />
-    <Compile Include="Tolerance\FAddTolerance.cs">
+    <Compile Include="CjlrForm\FAddTolerance.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Tolerance\FAddTolerance.designer.cs">
+    <Compile Include="CjlrForm\FAddTolerance.designer.cs">
       <DependentUpon>FAddTolerance.cs</DependentUpon>
     </Compile>
-    <Compile Include="Tolerance\FEditTolerance.cs">
+    <Compile Include="CjlrForm\FEditTolerance.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Tolerance\FEditTolerance.designer.cs">
+    <Compile Include="CjlrForm\FEditTolerance.designer.cs">
       <DependentUpon>FEditTolerance.cs</DependentUpon>
     </Compile>
-    <Compile Include="FSoftwareSetup.cs">
+    <Compile Include="CjlrForm\FSoftwareSetup.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="FSoftwareSetup.designer.cs">
+    <Compile Include="CjlrForm\FSoftwareSetup.designer.cs">
       <DependentUpon>FSoftwareSetup.cs</DependentUpon>
     </Compile>
-    <Compile Include="Tolerance\FToleranceSetup.cs">
+    <Compile Include="CjlrForm\FToleranceSetup.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Tolerance\FToleranceSetup.designer.cs">
+    <Compile Include="CjlrForm\FToleranceSetup.designer.cs">
       <DependentUpon>FToleranceSetup.cs</DependentUpon>
     </Compile>
-    <Compile Include="ZSFDEMO.cs">
+    <Compile Include="BaseUnit\ZSFDEMO.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="ZSFDEMO.designer.cs">
+    <Compile Include="BaseUnit\ZSFDEMO.designer.cs">
       <DependentUpon>ZSFDEMO.cs</DependentUpon>
     </Compile>
-    <EmbeddedResource Include="AboutSoftwareInfo.resx">
+    <EmbeddedResource Include="CjlrForm\AboutSoftwareInfo.resx">
       <DependentUpon>AboutSoftwareInfo.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="FormMain.resx">
       <DependentUpon>FormMain.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="UserControl\LabPictureControl.resx">
+    <EmbeddedResource Include="CjlrForm\LabPictureControl.resx">
       <DependentUpon>LabPictureControl.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\licenses.licx" />
@@ -195,19 +196,19 @@
       <DependentUpon>Resources.resx</DependentUpon>
       <DesignTime>True</DesignTime>
     </Compile>
-    <EmbeddedResource Include="Tolerance\FAddTolerance.resx">
+    <EmbeddedResource Include="CjlrForm\FAddTolerance.resx">
       <DependentUpon>FAddTolerance.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Tolerance\FEditTolerance.resx">
+    <EmbeddedResource Include="CjlrForm\FEditTolerance.resx">
       <DependentUpon>FEditTolerance.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="FSoftwareSetup.resx">
+    <EmbeddedResource Include="CjlrForm\FSoftwareSetup.resx">
       <DependentUpon>FSoftwareSetup.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Tolerance\FToleranceSetup.resx">
+    <EmbeddedResource Include="CjlrForm\FToleranceSetup.resx">
       <DependentUpon>FToleranceSetup.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="ZSFDEMO.resx">
+    <EmbeddedResource Include="BaseUnit\ZSFDEMO.resx">
       <DependentUpon>ZSFDEMO.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="NLog.config">
@@ -229,7 +230,6 @@
   </ItemGroup>
   <ItemGroup>
     <!--sirinie -->
-    <Content Include="HexagonTransparent.ico" />
     <Content Include="Images\1024B-2.png" />
     <Content Include="Images\cncmachine32.png" />
     <Content Include="Images\Dashboard.png" />
@@ -242,6 +242,7 @@
     <Content Include="Images\Search32.png" />
     <Content Include="Images\setup32.png" />
     <Content Include="Images\wnull.png" />
+    <None Include="Resources\Hexagon_logo_horz_Chinese_black.png" />
     <None Include="Resources\Range.png" />
     <None Include="Resources\EH3L.png" />
     <None Include="Resources\EH3R.png" />

Analysis/Program.cs

@@ -1,5 +1,6 @@
 using BaseFunction;
 using Microsoft.Win32;
+using NSAnalysis.BaseUnit;
 using System;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
@@ -82,7 +83,9 @@ namespace NSAnalysis
 
 			#endregion 创建Log文件
 
-			Application.Run(new FToleranceSetup());
+			Application.Run(new FormMain());
+			//FileSorter fileSorter = new FileSorter();
+			//fileSorter.ProcessFiles();
 
 			//if (gAuthorizationMode == 1)
 			//         {

Analysis/Properties/Resources.Designer.cs

@@ -200,6 +200,16 @@ namespace NSAnalysis.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap Hexagon_logo_horz_Chinese_black {
+            get {
+                object obj = ResourceManager.GetObject("Hexagon_logo_horz_Chinese_black", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

Analysis/Properties/Resources.resx

@@ -118,23 +118,56 @@
     <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="cncmachine32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\cncmachine32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\dashboard.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="eyes32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\eyes32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Search32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\search32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="EHYL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\EHYL.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="add_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\add_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Waiting" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Waiting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="EH3R" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\EH3R.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="upload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ResultNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ResultNG.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cncmachine32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\images\cncmachine32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="showcardata" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\showcardata.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="OK" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\OK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Range" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\Range.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="ResultOK" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ResultOK.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
   <data name="setup32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\setup32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="wnull" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="EH3L" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\images\wnull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\EH3L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="NG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\NG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="EHYR" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\EHYR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="export" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\images\export.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -142,29 +175,32 @@
   <data name="Forbid" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Forbid.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="Waiting" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="FirstPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Waiting.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\firstpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="NG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Refresh128" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\NG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Refresh128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="OK" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="wnull" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\OK.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\wnull.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ResultNG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="eyes32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ResultNG.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\images\eyes32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ResultOK" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="PLCTest32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ResultOK.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\plctest32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="About32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="LastPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\about32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\lastpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PLCAddress32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\plcaddress32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="PLCTest32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="NextPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\plctest32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\nextpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="LOG" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\LOG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="search16" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\search16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -172,17 +208,11 @@
   <data name="hexagonlogotransparent" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\hexagonlogotransparent.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="upload" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="About32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\upload.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\about32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="FirstPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="setupgreen32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\firstpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\setupgreen32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="LastPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\lastpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="NextPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\nextpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="PrevPage" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\prevpage.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -190,40 +220,13 @@
   <data name="Refresh64" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Refresh64.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="showcardata" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\showcardata.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Refresh128" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Refresh128.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="Config" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\HConfig.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="setupgreen32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\setupgreen32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="add_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\add_32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="LOG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\LOG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
   <data name="downloadCarType" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\downloadCarType.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="EHYL" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="Hexagon_logo_horz_Chinese_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\EHYL.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+    <value>..\Resources\Hexagon_logo_horz_Chinese_black.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="EHYR" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\EHYR.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="EH3L" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\EH3L.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="EH3R" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\EH3R.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
-  <data name="Range" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\Range.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>

Analysis/Tolerance/LabPictureControl.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace UserControlClass
-{
-    public partial class LabPictureControl : UserControl
-    {
-        public LabPictureControl()
-        {
-            InitializeComponent();
-        }
-
-        /// <summary>
-        /// 添加LabelText属性，可以对labelText进行设置
-        /// </summary>
-        public string LabelText
-        {
-            get { return labText.Text; }
-            set { labText.Text = value; }
-        }
-
-        /// <summary>
-        /// 上面Label的图片图片连接
-        /// </summary>
-        public Image LabelTopImage
-        {
-            get { return labPicture.Image; }
-            set { labPicture.Image = value; }
-        }
-
-        /// <summary>
-        /// 文字位置坐标
-        /// </summary>
-        public Point LabelPoint
-        {
-            get { return labText.Location; }
-            set { labText.Location = value; }
-        }
-
-        private void labPicture_MouseHover(object sender, EventArgs e)
-        {
-            LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent;
-            lpc.BackColor = Color.FromArgb(0, 151, 186);
-        }
-
-        private void labPicture_MouseLeave(object sender, EventArgs e)
-        {
-            LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent;
-            lpc.BackColor = Color.FromArgb(19, 46, 53);
-        }
-
-        private void labText_MouseHover(object sender, EventArgs e)
-        {
-            LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent;
-            lpc.BackColor = Color.FromArgb(0, 151, 186);
-        }
-
-        private void labText_MouseLeave(object sender, EventArgs e)
-        {
-            LabPictureControl lpc = (LabPictureControl)(sender as Label).Parent;
-            lpc.BackColor = Color.FromArgb(19, 46, 53);
-        }
-
-        private void LabPictureControl_MouseHover(object sender, EventArgs e)
-        {
-            LabPictureControl lpc = sender as LabPictureControl;
-            lpc.BackColor = Color.FromArgb(0, 151, 186);
-        }
-
-        private void LabPictureControl_MouseLeave(object sender, EventArgs e)
-        {
-            LabPictureControl lpc = sender as LabPictureControl;
-            lpc.BackColor = Color.FromArgb(19, 46, 53);
-        }
-    }
-}

Analysis/UserControl/LabPictureControl.designer.cs

@@ -1,84 +0,0 @@
-namespace UserControlClass
-{
-    public partial class LabPictureControl
-    {
-        /// <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.labText = new System.Windows.Forms.Label();
-            this.labPicture = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // labText
-            // 
-            this.labText.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.labText.Location = new System.Drawing.Point(2, 59);
-            this.labText.Name = "labText";
-            this.labText.Size = new System.Drawing.Size(83, 25);
-            this.labText.TabIndex = 1;
-            this.labText.Text = "添加抽屉";
-            this.labText.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labText.MouseLeave += new System.EventHandler(this.labText_MouseLeave);
-            this.labText.MouseHover += new System.EventHandler(this.labText_MouseHover);
-            // 
-            // labPicture
-            // 
-            this.labPicture.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.labPicture.Location = new System.Drawing.Point(0, 3);
-            this.labPicture.Name = "labPicture";
-            this.labPicture.Padding = new System.Windows.Forms.Padding(17, 21, 17, 21);
-            this.labPicture.Size = new System.Drawing.Size(86, 54);
-            this.labPicture.TabIndex = 0;
-            this.labPicture.MouseLeave += new System.EventHandler(this.labPicture_MouseLeave);
-            this.labPicture.MouseHover += new System.EventHandler(this.labPicture_MouseHover);
-            // 
-            // LabPictureControl
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 17F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(19)))), ((int)(((byte)(46)))), ((int)(((byte)(53)))));
-            this.Controls.Add(this.labText);
-            this.Controls.Add(this.labPicture);
-            this.Font = new System.Drawing.Font("Segoe UI", 9.75F);
-            this.ForeColor = System.Drawing.Color.White;
-            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
-            this.Name = "LabPictureControl";
-            this.Size = new System.Drawing.Size(86, 85);
-            this.MouseLeave += new System.EventHandler(this.LabPictureControl_MouseLeave);
-            this.MouseHover += new System.EventHandler(this.LabPictureControl_MouseHover);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        public System.Windows.Forms.Label labPicture;
-        public System.Windows.Forms.Label labText;
-    }
-}

Analysis/UserControl/LabPictureControl.resx

@@ -1,120 +0,0 @@
-<?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>

Analysis/bin/x64/Debug/DAL.dll.config

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <configSections>
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
-    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-  </configSections>
-  <entityFramework>
-    <providers>
-      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
-      <provider invariantName="System.Data.SQLite.EF6" type="System.Data.SQLite.EF6.SQLiteProviderServices, System.Data.SQLite.EF6" />
-    </providers>
-  </entityFramework>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6" />
-  </startup>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="System.Data.SQLite.EF6" />
-      <add name="SQLite Data Provider (Entity Framework 6)" invariant="System.Data.SQLite.EF6" description=".NET Framework Data Provider for SQLite (Entity Framework 6)" type="System.Data.SQLite.EF6.SQLiteProviderFactory, System.Data.SQLite.EF6" />
-    <remove invariant="System.Data.SQLite" /><add name="SQLite Data Provider" invariant="System.Data.SQLite" description=".NET Framework Data Provider for SQLite" type="System.Data.SQLite.SQLiteFactory, System.Data.SQLite" /></DbProviderFactories>
-  </system.data>
-</configuration>

Analysis/bin/x64/Debug/Debug.txt

@@ -1,12 +1,15 @@
-2025-08-05 09:09:41.596----软件Program Main函数开始执行--
+2025-08-06 15:35:41.846----软件Program Main函数开始执行--
-2025-08-05 09:09:41.600--加载配置文件——>开始
+2025-08-06 15:35:41.848--加载配置文件——>开始
-2025-08-05 09:09:41.633--加载配置文件错误：System.FormatException: 输入字符串的格式不正确。
+2025-08-06 15:35:41.870--数据库连接 SqlServerName：127.0.0.1
-   在 System.Number.ParseDouble(String value, NumberStyles options, NumberFormatInfo numfmt)
+2025-08-06 15:35:41.871--数据库连接 SqlUserName：sa
-   在 System.Double.Parse(String s)
+2025-08-06 15:35:41.871--数据库连接 SqlPassword：Hexagon123
-   在 NSAnalysis.ConfigDfn.LoadConfig() 位置 D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\Define\Define.cs:行号 138
+2025-08-06 15:35:41.872--数据库连接 SqlDbName：CJLR
-   在 NSAnalysis.ConfigDfn.LoadConfigFile() 位置 D:\HexagonProjects\2025-01-捷豹路虎改造\code\Analysis\Define\Define.cs:行号 202
+2025-08-06 15:35:41.873--加载配置文件——>完成
-2025-08-05 09:09:42.414--数据库连接 SqlServerName：127.0.0.1
+2025-08-06 15:35:43.537--数据库连接 SqlServerName：127.0.0.1
-2025-08-05 09:09:42.415--数据库连接 SqlUserName：sa
+2025-08-06 15:35:43.537--数据库连接 SqlUserName：sa
-2025-08-05 09:09:42.417--数据库连接 SqlPassword：Hexagon123
+2025-08-06 15:35:43.539--数据库连接 SqlPassword：Hexagon123
-2025-08-05 09:09:42.419--数据库连接 SqlDbName：CJLR
+2025-08-06 15:35:43.540--数据库连接 SqlDbName：CJLR
-2025-08-05 09:09:42.420--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123;
+2025-08-06 15:35:43.541--数据库连接字符串：Data Source=127.0.0.1;initial Catalog=CJLR;User ID=sa;password=Hexagon123;
+2025-08-06 15:35:43.809-- 进入解析CSV文件模式，开始解析扫码CSV文件！
+2025-08-06 15:35:43.810--软件首次启动， Nextsense EH3 CSV读取路径存在；不清空，读取NextSense生成  CSV报告路径下的所有文件，路径为：D:\cherytestEH3
+2025-08-06 15:35:43.811--软件首次启动， Nextsense EHY CSV读取路径存在；不清空，读取NextSense生成  CSV报告路径下的所有文件，路径为：D:\cherytestEHY

Analysis/bin/x64/Debug/File/AnalysisConfig.ini

@@ -17,12 +17,6 @@ CLMSModeID=10
 AuthorizationMode=1
 
 
-;1:上传IOT；0：不上传IOT
-StartIOTFlag=0
-IOTAddress=http://10.188.2.56:9337/web/httpServlet/api/saveGfResult
-IOTCarTypeAddr=http://10.188.2.56:9337/web/httpServlet/api/queryGFModelAndMaterial
-
-
 TolerancePercentage=1.5
 ExceptionPercentage=6
 ;权限密码
@@ -66,17 +60,4 @@ SqlUserName=sa
 SqlPassword=Hexagon123
 
 
-[TCP]
-ModbusTcp_IP=127.0.0.1
-ModbusTcp_Port=502
-ModbusTcp_Addr=1
-ModbusTcp_Reconnected=1
-PLC_StartAddr=100
-PLC_Length=100
-PlcType=3
-ModbusTcp_ReverseSequence=0
-PLC_S7StartAddr=100
-PLC_S7ByteLength=200
-PLC_S7DataBlock=DB4100
-PLC_S7ReadByteCount=200