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

GcDevicePc/CK_UI/UserCtl.cs

@@ -36,7 +36,7 @@ namespace GcDevicePc.CK_UI
 
         private void UserCtl_Load(object sender, EventArgs e)
         {
-
+            Systemtype = CKVocAnalyzer.GlobalCKV.Systemtype;
            
             switch (Systemtype)
             {

GcDevicePc/FormUser.Designer.cs

@@ -42,7 +42,7 @@
             this.userCtl1.Location = new System.Drawing.Point(0, 16);
             this.userCtl1.Name = "userCtl1";
             this.userCtl1.Size = new System.Drawing.Size(758, 468);
-            this.userCtl1.Systemtype = 2;
+            this.userCtl1.Systemtype = 0;
             this.userCtl1.TabIndex = 0;
             // 
             // buttonFID

GcDevicePc/FormUser.cs

@@ -15,12 +15,15 @@ namespace GcDevicePc
     {
         public FormUser()
         {
+          
             InitializeComponent();
+           
         }
 
         private void FormUser_Load(object sender, EventArgs e)
         {
-
+          //  userCtl1.Systemtype = CKVocAnalyzer.GlobalCKV.Systemtype;
+         
         }
 
         private void FormUser_Activated(object sender, EventArgs e)  //激活

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.0.3.00   {0}",Formstr);
+            this.Text = String.Format("VOCs在线监测-1.1.3.00   {0}",Formstr);
             if (LandIn.Island)
             {
             HmiStatus.Text = String.Format("状态：{0}", statestr);