From cd47f11ebfaadb81d6efcf778542d3b44acee5a2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 03 九月 2025 17:27:46 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 190 ++++++++++++++++++++---------------------------
1 files changed, 82 insertions(+), 108 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index d959c87..b886fce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -42,7 +42,6 @@
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.lbCollectGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
this.txt_gx = new DevExpress.XtraEditors.TextEdit();
this.txt_collectBy = new DevExpress.XtraEditors.TextEdit();
@@ -77,7 +76,6 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -180,7 +178,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -215,7 +212,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1367, 619);
- this.splitMx1.SplitterPosition = 221;
+ this.splitMx1.SplitterPosition = 229;
this.splitMx1.TabIndex = 0;
//
// splitTop1
@@ -244,13 +241,12 @@
this.splitTop1.Panel2.Controls.Add(this.panel1);
this.splitTop1.Panel2.Text = "Panel2";
this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitTop1.Size = new System.Drawing.Size(1367, 221);
+ this.splitTop1.Size = new System.Drawing.Size(1367, 229);
this.splitTop1.SplitterPosition = 527;
this.splitTop1.TabIndex = 0;
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.lbCollectGuid);
this.layoutMx1.Controls.Add(this.txt_gdbh);
this.layoutMx1.Controls.Add(this.txt_gx);
this.layoutMx1.Controls.Add(this.txt_collectBy);
@@ -269,24 +265,13 @@
this.layoutMx1.Controls.Add(this.btnBad);
this.layoutMx1.Controls.Add(this.txt_dianJianPath);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(828, 221);
+ this.layoutMx1.Size = new System.Drawing.Size(828, 229);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
- //
- // lbCollectGuid
- //
- this.lbCollectGuid.Location = new System.Drawing.Point(214, 177);
- this.lbCollectGuid.Name = "lbCollectGuid";
- this.lbCollectGuid.Size = new System.Drawing.Size(79, 18);
- this.lbCollectGuid.StyleController = this.layoutMx1;
- this.lbCollectGuid.TabIndex = 22;
- this.lbCollectGuid.Text = "lbCollectGuid";
//
// txt_gdbh
//
@@ -299,7 +284,7 @@
//
// txt_gx
//
- this.txt_gx.Location = new System.Drawing.Point(111, 45);
+ this.txt_gx.Location = new System.Drawing.Point(111, 46);
this.txt_gx.Name = "txt_gx";
this.txt_gx.Properties.ReadOnly = true;
this.txt_gx.Size = new System.Drawing.Size(99, 24);
@@ -308,7 +293,7 @@
//
// txt_collectBy
//
- this.txt_collectBy.Location = new System.Drawing.Point(111, 78);
+ this.txt_collectBy.Location = new System.Drawing.Point(111, 81);
this.txt_collectBy.Name = "txt_collectBy";
this.txt_collectBy.Properties.ReadOnly = true;
this.txt_collectBy.Size = new System.Drawing.Size(99, 24);
@@ -317,7 +302,7 @@
//
// txt_barCode
//
- this.txt_barCode.Location = new System.Drawing.Point(111, 111);
+ this.txt_barCode.Location = new System.Drawing.Point(111, 116);
this.txt_barCode.Name = "txt_barCode";
this.txt_barCode.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.txt_barCode.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
@@ -329,7 +314,7 @@
//
// txt_currentBarCode
//
- this.txt_currentBarCode.Location = new System.Drawing.Point(111, 144);
+ this.txt_currentBarCode.Location = new System.Drawing.Point(111, 151);
this.txt_currentBarCode.Name = "txt_currentBarCode";
this.txt_currentBarCode.Properties.ReadOnly = true;
this.txt_currentBarCode.Size = new System.Drawing.Size(301, 24);
@@ -338,7 +323,7 @@
//
// txt_gongWei
//
- this.txt_gongWei.Location = new System.Drawing.Point(111, 177);
+ this.txt_gongWei.Location = new System.Drawing.Point(111, 186);
this.txt_gongWei.Name = "txt_gongWei";
this.txt_gongWei.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 9F, System.Drawing.FontStyle.Bold);
this.txt_gongWei.Properties.Appearance.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(78)))), ((int)(((byte)(138)))), ((int)(((byte)(200)))));
@@ -359,7 +344,7 @@
//
// txt_bc
//
- this.txt_bc.Location = new System.Drawing.Point(313, 45);
+ this.txt_bc.Location = new System.Drawing.Point(313, 46);
this.txt_bc.Name = "txt_bc";
this.txt_bc.Properties.ReadOnly = true;
this.txt_bc.Size = new System.Drawing.Size(99, 24);
@@ -368,7 +353,7 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(515, 45);
+ this.txt_itemName.Location = new System.Drawing.Point(515, 46);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.ReadOnly = true;
this.txt_itemName.Size = new System.Drawing.Size(99, 24);
@@ -386,7 +371,7 @@
//
// txt_sbNo
//
- this.txt_sbNo.Location = new System.Drawing.Point(313, 78);
+ this.txt_sbNo.Location = new System.Drawing.Point(313, 81);
this.txt_sbNo.Name = "txt_sbNo";
this.txt_sbNo.Properties.ReadOnly = true;
this.txt_sbNo.Size = new System.Drawing.Size(99, 24);
@@ -395,7 +380,7 @@
//
// txt_sjXt
//
- this.txt_sjXt.Location = new System.Drawing.Point(515, 78);
+ this.txt_sjXt.Location = new System.Drawing.Point(515, 81);
this.txt_sjXt.Name = "txt_sjXt";
this.txt_sjXt.Properties.ReadOnly = true;
this.txt_sjXt.Size = new System.Drawing.Size(99, 24);
@@ -404,7 +389,7 @@
//
// txt_yjDate
//
- this.txt_yjDate.Location = new System.Drawing.Point(717, 45);
+ this.txt_yjDate.Location = new System.Drawing.Point(717, 46);
this.txt_yjDate.Name = "txt_yjDate";
this.txt_yjDate.Properties.ReadOnly = true;
this.txt_yjDate.Size = new System.Drawing.Size(99, 24);
@@ -413,7 +398,7 @@
//
// txt_sjDate
//
- this.txt_sjDate.Location = new System.Drawing.Point(717, 78);
+ this.txt_sjDate.Location = new System.Drawing.Point(717, 81);
this.txt_sjDate.Name = "txt_sjDate";
this.txt_sjDate.Properties.ReadOnly = true;
this.txt_sjDate.Size = new System.Drawing.Size(99, 24);
@@ -424,7 +409,7 @@
//
this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
this.btnGood.Appearance.Options.UseBackColor = true;
- this.btnGood.Location = new System.Drawing.Point(416, 111);
+ this.btnGood.Location = new System.Drawing.Point(416, 116);
this.btnGood.Name = "btnGood";
this.btnGood.Size = new System.Drawing.Size(198, 96);
this.btnGood.StyleController = this.layoutMx1;
@@ -435,7 +420,7 @@
//
this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
this.btnBad.Appearance.Options.UseBackColor = true;
- this.btnBad.Location = new System.Drawing.Point(618, 111);
+ this.btnBad.Location = new System.Drawing.Point(618, 116);
this.btnBad.Name = "btnBad";
this.btnBad.Size = new System.Drawing.Size(198, 96);
this.btnBad.StyleController = this.layoutMx1;
@@ -444,7 +429,7 @@
//
// txt_dianJianPath
//
- this.txt_dianJianPath.Location = new System.Drawing.Point(313, 177);
+ this.txt_dianJianPath.Location = new System.Drawing.Point(313, 186);
this.txt_dianJianPath.Name = "txt_dianJianPath";
this.txt_dianJianPath.Properties.ReadOnly = true;
this.txt_dianJianPath.Size = new System.Drawing.Size(99, 24);
@@ -507,7 +492,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(828, 221);
+ this.Root.Size = new System.Drawing.Size(828, 229);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -515,17 +500,17 @@
this.layoutControlItem1.Control = this.txt_gdbh;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem1.Size = new System.Drawing.Size(202, 34);
this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_gx;
- this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
+ this.layoutControlItem2.Location = new System.Drawing.Point(0, 34);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem2.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem2.Text = "褰撳墠宸ュ簭";
this.layoutControlItem2.TextSize = new System.Drawing.Size(87, 18);
//
@@ -533,21 +518,21 @@
//
this.layoutControlItem3.Control = this.txt_collectBy;
this.layoutControlItem3.CustomizationFormText = "鎿嶄綔鍛樺伐";
- this.layoutControlItem3.Location = new System.Drawing.Point(0, 66);
+ this.layoutControlItem3.Location = new System.Drawing.Point(0, 69);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem3.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
this.layoutControlItem3.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_barCode;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 99);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 104);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem4.Size = new System.Drawing.Size(404, 33);
+ this.layoutControlItem4.Size = new System.Drawing.Size(404, 35);
this.layoutControlItem4.Text = "鎵拷婧爜";
this.layoutControlItem4.TextSize = new System.Drawing.Size(87, 18);
//
@@ -557,53 +542,53 @@
this.layoutControlItem7.Location = new System.Drawing.Point(202, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem7.Size = new System.Drawing.Size(202, 34);
this.layoutControlItem7.Text = "浜у搧缂栫爜";
this.layoutControlItem7.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_bc;
- this.layoutControlItem8.Location = new System.Drawing.Point(202, 33);
+ this.layoutControlItem8.Location = new System.Drawing.Point(202, 34);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem8.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem8.Text = "鐝";
this.layoutControlItem8.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_currentBarCode;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 132);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 139);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem5.Size = new System.Drawing.Size(404, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(404, 35);
this.layoutControlItem5.Text = "褰撳墠鏉＄爜";
this.layoutControlItem5.TextSize = new System.Drawing.Size(87, 18);
//
// layShuiJian
//
this.layShuiJian.Control = this.txt_gongWei;
- this.layShuiJian.Location = new System.Drawing.Point(0, 165);
+ this.layShuiJian.Location = new System.Drawing.Point(0, 174);
this.layShuiJian.Name = "layShuiJian";
this.layShuiJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layShuiJian.Size = new System.Drawing.Size(202, 36);
+ this.layShuiJian.Size = new System.Drawing.Size(202, 35);
this.layShuiJian.Text = "鎵伐浣嶇爜";
this.layShuiJian.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.btnGood;
- this.layoutControlItem16.Location = new System.Drawing.Point(404, 99);
+ this.layoutControlItem16.Location = new System.Drawing.Point(404, 104);
this.layoutControlItem16.MaxSize = new System.Drawing.Size(0, 100);
this.layoutControlItem16.MinSize = new System.Drawing.Size(41, 100);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(202, 102);
+ this.layoutControlItem16.Size = new System.Drawing.Size(202, 105);
this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem16.Text = "鑹搧鎸夐挳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -612,14 +597,14 @@
// layoutControlItem17
//
this.layoutControlItem17.Control = this.btnBad;
- this.layoutControlItem17.Location = new System.Drawing.Point(606, 99);
+ this.layoutControlItem17.Location = new System.Drawing.Point(606, 104);
this.layoutControlItem17.MaxSize = new System.Drawing.Size(0, 100);
this.layoutControlItem17.MinSize = new System.Drawing.Size(56, 100);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowSpan = 3;
- this.layoutControlItem17.Size = new System.Drawing.Size(202, 102);
+ this.layoutControlItem17.Size = new System.Drawing.Size(202, 105);
this.layoutControlItem17.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem17.Text = "涓嶈壇鍝佹寜閽�";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
@@ -628,33 +613,33 @@
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_sbNo;
- this.layoutControlItem12.Location = new System.Drawing.Point(202, 66);
+ this.layoutControlItem12.Location = new System.Drawing.Point(202, 69);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem12.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem12.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem12.Text = "璁惧缂栫爜";
this.layoutControlItem12.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_sjDate;
- this.layoutControlItem15.Location = new System.Drawing.Point(606, 66);
+ this.layoutControlItem15.Location = new System.Drawing.Point(606, 69);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem15.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem15.Text = "Mes瀹為檯寮�宸�";
this.layoutControlItem15.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem14
//
this.layoutControlItem14.Control = this.txt_yjDate;
- this.layoutControlItem14.Location = new System.Drawing.Point(606, 33);
+ this.layoutControlItem14.Location = new System.Drawing.Point(606, 34);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem14.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem14.Text = "Mes璁″垝寮�宸�";
this.layoutControlItem14.TextSize = new System.Drawing.Size(87, 18);
//
@@ -662,22 +647,22 @@
//
this.layoutControlItem13.Control = this.txt_sjXt;
this.layoutControlItem13.CustomizationFormText = "鐢熶骇绾垮埆";
- this.layoutControlItem13.Location = new System.Drawing.Point(404, 66);
+ this.layoutControlItem13.Location = new System.Drawing.Point(404, 69);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem13.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem13.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
this.layoutControlItem13.TextSize = new System.Drawing.Size(87, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_itemName;
- this.layoutControlItem10.Location = new System.Drawing.Point(404, 33);
+ this.layoutControlItem10.Location = new System.Drawing.Point(404, 34);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(202, 33);
+ this.layoutControlItem10.Size = new System.Drawing.Size(202, 35);
this.layoutControlItem10.Text = "浜у搧鍚嶇О";
this.layoutControlItem10.TextSize = new System.Drawing.Size(87, 18);
//
@@ -688,29 +673,17 @@
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(404, 33);
+ this.layoutControlItem11.Size = new System.Drawing.Size(404, 34);
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.lbCollectGuid;
- this.layoutControlItem6.Location = new System.Drawing.Point(202, 165);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem6.Size = new System.Drawing.Size(202, 36);
- this.layoutControlItem6.Text = "閲囬泦琛実uid";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem6.TextVisible = false;
//
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton7.Appearance.Options.UseBackColor = true;
- this.simpleButton7.Location = new System.Drawing.Point(122, 126);
+ this.simpleButton7.Location = new System.Drawing.Point(122, 154);
this.simpleButton7.Name = "simpleButton7";
- this.simpleButton7.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton7.Size = new System.Drawing.Size(86, 56);
this.simpleButton7.TabIndex = 10;
this.simpleButton7.Text = "璁惧";
//
@@ -718,9 +691,9 @@
//
this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton6.Appearance.Options.UseBackColor = true;
- this.simpleButton6.Location = new System.Drawing.Point(425, 126);
+ this.simpleButton6.Location = new System.Drawing.Point(425, 154);
this.simpleButton6.Name = "simpleButton6";
- this.simpleButton6.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton6.Size = new System.Drawing.Size(86, 56);
this.simpleButton6.TabIndex = 9;
this.simpleButton6.Text = "鍙栨秷";
//
@@ -728,9 +701,9 @@
//
this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton5.Appearance.Options.UseBackColor = true;
- this.simpleButton5.Location = new System.Drawing.Point(223, 126);
+ this.simpleButton5.Location = new System.Drawing.Point(223, 154);
this.simpleButton5.Name = "simpleButton5";
- this.simpleButton5.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton5.Size = new System.Drawing.Size(86, 56);
this.simpleButton5.TabIndex = 8;
this.simpleButton5.Text = "鍝佽川";
//
@@ -738,9 +711,9 @@
//
this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton4.Appearance.Options.UseBackColor = true;
- this.simpleButton4.Location = new System.Drawing.Point(324, 126);
+ this.simpleButton4.Location = new System.Drawing.Point(324, 154);
this.simpleButton4.Name = "simpleButton4";
- this.simpleButton4.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton4.Size = new System.Drawing.Size(86, 56);
this.simpleButton4.TabIndex = 7;
this.simpleButton4.Text = "鍏跺畠";
//
@@ -748,34 +721,35 @@
//
this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
this.simpleButton3.Appearance.Options.UseBackColor = true;
- this.simpleButton3.Location = new System.Drawing.Point(21, 126);
+ this.simpleButton3.Location = new System.Drawing.Point(21, 154);
this.simpleButton3.Name = "simpleButton3";
- this.simpleButton3.Size = new System.Drawing.Size(86, 50);
+ this.simpleButton3.Size = new System.Drawing.Size(86, 56);
this.simpleButton3.TabIndex = 6;
this.simpleButton3.Text = "鐗╂枡";
//
// prog1
//
- this.prog1.Location = new System.Drawing.Point(21, 88);
+ this.prog1.Location = new System.Drawing.Point(22, 110);
this.prog1.Name = "prog1";
this.prog1.Properties.ShowTitle = true;
- this.prog1.Size = new System.Drawing.Size(489, 22);
+ this.prog1.Size = new System.Drawing.Size(489, 26);
this.prog1.TabIndex = 5;
//
// panel3
//
- this.panel3.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel3.BackColor = System.Drawing.SystemColors.Highlight;
this.panel3.Controls.Add(this.lbSum4);
this.panel3.Controls.Add(this.label6);
+ this.panel3.ForeColor = System.Drawing.Color.White;
this.panel3.Location = new System.Drawing.Point(411, 7);
this.panel3.Name = "panel3";
- this.panel3.Size = new System.Drawing.Size(99, 71);
+ this.panel3.Size = new System.Drawing.Size(99, 89);
this.panel3.TabIndex = 4;
//
// lbSum4
//
this.lbSum4.AutoSize = true;
- this.lbSum4.Location = new System.Drawing.Point(45, 46);
+ this.lbSum4.Location = new System.Drawing.Point(45, 54);
this.lbSum4.Name = "lbSum4";
this.lbSum4.Size = new System.Drawing.Size(16, 18);
this.lbSum4.TabIndex = 1;
@@ -792,18 +766,19 @@
//
// panel2
//
- this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel2.BackColor = System.Drawing.SystemColors.Highlight;
this.panel2.Controls.Add(this.lbSum3);
this.panel2.Controls.Add(this.label4);
+ this.panel2.ForeColor = System.Drawing.Color.White;
this.panel2.Location = new System.Drawing.Point(281, 7);
this.panel2.Name = "panel2";
- this.panel2.Size = new System.Drawing.Size(99, 71);
+ this.panel2.Size = new System.Drawing.Size(99, 89);
this.panel2.TabIndex = 3;
//
// lbSum3
//
this.lbSum3.AutoSize = true;
- this.lbSum3.Location = new System.Drawing.Point(45, 46);
+ this.lbSum3.Location = new System.Drawing.Point(45, 54);
this.lbSum3.Name = "lbSum3";
this.lbSum3.Size = new System.Drawing.Size(16, 18);
this.lbSum3.TabIndex = 1;
@@ -820,18 +795,19 @@
//
// panel4
//
- this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel4.BackColor = System.Drawing.SystemColors.Highlight;
this.panel4.Controls.Add(this.lbSum2);
this.panel4.Controls.Add(this.label8);
+ this.panel4.ForeColor = System.Drawing.Color.White;
this.panel4.Location = new System.Drawing.Point(143, 7);
this.panel4.Name = "panel4";
- this.panel4.Size = new System.Drawing.Size(110, 71);
+ this.panel4.Size = new System.Drawing.Size(110, 89);
this.panel4.TabIndex = 2;
//
// lbSum2
//
this.lbSum2.AutoSize = true;
- this.lbSum2.Location = new System.Drawing.Point(45, 46);
+ this.lbSum2.Location = new System.Drawing.Point(45, 54);
this.lbSum2.Name = "lbSum2";
this.lbSum2.Size = new System.Drawing.Size(16, 18);
this.lbSum2.TabIndex = 1;
@@ -848,18 +824,19 @@
//
// panel1
//
- this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
+ this.panel1.BackColor = System.Drawing.SystemColors.Highlight;
this.panel1.Controls.Add(this.lbSum1);
this.panel1.Controls.Add(this.label1);
+ this.panel1.ForeColor = System.Drawing.Color.White;
this.panel1.Location = new System.Drawing.Point(21, 7);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(99, 71);
+ this.panel1.Size = new System.Drawing.Size(99, 89);
this.panel1.TabIndex = 0;
//
// lbSum1
//
this.lbSum1.AutoSize = true;
- this.lbSum1.Location = new System.Drawing.Point(45, 46);
+ this.lbSum1.Location = new System.Drawing.Point(45, 54);
this.lbSum1.Name = "lbSum1";
this.lbSum1.Size = new System.Drawing.Size(16, 18);
this.lbSum1.TabIndex = 1;
@@ -880,7 +857,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1367, 386);
+ this.tabMx.Size = new System.Drawing.Size(1367, 378);
this.tabMx.TabIndex = 4;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -890,7 +867,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1365, 354);
+ this.tabMxPage1.Size = new System.Drawing.Size(1365, 346);
this.tabMxPage1.Text = "鑹搧鍚嶇О";
//
// gcMx1
@@ -899,7 +876,7 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1365, 354);
+ this.gcMx1.Size = new System.Drawing.Size(1365, 346);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1085,7 +1062,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1365, 354);
+ this.tabMxPage2.Size = new System.Drawing.Size(1365, 346);
this.tabMxPage2.Text = "涓嶈壇鍝佹槑缁�";
//
// gcMx2
@@ -1094,7 +1071,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1365, 354);
+ this.gcMx2.Size = new System.Drawing.Size(1365, 346);
this.gcMx2.TabIndex = 1;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1291,11 +1268,11 @@
// layDianJian
//
this.layDianJian.Control = this.txt_dianJianPath;
- this.layDianJian.Location = new System.Drawing.Point(202, 165);
+ this.layDianJian.Location = new System.Drawing.Point(202, 174);
this.layDianJian.Name = "layDianJian";
this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layDianJian.Size = new System.Drawing.Size(202, 36);
+ this.layDianJian.Size = new System.Drawing.Size(202, 35);
this.layDianJian.Text = "鐢垫璺緞";
this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
//
@@ -1357,7 +1334,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1474,8 +1450,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
- private DevExpress.XtraEditors.LabelControl lbCollectGuid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
private DevExpress.XtraLayout.LayoutControlItem layDianJian;
}
}
\ No newline at end of file
--
Gitblit v1.9.3