diff --git a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/FileContentIndex/55c3a27f-5983-4b53-8202-156eaca7065d.vsidx b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/FileContentIndex/7f6353d5-68ce-4bff-b702-f405f6c10038.vsidx similarity index 58% rename from ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/FileContentIndex/55c3a27f-5983-4b53-8202-156eaca7065d.vsidx rename to ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/FileContentIndex/7f6353d5-68ce-4bff-b702-f405f6c10038.vsidx index 39da713..a3c0be9 100644 Binary files a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/FileContentIndex/55c3a27f-5983-4b53-8202-156eaca7065d.vsidx and b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/FileContentIndex/7f6353d5-68ce-4bff-b702-f405f6c10038.vsidx differ diff --git a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/v17/.suo b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/v17/.suo index 7ea7a75..8600b51 100644 Binary files a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/v17/.suo and b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/.vs/ZTTMS_Manage_SYSHS_20210318/v17/.suo differ diff --git a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Domain.cs b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Domain.cs index fff71d8..a97b382 100644 --- a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Domain.cs +++ b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Domain.cs @@ -47,6 +47,10 @@ namespace ZTTMS_Manage_SYSHS_20210318 public float Ground_48 { get; set; } public float Ground_24 { get; set; } public float Ground_12 { get; set; } + + public float Vol_48_in { get; set; } + public float Vol_24_in { get; set; } + public float Vol_12_in { get; set; } } diff --git a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.Designer.cs b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.Designer.cs index a72c805..4839b0e 100644 --- a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.Designer.cs +++ b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.Designer.cs @@ -173,9 +173,9 @@ namespace ZTTMS_Manage_SYSHS_20210318 this.label_shape_tem1_1_1 = new System.Windows.Forms.Label(); this.Cur_12_in = new System.Windows.Forms.Label(); this.Cur_24_in = new System.Windows.Forms.Label(); - this.label177 = new System.Windows.Forms.Label(); - this.label176 = new System.Windows.Forms.Label(); - this.label8 = new System.Windows.Forms.Label(); + this.Vol_12_in = new System.Windows.Forms.Label(); + this.Vol_24_in = new System.Windows.Forms.Label(); + this.Vol_48_in = new System.Windows.Forms.Label(); this.label80 = new System.Windows.Forms.Label(); this.label79 = new System.Windows.Forms.Label(); this.label78 = new System.Windows.Forms.Label(); @@ -364,6 +364,8 @@ namespace ZTTMS_Manage_SYSHS_20210318 this.tabPage3 = new System.Windows.Forms.TabPage(); this.button2 = new System.Windows.Forms.Button(); this.groupBox11 = new System.Windows.Forms.GroupBox(); + this.label230 = new System.Windows.Forms.Label(); + this.label231 = new System.Windows.Forms.Label(); this.label228 = new System.Windows.Forms.Label(); this.label226 = new System.Windows.Forms.Label(); this.label229 = new System.Windows.Forms.Label(); @@ -577,8 +579,6 @@ namespace ZTTMS_Manage_SYSHS_20210318 this.label171 = new System.Windows.Forms.Label(); this.timer1 = new System.Windows.Forms.Timer(this.components); this.button12 = new System.Windows.Forms.Button(); - this.label230 = new System.Windows.Forms.Label(); - this.label231 = new System.Windows.Forms.Label(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.groupBox3.SuspendLayout(); @@ -2158,9 +2158,9 @@ namespace ZTTMS_Manage_SYSHS_20210318 this.groupBox2.Controls.Add(this.label_shape_tem1_1_1); this.groupBox2.Controls.Add(this.Cur_12_in); this.groupBox2.Controls.Add(this.Cur_24_in); - this.groupBox2.Controls.Add(this.label177); - this.groupBox2.Controls.Add(this.label176); - this.groupBox2.Controls.Add(this.label8); + this.groupBox2.Controls.Add(this.Vol_12_in); + this.groupBox2.Controls.Add(this.Vol_24_in); + this.groupBox2.Controls.Add(this.Vol_48_in); this.groupBox2.Controls.Add(this.label80); this.groupBox2.Controls.Add(this.label79); this.groupBox2.Controls.Add(this.label78); @@ -2387,41 +2387,41 @@ namespace ZTTMS_Manage_SYSHS_20210318 this.Cur_24_in.Text = "0.00"; this.Cur_24_in.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // label177 + // Vol_12_in // - this.label177.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); - this.label177.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label177.ForeColor = System.Drawing.Color.White; - this.label177.Location = new System.Drawing.Point(535, 220); - this.label177.Name = "label177"; - this.label177.Size = new System.Drawing.Size(128, 39); - this.label177.TabIndex = 49; - this.label177.Text = "12.08"; - this.label177.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Vol_12_in.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); + this.Vol_12_in.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Vol_12_in.ForeColor = System.Drawing.Color.White; + this.Vol_12_in.Location = new System.Drawing.Point(535, 220); + this.Vol_12_in.Name = "Vol_12_in"; + this.Vol_12_in.Size = new System.Drawing.Size(128, 39); + this.Vol_12_in.TabIndex = 49; + this.Vol_12_in.Text = "12.08"; + this.Vol_12_in.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // label176 + // Vol_24_in // - this.label176.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); - this.label176.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label176.ForeColor = System.Drawing.Color.White; - this.label176.Location = new System.Drawing.Point(535, 155); - this.label176.Name = "label176"; - this.label176.Size = new System.Drawing.Size(128, 39); - this.label176.TabIndex = 48; - this.label176.Text = "24.07"; - this.label176.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Vol_24_in.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); + this.Vol_24_in.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Vol_24_in.ForeColor = System.Drawing.Color.White; + this.Vol_24_in.Location = new System.Drawing.Point(535, 155); + this.Vol_24_in.Name = "Vol_24_in"; + this.Vol_24_in.Size = new System.Drawing.Size(128, 39); + this.Vol_24_in.TabIndex = 48; + this.Vol_24_in.Text = "24.07"; + this.Vol_24_in.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // - // label8 + // Vol_48_in // - this.label8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); - this.label8.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.label8.ForeColor = System.Drawing.Color.White; - this.label8.Location = new System.Drawing.Point(535, 90); - this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(128, 39); - this.label8.TabIndex = 47; - this.label8.Text = "48.02"; - this.label8.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; + this.Vol_48_in.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127))))); + this.Vol_48_in.Font = new System.Drawing.Font("微软雅黑", 21.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Vol_48_in.ForeColor = System.Drawing.Color.White; + this.Vol_48_in.Location = new System.Drawing.Point(535, 90); + this.Vol_48_in.Name = "Vol_48_in"; + this.Vol_48_in.Size = new System.Drawing.Size(128, 39); + this.Vol_48_in.TabIndex = 47; + this.Vol_48_in.Text = "48.02"; + this.Vol_48_in.TextAlign = System.Drawing.ContentAlignment.MiddleCenter; // // label80 // @@ -4811,6 +4811,24 @@ namespace ZTTMS_Manage_SYSHS_20210318 this.groupBox11.TabStop = false; this.groupBox11.Text = "全息显微成像测量系统"; // + // label230 + // + this.label230.AutoSize = true; + this.label230.Location = new System.Drawing.Point(97, 43); + this.label230.Name = "label230"; + this.label230.Size = new System.Drawing.Size(68, 19); + this.label230.TabIndex = 97; + this.label230.Text = "0.00℃"; + // + // label231 + // + this.label231.AutoSize = true; + this.label231.Location = new System.Drawing.Point(28, 43); + this.label231.Name = "label231"; + this.label231.Size = new System.Drawing.Size(66, 19); + this.label231.TabIndex = 96; + this.label231.Text = "温度："; + // // label228 // this.label228.AutoSize = true; @@ -6987,24 +7005,6 @@ namespace ZTTMS_Manage_SYSHS_20210318 this.button12.UseVisualStyleBackColor = true; this.button12.Click += new System.EventHandler(this.button12_Click); // - // label230 - // - this.label230.AutoSize = true; - this.label230.Location = new System.Drawing.Point(97, 43); - this.label230.Name = "label230"; - this.label230.Size = new System.Drawing.Size(68, 19); - this.label230.TabIndex = 97; - this.label230.Text = "0.00℃"; - // - // label231 - // - this.label231.AutoSize = true; - this.label231.Location = new System.Drawing.Point(28, 43); - this.label231.Name = "label231"; - this.label231.Size = new System.Drawing.Size(66, 19); - this.label231.TabIndex = 96; - this.label231.Text = "温度："; - // // Main // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -7391,9 +7391,9 @@ namespace ZTTMS_Manage_SYSHS_20210318 private System.Windows.Forms.Label label76; private System.Windows.Forms.Label Cur_12_in; private System.Windows.Forms.Label Cur_24_in; - private System.Windows.Forms.Label label177; - private System.Windows.Forms.Label label176; - private System.Windows.Forms.Label label8; + private System.Windows.Forms.Label Vol_12_in; + private System.Windows.Forms.Label Vol_24_in; + private System.Windows.Forms.Label Vol_48_in; private System.Windows.Forms.ComboBox comboBox1; private System.Windows.Forms.Label label181; private System.Windows.Forms.ComboBox comboBox2; diff --git a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.cs b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.cs index ae42ac4..ff4e9db 100644 --- a/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.cs +++ b/ZTTMS_Manage_SYSHS_20210817_20230314/ZTTMS_Manage_SYSHS_20210817/Main.cs @@ -725,7 +725,9 @@ namespace ZTTMS_Manage_SYSHS_20210318 Ground_48V.Text = Ground_48_ZH.ToString("0.00"); Ground_24V.Text = Ground_24_ZH.ToString("0.00"); Ground_12V.Text = Ground_12_ZH.ToString("0.00"); - + Vol_48_in.Text = environment.Vol_48_in.ToString("0.00"); + Vol_24_in.Text = environment.Vol_24_in.ToString("0.00"); + Vol_12_in.Text = environment.Vol_12_in.ToString("0.00"); bt_enable_24_1.Text = flash(digital.Enable24_1); bt_enable_24_2.Text = flash(digital.Enable24_2); bt_enable_12_1.Text = flash(digital.Enable12_1);