xiaohuimin/DHDHSoftware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决合并冲突

Browse Source
This commit is contained in:
TD
2025-04-11 11:52:29 +08:00
parent e31a890b06 d0a928eb40
commit 8a0668ed96
139 changed files with 27802 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
DHSoftware/MainWindow.Designer.cs generated
View File

@ -483,6 +483,7 @@
btnDeleteProject.Name = "btnDeleteProject";
btnDeleteProject.Size = new Size(68, 40);
btnDeleteProject.TabIndex = 19;
btnDeleteProject.Tag = "sys-deletescheme";
btnDeleteProject.Text = "删除";
btnDeleteProject.Visible = false;
//
@ -492,6 +493,7 @@
btnAddProject.Name = "btnAddProject";
btnAddProject.Size = new Size(68, 40);
btnAddProject.TabIndex = 18;
btnAddProject.Tag = "sys-addscheme";
btnAddProject.Text = "新增";
btnAddProject.Visible = false;
//
@ -501,6 +503,7 @@
btnLoadProject.Name = "btnLoadProject";
btnLoadProject.Size = new Size(68, 40);
btnLoadProject.TabIndex = 17;
btnLoadProject.Tag = "sys-loadscheme";
btnLoadProject.Text = "载入";
btnLoadProject.Visible = false;
//
@ -513,6 +516,7 @@
sltProjects.Name = "sltProjects";
sltProjects.Size = new Size(214, 40);
sltProjects.TabIndex = 16;
sltProjects.Tag = "sys-schemelist";
//
// segmented1
//
@ -576,6 +580,7 @@
segmentedItem5.BadgeSvg = null;
segmentedItem5.IconActiveSvg = resources.GetString("segmentedItem5.IconActiveSvg");
segmentedItem5.IconSvg = resources.GetString("segmentedItem5.IconSvg");
segmentedItem5.ID = "sys-setbutton";
segmentedItem5.Text = "设置";
segmented1.Items.Add(segmentedItem1);
segmented1.Items.Add(segmentedItem2);
@ -672,6 +677,10 @@
private Label lblOEE_Total;
private Label lblStartTime;
private Label label10;
private Label lblstarttime2;
private Label label7;
private AntdUI.Panel pnlLog;
private AntdUI.Label lbInBackend;
private DataGridView dgvProductNums;
private TableLayoutPanel tableLayoutPanel3;
}