Merge branch 'wang_master' of https://gitee.com/wangwanxh/Vocs into wang_master

GcDevicePc/CK_UI/UserCtl.Designer.cs

@@ -96,11 +96,13 @@
             // 
             // textBox1
             // 
+            this.textBox1.BackColor = System.Drawing.SystemColors.Window;
             this.textBox1.Font = new System.Drawing.Font("宋体", 14.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.textBox1.Location = new System.Drawing.Point(6, 67);
             this.textBox1.Name = "textBox1";
             this.textBox1.Size = new System.Drawing.Size(116, 29);
             this.textBox1.TabIndex = 5;
+            this.textBox1.DoubleClick += new System.EventHandler(this.textBox1_DoubleClick);
             // 
             // textBox2
             // 
@@ -139,7 +141,7 @@
             this.groupBox1.Size = new System.Drawing.Size(131, 413);
             this.groupBox1.TabIndex = 8;
             this.groupBox1.TabStop = false;
-            this.groupBox1.Text = "结果（ppm）";
+            this.groupBox1.Text = "结果(ppm)";
             // 
             // textBox6
             // 

GcDevicePc/MDIBase.cs

@@ -398,7 +398,7 @@ namespace GcDevicePc
          float fDetvalueold = 0.0f;
         private void timer1_Tick(object sender, EventArgs e)
         {
-            this.Text = String.Format("VOCs在线监测-1.1.3.07 {0}",Formstr);
+            this.Text = String.Format("VOCs在线监测-1.1.3.08 {0}",Formstr);
             if (LandIn.Island)
             {
             HmiStatus.Text = String.Format("状态：{0}", statestr);