From c5f24fea912fad2ce1f1216541893cc1ffd8421d Mon Sep 17 00:00:00 2001 From: Administrator Date: Mon, 31 Aug 2026 14:58:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/MaterialFrameRuleService.cs | 8 +- .../Service/WorkshopInterCfgService.cs | 8 +- LargeSquareOne/FrmInterCfg.Designer.cs | 111 ++++++----- LargeSquareOne/FrmInterCfg.cs | 8 +- LargeSquareOne/FrmMain.cs | 2 +- LargeSquareOne/FrmParamSet.Designer.cs | 186 +++++++++--------- LargeSquareOne/FrmParamSet.resx | 92 +++++---- 7 files changed, 205 insertions(+), 210 deletions(-) diff --git a/JinYuan.DAL/Service/MaterialFrameRuleService.cs b/JinYuan.DAL/Service/MaterialFrameRuleService.cs index 422fe02..0567ab7 100644 --- a/JinYuan.DAL/Service/MaterialFrameRuleService.cs +++ b/JinYuan.DAL/Service/MaterialFrameRuleService.cs @@ -58,10 +58,10 @@ namespace JinYuan.DAL.Service && x.Start_Code == model.Start_Code && !x.Is_Deleted) .Any(); - if (isExist) - { - return false; - } + //if (isExist) + //{ + // return false; + //} return base.Update(model); } diff --git a/JinYuan.DAL/Service/WorkshopInterCfgService.cs b/JinYuan.DAL/Service/WorkshopInterCfgService.cs index c10666e..88a1a7b 100644 --- a/JinYuan.DAL/Service/WorkshopInterCfgService.cs +++ b/JinYuan.DAL/Service/WorkshopInterCfgService.cs @@ -58,10 +58,10 @@ namespace JinYuan.DAL.Service bool isExist = _db.Queryable() .Where(x => x.Workshop_Code == model.Workshop_Code && x.Interface_Flag == model.Interface_Flag && !x.Is_Deleted) .Any(); - if (isExist) - { - return false; - } + //if (isExist) + //{ + // return false; + //} return base.Update(model); } diff --git a/LargeSquareOne/FrmInterCfg.Designer.cs b/LargeSquareOne/FrmInterCfg.Designer.cs index c9f7d61..ade7ffd 100644 --- a/LargeSquareOne/FrmInterCfg.Designer.cs +++ b/LargeSquareOne/FrmInterCfg.Designer.cs @@ -29,12 +29,12 @@ private void InitializeComponent() { this.components = new System.ComponentModel.Container(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); this.panelEnhanced1 = new System.Windows.Forms.Panel(); this.panel_mid = new System.Windows.Forms.Panel(); this.btn_interSave = new System.Windows.Forms.Button(); @@ -138,37 +138,37 @@ this.dgv_workInterface.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); this.dgv_workInterface.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgv_workInterface.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgv_workInterface.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgv_workInterface.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dgv_workInterface.ColumnHeadersHeight = 29; this.dgv_workInterface.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); - dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgv_workInterface.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgv_workInterface.DefaultCellStyle = dataGridViewCellStyle2; this.dgv_workInterface.EnableHeadersVisualStyles = false; this.dgv_workInterface.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); this.dgv_workInterface.Location = new System.Drawing.Point(29, 47); this.dgv_workInterface.Name = "dgv_workInterface"; this.dgv_workInterface.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgv_workInterface.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgv_workInterface.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dgv_workInterface.RowHeadersWidth = 51; this.dgv_workInterface.RowTemplate.Height = 27; this.dgv_workInterface.Size = new System.Drawing.Size(942, 269); @@ -207,7 +207,6 @@ this.btn_test.TabIndex = 5; this.btn_test.Text = "For Test"; this.btn_test.UseVisualStyleBackColor = false; - this.btn_test.Visible = false; this.btn_test.Click += new System.EventHandler(this.btn_test_Click); // // btn_exit @@ -297,37 +296,37 @@ this.dgv_materialRul.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); this.dgv_materialRul.BorderStyle = System.Windows.Forms.BorderStyle.None; this.dgv_materialRul.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgv_materialRul.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgv_materialRul.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgv_materialRul.ColumnHeadersHeight = 29; this.dgv_materialRul.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); - dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgv_materialRul.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(11)))), ((int)(((byte)(20)))), ((int)(((byte)(36))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgv_materialRul.DefaultCellStyle = dataGridViewCellStyle5; this.dgv_materialRul.EnableHeadersVisualStyles = false; this.dgv_materialRul.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); this.dgv_materialRul.Location = new System.Drawing.Point(29, 51); this.dgv_materialRul.Name = "dgv_materialRul"; this.dgv_materialRul.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.Color.White; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgv_materialRul.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(30)))), ((int)(((byte)(20)))), ((int)(((byte)(80))))); + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.Color.White; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgv_materialRul.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgv_materialRul.RowHeadersWidth = 51; this.dgv_materialRul.RowTemplate.Height = 27; this.dgv_materialRul.Size = new System.Drawing.Size(731, 245); @@ -335,7 +334,7 @@ // // FrmInterCfg // - this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 23F); + this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.ClientSize = new System.Drawing.Size(1207, 766); this.Controls.Add(this.panelEnhanced1); diff --git a/LargeSquareOne/FrmInterCfg.cs b/LargeSquareOne/FrmInterCfg.cs index 65259ff..2ff8443 100644 --- a/LargeSquareOne/FrmInterCfg.cs +++ b/LargeSquareOne/FrmInterCfg.cs @@ -349,12 +349,12 @@ namespace LargeSquareOne { string trayId = "PLT60I10032567"; string modelName = "LF350S"; - //UnbindTrayInfo(trayId).ConfigureAwait(false); + UnbindTrayInfo(trayId).ConfigureAwait(false); - MaterialFrameRuleService service = new MaterialFrameRuleService(CommonMethods.db.Db); - MaterialFrameRule rule = service.GetRuleByCode(trayId); + //MaterialFrameRuleService service = new MaterialFrameRuleService(CommonMethods.db.Db); + //MaterialFrameRule rule = service.GetRuleByCode(trayId); - short model = CommonMethods.mesConfig.GetModelNum(modelName, rule?.Workshop_Code ?? string.Empty); + //short model = CommonMethods.mesConfig.GetModelNum(modelName, rule?.Workshop_Code ?? string.Empty); } diff --git a/LargeSquareOne/FrmMain.cs b/LargeSquareOne/FrmMain.cs index 4a472a1..5f127dc 100644 --- a/LargeSquareOne/FrmMain.cs +++ b/LargeSquareOne/FrmMain.cs @@ -239,7 +239,7 @@ namespace LargeSquareOne CommonNaviButton_Click(this.nav_Monitor, null); CommonNaviButton_Click(this.nav_DataMonitor, null); CommonNaviButton_Click(this.nav_QRCode, null); - CommonNaviButton_Click(this.nav_BatteryStatus, null); + //CommonNaviButton_Click(this.nav_BatteryStatus, null); // 登录日志 CommonMethods.AddOPLog(false, "登录成功,登录用户".Translated() + $"：{CommonMethods.currentAdmin?.LoginName}," + "权限".Translated() + $"：{CommonMethods.currentAdmin?.LoginLevel}"); diff --git a/LargeSquareOne/FrmParamSet.Designer.cs b/LargeSquareOne/FrmParamSet.Designer.cs index 8f1949f..e2497f5 100644 --- a/LargeSquareOne/FrmParamSet.Designer.cs +++ b/LargeSquareOne/FrmParamSet.Designer.cs @@ -28,12 +28,12 @@ /// private void InitializeComponent() { - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle9 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle10 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle11 = new System.Windows.Forms.DataGridViewCellStyle(); - System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle12 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle(); + System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSystemSet)); this.label16 = new System.Windows.Forms.Label(); this.label17 = new System.Windows.Forms.Label(); @@ -138,7 +138,7 @@ this.label16.ForeColor = System.Drawing.Color.White; this.label16.Location = new System.Drawing.Point(1057, 297); this.label16.Name = "label16"; - this.label16.Size = new System.Drawing.Size(167, 16); + this.label16.Size = new System.Drawing.Size(157, 16); this.label16.TabIndex = 43; this.label16.Text = "自动切换监控界面时间"; // @@ -150,7 +150,7 @@ this.label17.ForeColor = System.Drawing.Color.White; this.label17.Location = new System.Drawing.Point(796, 297); this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(183, 16); + this.label17.Size = new System.Drawing.Size(172, 16); this.label17.TabIndex = 44; this.label17.Text = "无操作自动切换监控界面"; // @@ -171,7 +171,7 @@ this.label13.ForeColor = System.Drawing.Color.White; this.label13.Location = new System.Drawing.Point(484, 407); this.label13.Name = "label13"; - this.label13.Size = new System.Drawing.Size(71, 16); + this.label13.Size = new System.Drawing.Size(67, 16); this.label13.TabIndex = 41; this.label13.Text = "设备编号"; // @@ -192,7 +192,7 @@ this.label14.ForeColor = System.Drawing.Color.White; this.label14.Location = new System.Drawing.Point(276, 407); this.label14.Name = "label14"; - this.label14.Size = new System.Drawing.Size(71, 16); + this.label14.Size = new System.Drawing.Size(67, 16); this.label14.TabIndex = 39; this.label14.Text = "产线编号"; // @@ -213,7 +213,7 @@ this.label15.ForeColor = System.Drawing.Color.White; this.label15.Location = new System.Drawing.Point(66, 407); this.label15.Name = "label15"; - this.label15.Size = new System.Drawing.Size(71, 16); + this.label15.Size = new System.Drawing.Size(67, 16); this.label15.TabIndex = 37; this.label15.Text = "工厂代码"; // @@ -225,7 +225,7 @@ this.label11.ForeColor = System.Drawing.Color.White; this.label11.Location = new System.Drawing.Point(68, 297); this.label11.Name = "label11"; - this.label11.Size = new System.Drawing.Size(103, 16); + this.label11.Size = new System.Drawing.Size(97, 16); this.label11.TabIndex = 30; this.label11.Text = "开启刷卡模式"; // @@ -237,7 +237,7 @@ this.label10.ForeColor = System.Drawing.Color.White; this.label10.Location = new System.Drawing.Point(276, 458); this.label10.Name = "label10"; - this.label10.Size = new System.Drawing.Size(98, 16); + this.label10.Size = new System.Drawing.Size(94, 16); this.label10.TabIndex = 28; this.label10.Text = "获取MES参数"; // @@ -249,7 +249,7 @@ this.label9.ForeColor = System.Drawing.Color.White; this.label9.Location = new System.Drawing.Point(66, 458); this.label9.Name = "label9"; - this.label9.Size = new System.Drawing.Size(148, 16); + this.label9.Size = new System.Drawing.Size(143, 16); this.label9.TabIndex = 26; this.label9.Text = "MES/非MES模式切换"; // @@ -261,7 +261,7 @@ this.label8.ForeColor = System.Drawing.Color.White; this.label8.Location = new System.Drawing.Point(311, 297); this.label8.Name = "label8"; - this.label8.Size = new System.Drawing.Size(135, 16); + this.label8.Size = new System.Drawing.Size(127, 16); this.label8.TabIndex = 24; this.label8.Text = "线程耗时日志保存"; // @@ -273,7 +273,7 @@ this.label5.ForeColor = System.Drawing.Color.White; this.label5.Location = new System.Drawing.Point(1057, 229); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(103, 16); + this.label5.Size = new System.Drawing.Size(97, 16); this.label5.TabIndex = 12; this.label5.Text = "曲线显示数量"; // @@ -285,7 +285,7 @@ this.label4.ForeColor = System.Drawing.Color.White; this.label4.Location = new System.Drawing.Point(796, 229); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(103, 16); + this.label4.Size = new System.Drawing.Size(97, 16); this.label4.TabIndex = 13; this.label4.Text = "自动锁屏时间"; // @@ -297,7 +297,7 @@ this.label3.ForeColor = System.Drawing.Color.White; this.label3.Location = new System.Drawing.Point(551, 229); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(119, 16); + this.label3.Size = new System.Drawing.Size(112, 16); this.label3.TabIndex = 14; this.label3.Text = "无操作自动锁屏"; // @@ -309,7 +309,7 @@ this.label6.ForeColor = System.Drawing.Color.WhiteSmoke; this.label6.Location = new System.Drawing.Point(311, 229); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(103, 16); + this.label6.Size = new System.Drawing.Size(97, 16); this.label6.TabIndex = 11; this.label6.Text = "软件自动登录"; // @@ -321,7 +321,7 @@ this.label7.ForeColor = System.Drawing.Color.White; this.label7.Location = new System.Drawing.Point(68, 229); this.label7.Name = "label7"; - this.label7.Size = new System.Drawing.Size(103, 16); + this.label7.Size = new System.Drawing.Size(97, 16); this.label7.TabIndex = 10; this.label7.Text = "开机自动启动"; // @@ -362,37 +362,37 @@ this.dgvPlcConfigs.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.dgvPlcConfigs.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.dgvPlcConfigs.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle7.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle7.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle7.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle7.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlcConfigs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle7; + dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle1.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle1.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlcConfigs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1; this.dgvPlcConfigs.ColumnHeadersHeight = 40; this.dgvPlcConfigs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle8.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle8.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle8.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvPlcConfigs.DefaultCellStyle = dataGridViewCellStyle8; + dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle2.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle2.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle2.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvPlcConfigs.DefaultCellStyle = dataGridViewCellStyle2; this.dgvPlcConfigs.EnableHeadersVisualStyles = false; this.dgvPlcConfigs.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); this.dgvPlcConfigs.Location = new System.Drawing.Point(57, 52); this.dgvPlcConfigs.Name = "dgvPlcConfigs"; this.dgvPlcConfigs.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle9.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle9.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle9.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle9.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle9.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle9.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle9.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvPlcConfigs.RowHeadersDefaultCellStyle = dataGridViewCellStyle9; + dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle3.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle3.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle3.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvPlcConfigs.RowHeadersDefaultCellStyle = dataGridViewCellStyle3; this.dgvPlcConfigs.RowHeadersWidth = 55; this.dgvPlcConfigs.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dgvPlcConfigs.RowTemplate.Height = 40; @@ -423,7 +423,7 @@ this.lblDebugMode.ForeColor = System.Drawing.Color.White; this.lblDebugMode.Location = new System.Drawing.Point(551, 297); this.lblDebugMode.Name = "lblDebugMode"; - this.lblDebugMode.Size = new System.Drawing.Size(71, 16); + this.lblDebugMode.Size = new System.Drawing.Size(67, 16); this.lblDebugMode.TabIndex = 49; this.lblDebugMode.Text = "调试模式"; // @@ -443,7 +443,7 @@ this.lblEmployeeAuthCheck.ForeColor = System.Drawing.Color.White; this.lblEmployeeAuthCheck.Location = new System.Drawing.Point(64, 540); this.lblEmployeeAuthCheck.Name = "lblEmployeeAuthCheck"; - this.lblEmployeeAuthCheck.Size = new System.Drawing.Size(103, 16); + this.lblEmployeeAuthCheck.Size = new System.Drawing.Size(97, 16); this.lblEmployeeAuthCheck.TabIndex = 53; this.lblEmployeeAuthCheck.Text = "员工权限校验"; // @@ -463,7 +463,7 @@ this.lblQueryTray.ForeColor = System.Drawing.Color.White; this.lblQueryTray.Location = new System.Drawing.Point(64, 599); this.lblQueryTray.Name = "lblQueryTray"; - this.lblQueryTray.Size = new System.Drawing.Size(103, 16); + this.lblQueryTray.Size = new System.Drawing.Size(97, 16); this.lblQueryTray.TabIndex = 56; this.lblQueryTray.Text = "料框信息查询"; // @@ -484,7 +484,7 @@ this.lblPack.ForeColor = System.Drawing.Color.White; this.lblPack.Location = new System.Drawing.Point(66, 658); this.lblPack.Name = "lblPack"; - this.lblPack.Size = new System.Drawing.Size(119, 16); + this.lblPack.Size = new System.Drawing.Size(112, 16); this.lblPack.TabIndex = 58; this.lblPack.Text = "半成品电芯绑盘"; // @@ -504,7 +504,7 @@ this.lblDeviceParamRequest.ForeColor = System.Drawing.Color.White; this.lblDeviceParamRequest.Location = new System.Drawing.Point(674, 658); this.lblDeviceParamRequest.Name = "lblDeviceParamRequest"; - this.lblDeviceParamRequest.Size = new System.Drawing.Size(151, 16); + this.lblDeviceParamRequest.Size = new System.Drawing.Size(142, 16); this.lblDeviceParamRequest.TabIndex = 64; this.lblDeviceParamRequest.Text = "设备参数设定值请求"; // @@ -524,7 +524,7 @@ this.lblDeviceParamChange.ForeColor = System.Drawing.Color.White; this.lblDeviceParamChange.Location = new System.Drawing.Point(674, 717); this.lblDeviceParamChange.Name = "lblDeviceParamChange"; - this.lblDeviceParamChange.Size = new System.Drawing.Size(151, 16); + this.lblDeviceParamChange.Size = new System.Drawing.Size(142, 16); this.lblDeviceParamChange.TabIndex = 66; this.lblDeviceParamChange.Text = "设备参数设定值变更"; // @@ -544,7 +544,7 @@ this.lblDeviceStatus.ForeColor = System.Drawing.Color.White; this.lblDeviceStatus.Location = new System.Drawing.Point(1274, 540); this.lblDeviceStatus.Name = "lblDeviceStatus"; - this.lblDeviceStatus.Size = new System.Drawing.Size(71, 16); + this.lblDeviceStatus.Size = new System.Drawing.Size(67, 16); this.lblDeviceStatus.TabIndex = 67; this.lblDeviceStatus.Text = "设备状态"; // @@ -556,7 +556,7 @@ this.lblDeviceAlarm.ForeColor = System.Drawing.Color.White; this.lblDeviceAlarm.Location = new System.Drawing.Point(1274, 717); this.lblDeviceAlarm.Name = "lblDeviceAlarm"; - this.lblDeviceAlarm.Size = new System.Drawing.Size(71, 16); + this.lblDeviceAlarm.Size = new System.Drawing.Size(67, 16); this.lblDeviceAlarm.TabIndex = 69; this.lblDeviceAlarm.Text = "设备报警"; // @@ -576,7 +576,7 @@ this.lblEnergyConsumption.ForeColor = System.Drawing.Color.White; this.lblEnergyConsumption.Location = new System.Drawing.Point(1274, 599); this.lblEnergyConsumption.Name = "lblEnergyConsumption"; - this.lblEnergyConsumption.Size = new System.Drawing.Size(71, 16); + this.lblEnergyConsumption.Size = new System.Drawing.Size(67, 16); this.lblEnergyConsumption.TabIndex = 71; this.lblEnergyConsumption.Text = "电表能耗"; // @@ -596,7 +596,7 @@ this.lblAnemometer.ForeColor = System.Drawing.Color.White; this.lblAnemometer.Location = new System.Drawing.Point(1274, 658); this.lblAnemometer.Name = "lblAnemometer"; - this.lblAnemometer.Size = new System.Drawing.Size(55, 16); + this.lblAnemometer.Size = new System.Drawing.Size(52, 16); this.lblAnemometer.TabIndex = 75; this.lblAnemometer.Text = "风速仪"; // @@ -616,37 +616,37 @@ this.dgvFdConfigs.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); this.dgvFdConfigs.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D; this.dgvFdConfigs.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle10.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; - dataGridViewCellStyle10.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle10.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle10.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle10.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - dataGridViewCellStyle10.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle10.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvFdConfigs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle10; + dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter; + dataGridViewCellStyle4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle4.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle4.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle4.SelectionBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); + dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvFdConfigs.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4; this.dgvFdConfigs.ColumnHeadersHeight = 40; this.dgvFdConfigs.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.DisableResizing; - dataGridViewCellStyle11.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle11.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle11.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle11.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle11.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle11.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle11.WrapMode = System.Windows.Forms.DataGridViewTriState.False; - this.dgvFdConfigs.DefaultCellStyle = dataGridViewCellStyle11; + dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle5.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle5.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.False; + this.dgvFdConfigs.DefaultCellStyle = dataGridViewCellStyle5; this.dgvFdConfigs.EnableHeadersVisualStyles = false; this.dgvFdConfigs.GridColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(77)))), ((int)(((byte)(147))))); this.dgvFdConfigs.Location = new System.Drawing.Point(57, 61); this.dgvFdConfigs.Name = "dgvFdConfigs"; this.dgvFdConfigs.RowHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single; - dataGridViewCellStyle12.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; - dataGridViewCellStyle12.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); - dataGridViewCellStyle12.Font = new System.Drawing.Font("微软雅黑", 10.5F); - dataGridViewCellStyle12.ForeColor = System.Drawing.Color.White; - dataGridViewCellStyle12.SelectionBackColor = System.Drawing.SystemColors.Highlight; - dataGridViewCellStyle12.SelectionForeColor = System.Drawing.SystemColors.HighlightText; - dataGridViewCellStyle12.WrapMode = System.Windows.Forms.DataGridViewTriState.True; - this.dgvFdConfigs.RowHeadersDefaultCellStyle = dataGridViewCellStyle12; + dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft; + dataGridViewCellStyle6.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(6)))), ((int)(((byte)(40)))), ((int)(((byte)(86))))); + dataGridViewCellStyle6.Font = new System.Drawing.Font("微软雅黑", 10.5F); + dataGridViewCellStyle6.ForeColor = System.Drawing.Color.White; + dataGridViewCellStyle6.SelectionBackColor = System.Drawing.SystemColors.Highlight; + dataGridViewCellStyle6.SelectionForeColor = System.Drawing.SystemColors.HighlightText; + dataGridViewCellStyle6.WrapMode = System.Windows.Forms.DataGridViewTriState.True; + this.dgvFdConfigs.RowHeadersDefaultCellStyle = dataGridViewCellStyle6; this.dgvFdConfigs.RowHeadersWidth = 55; this.dgvFdConfigs.RowHeadersWidthSizeMode = System.Windows.Forms.DataGridViewRowHeadersWidthSizeMode.DisableResizing; this.dgvFdConfigs.RowTemplate.Height = 40; @@ -941,7 +941,7 @@ this.lbl_materialCode.ForeColor = System.Drawing.Color.White; this.lbl_materialCode.Location = new System.Drawing.Point(690, 407); this.lbl_materialCode.Name = "lbl_materialCode"; - this.lbl_materialCode.Size = new System.Drawing.Size(71, 16); + this.lbl_materialCode.Size = new System.Drawing.Size(67, 16); this.lbl_materialCode.TabIndex = 94; this.lbl_materialCode.Text = "物料编号"; // @@ -970,7 +970,7 @@ this.bl_Col.ForeColor = System.Drawing.Color.White; this.bl_Col.Location = new System.Drawing.Point(267, 24); this.bl_Col.Name = "bl_Col"; - this.bl_Col.Size = new System.Drawing.Size(39, 16); + this.bl_Col.Size = new System.Drawing.Size(37, 16); this.bl_Col.TabIndex = 95; this.bl_Col.Text = "列数"; // @@ -1000,7 +1000,7 @@ this.lbl_Row.ForeColor = System.Drawing.Color.White; this.lbl_Row.Location = new System.Drawing.Point(136, 24); this.lbl_Row.Name = "lbl_Row"; - this.lbl_Row.Size = new System.Drawing.Size(39, 16); + this.lbl_Row.Size = new System.Drawing.Size(37, 16); this.lbl_Row.TabIndex = 93; this.lbl_Row.Text = "行数"; // @@ -1030,7 +1030,7 @@ this.lbl_layer.ForeColor = System.Drawing.Color.White; this.lbl_layer.Location = new System.Drawing.Point(9, 27); this.lbl_layer.Name = "lbl_layer"; - this.lbl_layer.Size = new System.Drawing.Size(39, 16); + this.lbl_layer.Size = new System.Drawing.Size(37, 16); this.lbl_layer.TabIndex = 91; this.lbl_layer.Text = "层数"; // @@ -1056,7 +1056,7 @@ this.lblEquipNo.ForeColor = System.Drawing.Color.White; this.lblEquipNo.Location = new System.Drawing.Point(1333, 229); this.lblEquipNo.Name = "lblEquipNo"; - this.lblEquipNo.Size = new System.Drawing.Size(55, 16); + this.lblEquipNo.Size = new System.Drawing.Size(52, 16); this.lblEquipNo.TabIndex = 99; this.lblEquipNo.Text = "机架号"; // @@ -1077,7 +1077,7 @@ this.lblGetToken.ForeColor = System.Drawing.Color.White; this.lblGetToken.Location = new System.Drawing.Point(1620, 297); this.lblGetToken.Name = "lblGetToken"; - this.lblGetToken.Size = new System.Drawing.Size(78, 16); + this.lblGetToken.Size = new System.Drawing.Size(76, 16); this.lblGetToken.TabIndex = 79; this.lblGetToken.Text = "获取Token"; this.lblGetToken.Visible = false; @@ -1143,7 +1143,7 @@ this.label1.ForeColor = System.Drawing.Color.White; this.label1.Location = new System.Drawing.Point(691, 458); this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(71, 16); + this.label1.Size = new System.Drawing.Size(67, 16); this.label1.TabIndex = 86; this.label1.Text = "客户料号"; this.label1.Visible = false; @@ -1183,7 +1183,7 @@ this.lbl_wuliu.ForeColor = System.Drawing.Color.White; this.lbl_wuliu.Location = new System.Drawing.Point(1330, 297); this.lbl_wuliu.Name = "lbl_wuliu"; - this.lbl_wuliu.Size = new System.Drawing.Size(119, 16); + this.lbl_wuliu.Size = new System.Drawing.Size(112, 16); this.lbl_wuliu.TabIndex = 101; this.lbl_wuliu.Text = "物流线分检处理"; // @@ -1195,7 +1195,7 @@ this.lblUnbind.ForeColor = System.Drawing.Color.White; this.lblUnbind.Location = new System.Drawing.Point(64, 776); this.lblUnbind.Name = "lblUnbind"; - this.lblUnbind.Size = new System.Drawing.Size(87, 16); + this.lblUnbind.Size = new System.Drawing.Size(82, 16); this.lblUnbind.TabIndex = 104; this.lblUnbind.Text = "解绑料框码"; // @@ -1216,7 +1216,7 @@ this.lbl_finishbind.ForeColor = System.Drawing.Color.White; this.lbl_finishbind.Location = new System.Drawing.Point(65, 717); this.lbl_finishbind.Name = "lbl_finishbind"; - this.lbl_finishbind.Size = new System.Drawing.Size(103, 16); + this.lbl_finishbind.Size = new System.Drawing.Size(97, 16); this.lbl_finishbind.TabIndex = 106; this.lbl_finishbind.Text = "成品电池绑盘"; // @@ -1236,7 +1236,7 @@ this.lblFinishorNot.ForeColor = System.Drawing.Color.White; this.lblFinishorNot.Location = new System.Drawing.Point(484, 458); this.lblFinishorNot.Name = "lblFinishorNot"; - this.lblFinishorNot.Size = new System.Drawing.Size(158, 16); + this.lblFinishorNot.Size = new System.Drawing.Size(149, 16); this.lblFinishorNot.TabIndex = 107; this.lblFinishorNot.Text = "成品/半成品模式切换"; // @@ -1264,7 +1264,7 @@ this.lblQueryGrade.ForeColor = System.Drawing.Color.White; this.lblQueryGrade.Location = new System.Drawing.Point(674, 540); this.lblQueryGrade.Name = "lblQueryGrade"; - this.lblQueryGrade.Size = new System.Drawing.Size(103, 16); + this.lblQueryGrade.Size = new System.Drawing.Size(97, 16); this.lblQueryGrade.TabIndex = 110; this.lblQueryGrade.Text = "分档信息查询"; // @@ -1284,7 +1284,7 @@ this.lblUpResultParam.ForeColor = System.Drawing.Color.White; this.lblUpResultParam.Location = new System.Drawing.Point(674, 599); this.lblUpResultParam.Name = "lblUpResultParam"; - this.lblUpResultParam.Size = new System.Drawing.Size(103, 16); + this.lblUpResultParam.Size = new System.Drawing.Size(97, 16); this.lblUpResultParam.TabIndex = 112; this.lblUpResultParam.Text = "结果参数上传"; // @@ -1302,7 +1302,7 @@ this.btn_cfgUrl.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.btn_cfgUrl.Font = new System.Drawing.Font("Cambria", 10.5F, System.Drawing.FontStyle.Bold); this.btn_cfgUrl.ForeColor = System.Drawing.Color.White; - this.btn_cfgUrl.Location = new System.Drawing.Point(674, 784); + this.btn_cfgUrl.Location = new System.Drawing.Point(695, 471); this.btn_cfgUrl.Name = "btn_cfgUrl"; this.btn_cfgUrl.Size = new System.Drawing.Size(137, 44); this.btn_cfgUrl.TabIndex = 113; @@ -1315,7 +1315,7 @@ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(14)))), ((int)(((byte)(23)))), ((int)(((byte)(38))))); - this.ClientSize = new System.Drawing.Size(1874, 868); + this.ClientSize = new System.Drawing.Size(1556, 868); this.Controls.Add(this.btn_cfgUrl); this.Controls.Add(this.lblUpResultParam); this.Controls.Add(this.txtUpResultParam); diff --git a/LargeSquareOne/FrmParamSet.resx b/LargeSquareOne/FrmParamSet.resx index 71f52ac..75f0a55 100644 --- a/LargeSquareOne/FrmParamSet.resx +++ b/LargeSquareOne/FrmParamSet.resx @@ -120,58 +120,54 @@ - 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 \ No newline at end of file