From f66836c11fdf2d80d853e3e0fb12df6f8837fa8a Mon Sep 17 00:00:00 2001
From: lhiven <236881222@qq.com>
Date: Sun, 26 May 2024 07:53:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E8=8F=9C?=
=?UTF-8?q?=E5=8D=95=E7=9A=84=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Rs.SkyLine/SysConfig/CommonConfig.Designer.cs | 4 +
Rs.SkyLine/SysConfig/CommonConfig.cs | 2 +-
Rs.SkyLine/SysConfig/CommonConfig.resx | 152 +++++++++---------
3 files changed, 81 insertions(+), 77 deletions(-)
diff --git a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs
index 6b51a48..4cfb26a 100644
--- a/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs
+++ b/Rs.SkyLine/SysConfig/CommonConfig.Designer.cs
@@ -29,6 +29,7 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CommonConfig));
+ System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
this.groupBox8 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
@@ -709,6 +710,7 @@
//
resources.ApplyResources(this.dataGridView1, "dataGridView1");
this.dataGridView1.AutoSizeColumnsMode = System.Windows.Forms.DataGridViewAutoSizeColumnsMode.Fill;
+ this.dataGridView1.BackgroundColor = System.Drawing.Color.FromArgb(((int)(((byte)(56)))), ((int)(((byte)(56)))), ((int)(((byte)(56)))));
this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
this.ID,
@@ -717,6 +719,8 @@
this.是否显示,
this.是否需要登录});
this.dataGridView1.Name = "dataGridView1";
+ dataGridViewCellStyle1.ForeColor = System.Drawing.Color.Black;
+ this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle1;
this.dataGridView1.RowTemplate.Height = 23;
this.dataGridView1.CellEndEdit += new System.Windows.Forms.DataGridViewCellEventHandler(this.dataGridView1_CellEndEdit);
this.dataGridView1.CellFormatting += new System.Windows.Forms.DataGridViewCellFormattingEventHandler(this.dataGridView1_CellFormatting);
diff --git a/Rs.SkyLine/SysConfig/CommonConfig.cs b/Rs.SkyLine/SysConfig/CommonConfig.cs
index 6af2757..21711bc 100644
--- a/Rs.SkyLine/SysConfig/CommonConfig.cs
+++ b/Rs.SkyLine/SysConfig/CommonConfig.cs
@@ -124,7 +124,7 @@ namespace Rs.MotionPlat.SysConfig
{
dataGridView1.DataSource = dt;
}
- if (GlobalUser.IsSuper())
+ if (GlobalUser.IsSuper() || GlobalUser.IsVender())
{
groupBox4.Visible = true;
}
diff --git a/Rs.SkyLine/SysConfig/CommonConfig.resx b/Rs.SkyLine/SysConfig/CommonConfig.resx
index d51269a..5891d02 100644
--- a/Rs.SkyLine/SysConfig/CommonConfig.resx
+++ b/Rs.SkyLine/SysConfig/CommonConfig.resx
@@ -140,11 +140,8 @@
扫码失败自动跳过
-
- cboxLanguage
-
-
- cboxDisableIonFanCheck
+
+ cboxEnableTestFixtureFiberCheck
1
@@ -351,6 +348,9 @@
35, 12
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
NoControl
@@ -382,7 +382,7 @@
59, 12
- Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.14, Culture=neutral, PublicKeyToken=null
+ Rs.MotionPlat.BaseForm, Rs.MotionPlat, Version=3.20.24.21, Culture=neutral, PublicKeyToken=null
False
@@ -408,9 +408,6 @@
NoControl
-
- 13
-
groupBox8
@@ -501,9 +498,6 @@
System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 1
-
2
@@ -615,9 +609,6 @@
39, 70
-
- NoControl
-
groupBox8
@@ -642,8 +633,8 @@
groupBox4
-
- cboxSocketHasProductCheck
+
+ 循环跑
353, 185
@@ -660,8 +651,8 @@
17, 12
-
- Center
+
+ label29
label24
@@ -675,9 +666,6 @@
2
-
- 60
-
8
@@ -783,8 +771,8 @@
257, 115
-
- 42
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
1
@@ -810,8 +798,8 @@
778, 432
-
- 排料重取次数:
+
+ 1
groupBox4
@@ -924,9 +912,6 @@
96, 16
-
- Fill
-
System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -975,9 +960,6 @@
True
-
- groupBox1
-
71, 12
@@ -993,6 +975,9 @@
lblTakeTrayFromNg2InputSpeed
+
+ 中控端口:
+
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1041,8 +1026,8 @@
True
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 83, 21
tableLayoutPanel1
@@ -1077,6 +1062,9 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 6
+
txtDownCameraFlyRegrabNum
@@ -1089,6 +1077,9 @@
groupBox3
+
+ 42
+
0
@@ -1200,6 +1191,9 @@
8
+
+ 重拍次数:
+
3
@@ -1239,8 +1233,8 @@
53
-
- 6
+
+ groupBox1
42
@@ -1251,6 +1245,9 @@
17, 12
+
+ 48
+
是否显示
@@ -1275,9 +1272,6 @@
lblFlyCameraSpeed
-
- 83, 21
-
False
@@ -1329,6 +1323,9 @@
System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ cboxLanguage
+
43
@@ -1386,12 +1383,12 @@
True
-
- groupBox8
-
System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ groupBox8
+
groupBox8
@@ -1476,8 +1473,8 @@
groupBox1
-
- 32, 115
+
+ groupBox8
0
@@ -1578,8 +1575,8 @@
74, 18
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 83, 21
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1620,8 +1617,11 @@
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 10
+
+ cboxDisableIonFanCheck
+
+
+ 宋体, 9pt
System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1665,8 +1665,8 @@
12, 6
-
- 宋体, 9pt
+
+ 10
120, 16
@@ -1734,9 +1734,6 @@
True
-
- cboxEnableTestFixtureFiberCheck
-
增益:
@@ -1752,9 +1749,6 @@
60
-
- label29
-
groupBox1
@@ -1848,6 +1842,9 @@
73, 24
+
+ Center
+
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -1890,8 +1887,8 @@
英文名
-
- groupBox8
+
+ 13
NoControl
@@ -1908,9 +1905,6 @@
0
-
- 83, 21
-
True
@@ -1947,6 +1941,9 @@
搬运带料料盘速度:
+
+ cboxSocketHasProductCheck
+
System.Windows.Forms.TrackBar, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -2034,6 +2031,9 @@
True
+
+ 32, 115
+
Center
@@ -2064,9 +2064,6 @@
groupBox8
-
- groupBox1
-
True
@@ -2076,8 +2073,8 @@
17, 12
-
- NoControl
+
+ 8
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -2094,8 +2091,8 @@
120, 16
-
- 中控端口:
+
+ Fill
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
@@ -2112,8 +2109,8 @@
46, 38
-
- 循环跑
+
+ NoControl
Bottom, Right
@@ -2259,8 +2256,8 @@
System.Windows.Forms.DataGridViewTextBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 重拍次数:
+
+ groupBox1
NoControl
@@ -2385,6 +2382,9 @@
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ NoControl
+
484, 184
@@ -2529,14 +2529,14 @@
4
-
- 8
+
+ 排料重取次数:
16
-
- 48
+
+ 60
96, 16