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

GcDevicePc/CK_UI/LandIn.cs

@@ -13,6 +13,7 @@ namespace GcDevicePc.CK_UI
     {
         private string user = "admin";
         public static bool Island = false;
+        CKVocAnalyzer.NumForm form;
         public LandIn()
         {
             InitializeComponent();
@@ -29,6 +30,10 @@ namespace GcDevicePc.CK_UI
             {
                 Island = false;
             }
+            if(form!=null)
+            {
+                form.Dispose();
+            }
         }
 
         private void button2_Click(object sender, EventArgs e)  //放弃
@@ -43,7 +48,7 @@ namespace GcDevicePc.CK_UI
 
         private void textBox2_Click(object sender, EventArgs e)
         {
-            CKVocAnalyzer.NumForm form = CKVocAnalyzer.NumForm.GetInstance((TextBox)sender);// new CKVocAnalyzer.NumForm((TextBox)sender);
+            form = CKVocAnalyzer.NumForm.GetInstance((TextBox)sender);// new CKVocAnalyzer.NumForm((TextBox)sender);
             
             form.Show();
         }

GcDevicePc/FormUser.cs

@@ -47,8 +47,34 @@ namespace GcDevicePc
         //自动校准
         private void buttonauto_Click(object sender, EventArgs e)  
         {
-            CKVocAnalyzer.AutoAdjust auto = new CKVocAnalyzer.AutoAdjust();
-            auto.Show();
+            if (CK_UI.LandIn.Island)
+            {
+               
+            }else
+            {
+               
+            }
+
+            DialogResult dr = new CK_UI.LandIn().ShowDialog();
+
+            if (dr == DialogResult.OK)
+            {
+                if (CK_UI.LandIn.Island)
+                {
+                    CKVocAnalyzer.AutoAdjust auto = new CKVocAnalyzer.AutoAdjust();
+                    auto.Show();
+                }else
+                {
+                    MessageBox.Show("无权限操作！！！！");
+                }
+            }
+
+            if (dr == DialogResult.No)
+            {
+               // MessageBox.Show("无权限操作！！！！");
+            }
+
+
         }
       
     }

GcDevicePc/MDIBase.cs

@@ -233,7 +233,7 @@ namespace GcDevicePc
         /// <param name="e"></param>
         private void timer1_Tick(object sender, EventArgs e)
         {
-            this.Text = String.Format("VOCs在线监测-1.0.2.1   {0}",Formstr);
+            this.Text = String.Format("VOCs在线监测-1.0.2.2   {0}",Formstr);
             HmiStatus.Text = String.Format("状态：{0}", statestr);
 
             //  toolStripStatusLabeSystme.Text = String.Format("状态：{0}", statestr);