Skip to content

G
GC_Branch
Commit c63f3f9f authored by leon.huang's avatar leon.huang
Browse files
Options

version1.6.8 添加SPL进样显示保护温度

parent 17765e81
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 5 deletions
GcDevicePc/ConfigMethod/injectionport/IPPIP.Designer.cs
View file @ c63f3f9f
...@@ -250,8 +250,8 @@ ...@@ -250,8 +250,8 @@
this.textBox1.Name = "textBox1"; this.textBox1.Name = "textBox1";
this.textBox1.Size = new System.Drawing.Size(100, 17); this.textBox1.Size = new System.Drawing.Size(100, 17);
this.textBox1.TabIndex = 4; this.textBox1.TabIndex = 4;
this.textBox1.MouseLeave += new System.EventHandler(this. vInput_Limit_MouseLeave); //this.textBox1.MouseLeave += new System.EventHandler(this. vInput_Limit_MouseLeave);
this.textBox1.TextChanged += new System.EventHandler(this.vInput_Limit_TextChange); //this.textBox1.TextChanged += new System.EventHandler(this.vInput_Limit_TextChange);
// //
// label5 // label5
// //
......
GcDevicePc/ConfigMethod/injectionport/IPPIP.cs
View file @ c63f3f9f
...@@ -25,7 +25,7 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -25,7 +25,7 @@ namespace GcDevicePc.ConfigMethod.injectionport
this.methodconfig = methodconfig; this.methodconfig = methodconfig;
} }
int configTemp; int configTemp = 0;
public void reflashContent(int index) public void reflashContent(int index)
{ {
......
GcDevicePc/ConfigMethod/injectionport/IPSPL.Designer.cs
View file @ c63f3f9f
...@@ -62,6 +62,8 @@ ...@@ -62,6 +62,8 @@
this.label19 = new System.Windows.Forms.Label(); this.label19 = new System.Windows.Forms.Label();
this.label20 = new System.Windows.Forms.Label(); this.label20 = new System.Windows.Forms.Label();
this.label21 = new System.Windows.Forms.Label(); this.label21 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.ProtectTemperatureTextBox1 = new System.Windows.Forms.TextBox();
this.groupBox1.SuspendLayout(); this.groupBox1.SuspendLayout();
this.SuspendLayout(); this.SuspendLayout();
// //
...@@ -385,12 +387,31 @@ ...@@ -385,12 +387,31 @@
this.label21.TabIndex = 27; this.label21.TabIndex = 27;
this.label21.Text = "ml"; this.label21.Text = "ml";
// //
// label2
//
this.label2.AutoSize = true;
this.label2.Location = new System.Drawing.Point(276, 18);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(65, 12);
this.label2.TabIndex = 28;
this.label2.Text = "保护温度：";
//
// ProtectTemperatureTextBox1
//
this.ProtectTemperatureTextBox1.Location = new System.Drawing.Point(343, 12);
this.ProtectTemperatureTextBox1.Name = "ProtectTemperatureTextBox1";
this.ProtectTemperatureTextBox1.ReadOnly = true;
this.ProtectTemperatureTextBox1.Size = new System.Drawing.Size(121, 21);
this.ProtectTemperatureTextBox1.TabIndex = 29;
//
// IPSPL // IPSPL
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.Color.White; this.BackColor = System.Drawing.Color.White;
this.ClientSize = new System.Drawing.Size(592, 332); this.ClientSize = new System.Drawing.Size(592, 332);
this.Controls.Add(this.ProtectTemperatureTextBox1);
this.Controls.Add(this.label2);
this.Controls.Add(this.label21); this.Controls.Add(this.label21);
this.Controls.Add(this.label20); this.Controls.Add(this.label20);
this.Controls.Add(this.label19); this.Controls.Add(this.label19);
...@@ -414,6 +435,7 @@ ...@@ -414,6 +435,7 @@
this.Controls.Add(this.label4); this.Controls.Add(this.label4);
this.Controls.Add(this.lblSamplePortType); this.Controls.Add(this.lblSamplePortType);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
this.Enabled = false;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None; this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
this.Name = "IPSPL"; this.Name = "IPSPL";
this.Text = "IPSPL"; this.Text = "IPSPL";
...@@ -460,5 +482,7 @@ ...@@ -460,5 +482,7 @@
private System.Windows.Forms.Label label19; private System.Windows.Forms.Label label19;
private System.Windows.Forms.Label label20; private System.Windows.Forms.Label label20;
private System.Windows.Forms.Label label21; private System.Windows.Forms.Label label21;
private System.Windows.Forms.Label label2;
private System.Windows.Forms.TextBox ProtectTemperatureTextBox1;
} }
} }
\ No newline at end of file
GcDevicePc/ConfigMethod/injectionport/IPSPL.cs
View file @ c63f3f9f
...@@ -71,7 +71,19 @@ namespace GcDevicePc.ConfigMethod.injectionport ...@@ -71,7 +71,19 @@ namespace GcDevicePc.ConfigMethod.injectionport
txtShuntRatio.Text = this.methodconfig.port[index].splShuntRatio.ToString(); txtShuntRatio.Text = this.methodconfig.port[index].splShuntRatio.ToString();
txtShuntFlow.Text = this.methodconfig.port[index].splShuntFlow.ToString(); txtShuntFlow.Text = this.methodconfig.port[index].splShuntFlow.ToString();
txtSaveAmount.Text = this.methodconfig.port[index].splSaveAmount.ToString(); txtSaveAmount.Text = this.methodconfig.port[index].splSaveAmount.ToString();
int configTemp = 0;
switch (index)
{
case 0:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16InjPortFPTemp;
break;
case 1:
configTemp = globaldata.m_hwconfig.hwconfiginfo.u16InjPortBPTemp;
break;
default:
break;
}
ProtectTemperatureTextBox1.Text = configTemp.ToString();
} }
float string2float(string s) float string2float(string s)
......
VocsSetup/GC_Config/GC_Set/tmpfile/11/DevStatus.ini 0 → 100644
View file @ c63f3f9f
B[仪器编号] B[仪器编号]
VocsSetup/GC_Config/GC_Set/tmpfile/184/DevStatus.ini 0 → 100644
View file @ c63f3f9f
B[仪器编号] B[仪器编号]
VocsSetup/GC_Config/GC_Set/tmpfile/2/DevStatus.ini 0 → 100644
View file @ c63f3f9f
B[仪器编号] B[仪器编号]
VocsSetup/GC_Config/GC_Set/启动参数/startup.ini
View file @ c63f3f9f
[NetWorkConfig] [NetWorkConfig]
MAC地址=F8:02:78:60:0F:40 MAC地址=F8:02:78:60:70:9F
网口= 网口=
是否只搜索在线=NO 是否只搜索在线=NO
[StartUp] [StartUp]
......
VocsSetup/GC_User/操作日志/ErrLog/ErrLog_20200331144338.txt 0 → 100644
View file @ c63f3f9f
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/操作日志/ErrLog/ErrLog_20200331160441.txt 0 → 100644
View file @ c63f3f9f
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/操作日志/ErrLog/ErrLog_20200409165928.txt 0 → 100644
View file @ c63f3f9f
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/操作日志/ErrLog/ErrLog_20200409190425.txt 0 → 100644
View file @ c63f3f9f
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/操作日志/ErrLog/ErrLog_20200409193415.txt 0 → 100644
View file @ c63f3f9f
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/操作日志/ErrLog/ErrLog_20200410164143.txt 0 → 100644
View file @ c63f3f9f
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/操作日志/ErrLog/ErrLog_20200410170503.txt 0 → 100644
View file @ c63f3f9f
This source diff could not be displayed because it is too large. You can view the blob instead.
VocsSetup/GC_User/操作日志/OperLog/OperLog.txt
View file @ c63f3f9f
...@@ -649,3 +649,54 @@ ...@@ -649,3 +649,54 @@
【2020-03-31 14:10:53.3562】,服务器重启： 【2020-03-31 14:10:53.3562】,服务器重启：
【2020-03-31 14:11:21.8849】,服务器开始启动：169.254.9.7:12345 【2020-03-31 14:11:21.8849】,服务器开始启动：169.254.9.7:12345
【2020-03-31 14:18:00.3046】,服务器重启： 【2020-03-31 14:18:00.3046】,服务器重启：
【2020-03-31 14:37:57.0186】,服务器开始启动：169.254.9.7:12345
【2020-03-31 15:49:34.3466】,服务器开始启动：169.254.9.7:12345
【2020-03-31 16:01:16.1809】,服务器开始启动：169.254.9.7:12345
【2020-03-31 16:04:03.9115】,服务器开始启动：169.254.9.7:12345
【2020-04-09 16:17:18.3661】,服务器开始启动：169.254.9.7:12345
【2020-04-09 16:19:24.2326】,服务器开始启动：169.254.9.7:12345
【2020-04-09 16:22:06.0726】,服务器重启：
【2020-04-09 16:27:18.3148】,服务器开始启动：169.254.9.97:12345
【2020-04-09 16:34:39.5038】,服务器开始启动：169.254.9.97:12345
【2020-04-09 16:35:30.0080】,服务器开始启动：169.254.9.97:12345
【2020-04-09 16:35:47.1458】,服务器重启：
【2020-04-09 16:42:24.7347】,服务器开始启动：169.254.21.31:12345
【2020-04-09 16:42:56.2810】,服务器重启：
【2020-04-09 16:42:58.2926】,服务器开始启动：169.254.21.31:12345
【2020-04-09 16:44:02.1795】,服务器开始启动：169.254.21.31:12345
【2020-04-09 16:45:00.2058】,服务器开始启动：169.254.21.31:12345
【2020-04-09 16:45:08.6345】,服务器重启：
【2020-04-09 16:46:11.2208】,服务器开始启动：192.168.10.230:12345
【2020-04-09 16:47:06.4817】,服务器重启：
【2020-04-09 16:48:21.6387】,服务器开始启动：169.254.9.97:12345
【2020-04-09 16:53:25.4777】,服务器重启：
【2020-04-09 16:56:28.6375】,服务器开始启动：169.254.9.97:12345
【2020-04-09 17:03:16.0267】,服务器重启：
【2020-04-09 17:03:44.1871】,服务器开始启动：169.254.9.97:12345
【2020-04-09 17:08:54.9304】,服务器重启：
【2020-04-09 17:09:23.8363】,服务器开始启动：169.254.9.97:12345
【2020-04-09 17:12:03.4398】,服务器开始启动：169.254.9.97:12345
【2020-04-09 17:13:06.8060】,服务器重启：
【2020-04-09 18:42:32.3321】,服务器开始启动：169.254.9.97:12345
【2020-04-09 18:43:39.3018】,服务器重启：
【2020-04-09 18:55:45.9095】,服务器开始启动：169.254.9.97:12345
【2020-04-09 18:56:34.2648】,服务器重启：
【2020-04-09 18:58:19.2226】,服务器开始启动：169.254.9.97:12345
【2020-04-09 19:19:19.7899】,服务器重启：
【2020-04-09 19:22:40.2949】,服务器开始启动：169.254.9.97:12345
【2020-04-09 19:23:16.6449】,服务器重启：
【2020-04-09 19:25:59.9411】,服务器开始启动：169.254.21.31:12345
【2020-04-09 19:32:17.0932】,服务器开始启动：169.254.21.31:12345
【2020-04-09 19:33:39.7217】,服务器开始启动：169.254.21.31:12345
【2020-04-09 19:35:56.0377】,服务器重启：
【2020-04-09 19:36:47.1195】,服务器开始启动：169.254.21.31:12345
【2020-04-09 19:47:37.1422】,服务器重启：
【2020-04-09 19:50:04.3687】,服务器开始启动：169.254.21.31:12345
【2020-04-09 19:51:17.3407】,服务器重启：
【2020-04-09 20:41:06.9954】,服务器开始启动：169.254.21.31:12345
【2020-04-09 20:42:44.7317】,服务器开始启动：169.254.21.31:12345
【2020-04-09 20:43:03.3674】,服务器重启：
【2020-04-09 20:45:07.5862】,服务器开始启动：169.254.21.31:12345
【2020-04-09 20:45:17.5166】,服务器重启：
【2020-04-10 16:36:20.1630】,服务器开始启动：169.254.21.31:12345
【2020-04-10 16:45:52.1213】,服务器开始启动：169.254.21.31:12345
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment