版本V1.6.7release

GcDevicePc/AboutForm.cs

@@ -42,7 +42,7 @@ namespace GcDevicePc
             this.fid1ver.Text = this.FID1version;
             this.fid2ver.Text = this.FID2version;
             this.tcdver.Text = this.TCD1version;
-            this.PCver.Text = this.Hmiversion + "/1.6.6";
+            this.PCver.Text = this.Hmiversion + "/1.6.7";
         }
     }
 }

GcDevicePc/MDIBase.Designer.cs

@@ -139,42 +139,42 @@
             // SystemStartMenu
             // 
             this.SystemStartMenu.Name = "SystemStartMenu";
-            this.SystemStartMenu.Size = new System.Drawing.Size(180, 26);
+            this.SystemStartMenu.Size = new System.Drawing.Size(144, 26);
             this.SystemStartMenu.Text = "系统开启";
             this.SystemStartMenu.Click += new System.EventHandler(this.SystemStartMenu_Click);
             // 
             // SystemStopMenu
             // 
             this.SystemStopMenu.Name = "SystemStopMenu";
-            this.SystemStopMenu.Size = new System.Drawing.Size(180, 26);
+            this.SystemStopMenu.Size = new System.Drawing.Size(144, 26);
             this.SystemStopMenu.Text = "系统关闭";
             this.SystemStopMenu.Click += new System.EventHandler(this.SystemStopMenu_Click);
             // 
             // AuxToolMenu
             // 
             this.AuxToolMenu.Name = "AuxToolMenu";
-            this.AuxToolMenu.Size = new System.Drawing.Size(180, 26);
+            this.AuxToolMenu.Size = new System.Drawing.Size(144, 26);
             this.AuxToolMenu.Text = "辅助工具";
             this.AuxToolMenu.Click += new System.EventHandler(this.AuxToolMenu_Click);
             // 
             // ParameterSettingMenu
             // 
             this.ParameterSettingMenu.Name = "ParameterSettingMenu";
-            this.ParameterSettingMenu.Size = new System.Drawing.Size(180, 26);
+            this.ParameterSettingMenu.Size = new System.Drawing.Size(144, 26);
             this.ParameterSettingMenu.Text = "参数设置";
             this.ParameterSettingMenu.Click += new System.EventHandler(this.ParameterSettingMenu_Click);
             // 
             // AutoAdjustMenu
             // 
             this.AutoAdjustMenu.Name = "AutoAdjustMenu";
-            this.AutoAdjustMenu.Size = new System.Drawing.Size(180, 26);
+            this.AutoAdjustMenu.Size = new System.Drawing.Size(144, 26);
             this.AutoAdjustMenu.Text = "系统校准";
             this.AutoAdjustMenu.Click += new System.EventHandler(this.自动校准ToolStripMenuItem_Click);
             // 
             // sysconfigp
             // 
             this.sysconfigp.Name = "sysconfigp";
-            this.sysconfigp.Size = new System.Drawing.Size(180, 26);
+            this.sysconfigp.Size = new System.Drawing.Size(144, 26);
             this.sysconfigp.Text = "选项";
             this.sysconfigp.Click += new System.EventHandler(this.系统配置ToolStripMenuItem_Click);
             // 
@@ -196,47 +196,47 @@
             // NetWorkMenu
             // 
             this.NetWorkMenu.Name = "NetWorkMenu";
-            this.NetWorkMenu.Size = new System.Drawing.Size(180, 26);
+            this.NetWorkMenu.Size = new System.Drawing.Size(144, 26);
             this.NetWorkMenu.Text = "通讯设置";
             this.NetWorkMenu.Click += new System.EventHandler(this.NetWorkMenu_Click);
             // 
             // MethodBatMenu
             // 
             this.MethodBatMenu.Name = "MethodBatMenu";
-            this.MethodBatMenu.Size = new System.Drawing.Size(180, 26);
+            this.MethodBatMenu.Size = new System.Drawing.Size(144, 26);
             this.MethodBatMenu.Text = "智能运行";
             this.MethodBatMenu.Click += new System.EventHandler(this.MethodBatMenu_Click);
             // 
             // NewMethodMenu
             // 
             this.NewMethodMenu.Name = "NewMethodMenu";
-            this.NewMethodMenu.Size = new System.Drawing.Size(180, 26);
+            this.NewMethodMenu.Size = new System.Drawing.Size(144, 26);
             this.NewMethodMenu.Text = "新建方法";
             this.NewMethodMenu.Click += new System.EventHandler(this.NewMethodMenu_Click);
             // 
             // OpenMethodMenu
             // 
             this.OpenMethodMenu.Name = "OpenMethodMenu";
-            this.OpenMethodMenu.Size = new System.Drawing.Size(180, 26);
+            this.OpenMethodMenu.Size = new System.Drawing.Size(144, 26);
             this.OpenMethodMenu.Text = "打开方法";
             this.OpenMethodMenu.Click += new System.EventHandler(this.OpenMethodMenu_Click);
             // 
             // MethodBrowseMenuItem
             // 
             this.MethodBrowseMenuItem.Name = "MethodBrowseMenuItem";
-            this.MethodBrowseMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.MethodBrowseMenuItem.Size = new System.Drawing.Size(144, 26);
             this.MethodBrowseMenuItem.Text = "方法查阅";
             this.MethodBrowseMenuItem.Click += new System.EventHandler(this.MethodBrowseMenuItem_Click);
             // 
             // SettingSeparator
             // 
             this.SettingSeparator.Name = "SettingSeparator";
-            this.SettingSeparator.Size = new System.Drawing.Size(177, 6);
+            this.SettingSeparator.Size = new System.Drawing.Size(141, 6);
             // 
             // GCConfigMenuItem
             // 
             this.GCConfigMenuItem.Name = "GCConfigMenuItem";
-            this.GCConfigMenuItem.Size = new System.Drawing.Size(180, 26);
+            this.GCConfigMenuItem.Size = new System.Drawing.Size(144, 26);
             this.GCConfigMenuItem.Text = "仪器配置";
             this.GCConfigMenuItem.Click += new System.EventHandler(this.ConfigCreateSubMenuItem_Click);
             // 

GcDevicePc/MDIBase.cs

@@ -677,7 +677,7 @@ namespace GcDevicePc
         /// 1.0.2.3  添加了周期完成后，重新绘图功能
         private void timer1_Tick(object sender, EventArgs e)
         {
-            this.Text = String.Format("{0}-1.6.6 {1}", globaldata.AppName,Formstr);
+            this.Text = String.Format("{0}-1.6.7 {1}", globaldata.AppName,Formstr);
 
             HmiStatus.Text = String.Format("状态：{0}", statestr);
 

GcDevicePc/RunTables.Designer.cs

@@ -122,7 +122,7 @@
             this.rdbox.Size = new System.Drawing.Size(30, 21);
             this.rdbox.TabIndex = 6;
             this.rdbox.TextChanged += new System.EventHandler(this.vInput_Integer_Limit_TextChange);
-            this.rdbox.MouseLeave  += new System.EventHandler(this.vInput_Limit_MouseLeave);
+            this.rdbox.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
             // 
             // label3
             // 
@@ -140,7 +140,7 @@
             this.rcbox.Size = new System.Drawing.Size(37, 21);
             this.rcbox.TabIndex = 4;
             this.rcbox.TextChanged += new System.EventHandler(this.vInput_Integer_Limit_TextChange);
-            this.rcbox.MouseLeave  += new System.EventHandler(this.vInput_Limit_MouseLeave);
+            this.rcbox.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
             // 
             // label2
             // 
@@ -158,7 +158,7 @@
             this.rtbox.Size = new System.Drawing.Size(28, 21);
             this.rtbox.TabIndex = 2;
             this.rtbox.TextChanged += new System.EventHandler(this.vInput_Integer_Limit_TextChange);
-            this.rtbox.MouseLeave  += new System.EventHandler(this.vInput_Limit_MouseLeave);
+            this.rtbox.MouseLeave += new System.EventHandler(this.vInput_Limit_MouseLeave);
             // 
             // label1
             // 
@@ -344,7 +344,6 @@
             this.Name = "RunTables";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "批处理设置";
-            this.TopMost = true;
             this.Load += new System.EventHandler(this.RunTables_Load);
             this.groupBox1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.LocalMethodView)).EndInit();

GcDevicePc/RunTables.cs

@@ -625,7 +625,8 @@ namespace GcDevicePc
         private void tabrun_Click(object sender, EventArgs e)
         {
             this.tabrun.Enabled = false;
-            Thread.Sleep(1000);
+          
+            //Thread.Sleep(1000);
             if (!File.Exists(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab))
             {
                 StreamWriter sw = new StreamWriter(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab, false, System.Text.Encoding.Unicode);
@@ -685,7 +686,7 @@ namespace GcDevicePc
 
             //string message = "运行表保存成功";
             //MessageBox.Show(message, "提示信息", MessageBoxButtons.OK, MessageBoxIcon.Information);
-
+            this.Close();
 
             if ( !String.IsNullOrEmpty(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab)  &&  !String.IsNullOrEmpty(globaldata.connection_ip))
             {
@@ -693,7 +694,6 @@ namespace GcDevicePc
                 globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.RunType = 2;
                 globaldata.m_pcbuffer.gcpcinfo.pcworkinfo.work_Statue = 0;
 
-
                 if (File.Exists(globaldata.m_pcbuffer.gcpcinfo.pcfileinfo.config_RunTab))
                 {
                     FileServerClient bfclient = new FileServerClient();
@@ -707,9 +707,9 @@ namespace GcDevicePc
                
                 sendupdatecmd(false);
             }
-            this.tabrun.Enabled = true;
+            this.tabrun.Enabled = true;  
+            //this.Close();
 
-            this.Close();
         }
 
         private void rtsave_Click(object sender, EventArgs e)

GcDevicePc/UserConfig.cs

@@ -167,6 +167,7 @@ namespace GcDevicePc
 
             try
             {
+
                 NetworkInterface[] port = NetworkInterface.GetAllNetworkInterfaces();
                 foreach (NetworkInterface adapter in port)
                 {

VocsSetup/GC_Config/GC_DataPro/ExteCfg.config

@@ -12,9 +12,12 @@
       <systemtype>0</systemtype>
       <spacesize>500</spacesize>
       <spacetimes>3</spacetimes>
-      <cyname>RunMethod.ini</cyname>
-      <zeroname>RunMethod.ini</zeroname>
-      <bqname>RunMethod.ini</bqname>
+      <cyname>
+      </cyname>
+      <zeroname>
+      </zeroname>
+      <bqname>
+      </bqname>
       <RSD>3</RSD>
       <MethodType>1</MethodType>
       <AutoTimes>30</AutoTimes>

VocsSetup/GC_Config/GC_Set/tmpfile/1/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/仪器方法/色谱001/32du.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器方法/色谱001/SingleAnal.ini

 [方法名称]

VocsSetup/GC_Config/GC_Set/仪器状态/色谱001/DevStatus.ini

 [仪器编号]

VocsSetup/GC_Config/GC_Set/运行表/色谱001/RunMethod.ini

 [Bat]

VocsSetup/GC_Control/VisionLogs.txt

-软件版本更新日志V1.5.9更新到V1.6.1
-本次更新包括HMI V3.4更新到V3.5
-•	补充温控保护逻辑，应对更多可能会出现的故障
-•	修改了单位转换问题（更多功能须获得超级管理权限）
-•	用户可在外部校准界面，通过选定单位来完成切换，它会影响的地方有：
-•	用户界面浓度单位
-•	外部校准界面单位
-•	上位机传输默认单位ppm（若需要更改请联系厂家）
-•	外部校准显示单位
-•	优化状态切换
-•	现在切换状态进度条结束前，新加的状态切换无效，避免频繁切换导致卡顿等异常状态；状态切换使用过程中约有1S延迟，为正常现象
-•	新增历史谱图实时刷新按钮
-•	修改批处理（智能运行）的updata，点击后会如实保存参数设定（以前是不点击启动运行，即使点击updata也不会保存参数设定），并反馈成功
-•	软件默认绑定网络连接名称为“本地连接”，在用户更改为“网桥”后，请到“通讯设置”进行对应修改，否则无法正常联机

VocsSetup/GC_User/操作日志/OperLog/OperLog.txt

@@ -332,3 +332,106 @@
 【2020-01-08 17:14:18.1170】,服务器开始启动：192.168.1.217:12345
 【2020-01-08 17:14:27.2107】,用户admin，进入调试模式
 【2020-01-08 17:15:18.4159】,注销登录，进入用户模式
+【2020-01-09 10:40:04.4633】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 10:40:11.2133】,用户admin，进入调试模式
+【2020-01-09 10:40:15.0032】,服务器重启：
+【2020-01-09 10:42:02.7497】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 10:42:09.4149】,服务器重启：
+【2020-01-09 10:42:26.1501】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 10:42:46.6044】,服务器重启：
+【2020-01-09 13:03:08.9829】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 13:03:14.2489】,用户admin，进入调试模式
+【2020-01-09 13:11:15.8501】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 13:11:21.3155】,用户admin，进入调试模式
+【2020-01-09 13:32:54.3028】,注销登录，进入用户模式
+【2020-01-09 13:32:58.2911】,用户admin，进入调试模式
+【2020-01-09 13:52:18.8971】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 13:52:23.9875】,用户admin，进入调试模式
+【2020-01-09 13:53:30.8842】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 13:53:37.2692】,用户admin，进入调试模式
+【2020-01-09 14:04:11.2205】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:04:16.4555】,用户admin，进入调试模式
+【2020-01-09 14:15:10.2377】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:15:15.5984】,用户admin，进入调试模式
+【2020-01-09 14:22:16.0693】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:35:56.7167】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:36:02.7705】,用户admin，进入调试模式
+【2020-01-09 14:44:48.1684】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:44:54.3639】,用户admin，进入调试模式
+【2020-01-09 14:47:56.1783】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:48:01.2756】,用户admin，进入调试模式
+【2020-01-09 14:54:51.1189】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:56:17.0515】,用户admin，进入调试模式
+【2020-01-09 14:59:14.7893】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 14:59:21.2620】,用户admin，进入调试模式
+【2020-01-09 15:00:32.4397】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 15:00:42.3258】,用户admin，进入调试模式
+【2020-01-09 15:00:55.5794】,84492436
+【2020-01-09 15:01:15.5715】,A开始保存数据
+【2020-01-09 15:01:15.5965】,True
+【2020-01-09 15:01:15.6224】,A保存
+【2020-01-09 15:01:15.6703】,True
+【2020-01-09 15:01:15.6812】,A保存
+【2020-01-09 15:01:17.7487】,84514744
+【2020-01-09 15:03:50.7259】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 15:04:01.8936】,用户admin，进入调试模式
+【2020-01-09 15:04:53.3596】,84729358
+【2020-01-09 15:05:07.9346】,A开始保存数据
+【2020-01-09 15:05:08.0064】,A保存
+【2020-01-09 15:05:08.0473】,True
+【2020-01-09 15:05:08.0583】,A保存
+【2020-01-09 15:05:14.1350】,84750669
+【2020-01-09 15:05:20.6187】,A开始保存数据
+【2020-01-09 15:05:20.6297】,True
+【2020-01-09 15:05:20.6456】,A保存
+【2020-01-09 15:05:25.2952】,84762109
+【2020-01-09 15:05:49.0936】,A开始保存数据
+【2020-01-09 15:05:49.1045】,True
+【2020-01-09 15:05:49.1205】,A保存
+【2020-01-09 15:07:15.1595】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 15:07:16.2755】,84811873
+【2020-01-09 15:07:17.2947】,A开始保存数据
+【2020-01-09 15:07:17.3107】,True
+【2020-01-09 15:07:17.3277】,A保存
+【2020-01-09 15:07:17.3626】,True
+【2020-01-09 15:07:17.3735】,A保存
+【2020-01-09 15:07:24.7384】,用户admin，进入调试模式
+【2020-01-09 15:08:44.7426】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 15:08:52.7622】,用户admin，进入调试模式
+【2020-01-09 15:10:44.8550】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 15:10:50.5618】,用户admin，进入调试模式
+【2020-01-09 15:13:10.9930】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 15:13:16.5262】,用户admin，进入调试模式
+【2020-01-09 15:16:11.0531】,服务器开始启动：192.168.1.217:12345
+【2020-01-09 15:16:16.7793】,用户admin，进入调试模式
+【2020-01-09 15:41:45.6616】,86941220
+【2020-01-09 15:41:52.1253】,A开始保存数据
+【2020-01-09 15:41:52.1412】,True
+【2020-01-09 15:41:52.1652】,A保存
+【2020-01-09 15:41:52.2090】,True
+【2020-01-09 15:41:52.2200】,A保存
+【2020-01-09 15:57:19.8027】,87876493
+【2020-01-09 15:57:47.7150】,A开始保存数据
+【2020-01-09 15:57:47.7260】,True
+【2020-01-09 15:57:47.7490】,A保存
+【2020-01-09 15:57:52.9271】,87909534
+【2020-01-09 15:58:25.9937】,注销登录，进入用户模式
+【2020-01-09 15:58:37.7233】,用户admin，进入调试模式
+【2020-01-09 16:07:53.7919】,A开始保存数据
+【2020-01-09 16:07:53.8028】,True
+【2020-01-09 16:07:53.8347】,A保存
+【2020-01-09 16:07:59.0588】,88515833
+【2020-01-09 16:08:26.0257】,服务器重启：
+【2020-03-23 14:39:25.9994】,服务器开始启动：192.168.31.61:12345
+【2020-03-23 14:39:45.0554】,用户admin，进入调试模式
+【2020-03-23 14:53:23.8043】,服务器开始启动：192.168.31.61:12345
+【2020-03-23 14:53:29.2727】,用户admin，进入调试模式
+【2020-03-23 14:56:45.7992】,服务器开始启动：192.168.31.61:12345
+【2020-03-23 14:56:52.1004】,用户admin，进入调试模式
+【2020-03-23 15:05:55.8602】,服务器开始启动：192.168.31.61:12345
+【2020-03-23 15:29:02.9740】,服务器开始启动：192.168.31.61:12345
+【2020-03-23 15:29:08.5501】,用户admin，进入调试模式
+【2020-03-23 15:35:13.3770】,注销登录，进入用户模式
+【2020-03-23 15:35:48.9040】,用户admin，进入调试模式
+【2020-03-23 16:28:03.5063】,服务器开始启动：192.168.31.61:12345
+【2020-03-23 17:14:11.6116】,用户admin，进入调试模式