diff --git a/DeviceRepairAndOptimization.sln b/DeviceRepairAndOptimization.sln
index c2d3527..7e11a4a 100644
--- a/DeviceRepairAndOptimization.sln
+++ b/DeviceRepairAndOptimization.sln
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:9c21264f14e6e1dceff6a0bcd96ffb783528ad37ce0689fca53fa2a4af5dc4a4
-size 9526
+oid sha256:a82b56595bda102750dd02a5332ffaaa95a266ddaa4c37a324a80df45f26d7e7
+size 10127
diff --git a/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionView.Designer.cs b/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionView.Designer.cs
index 34386ac..9e24ff8 100644
--- a/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionView.Designer.cs
+++ b/DeviceRepairAndOptimization/Pages/AM/FormVersion/pageFormVersionView.Designer.cs
@@ -83,7 +83,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1237, 694, 650, 400);
this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(1325, 552);
+ this.layoutControl1.Size = new System.Drawing.Size(1074, 900);
this.layoutControl1.TabIndex = 0;
this.layoutControl1.Text = "layoutControl1";
//
@@ -93,7 +93,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
this.gcControl.Location = new System.Drawing.Point(12, 43);
this.gcControl.MainView = this.gvControl;
this.gcControl.Name = "gcControl";
- this.gcControl.Size = new System.Drawing.Size(1301, 497);
+ this.gcControl.Size = new System.Drawing.Size(1050, 845);
this.gcControl.TabIndex = 9;
this.gcControl.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvControl});
@@ -242,7 +242,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
//
// btnFIlter
//
- this.btnFIlter.Location = new System.Drawing.Point(1063, 10);
+ this.btnFIlter.Location = new System.Drawing.Point(812, 10);
this.btnFIlter.Name = "btnFIlter";
this.btnFIlter.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
this.btnFIlter.Properties.Appearance.Options.UseFont = true;
@@ -271,7 +271,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
this.layoutControlItem3});
this.Root.Name = "Root";
this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 10, 5, 10);
- this.Root.Size = new System.Drawing.Size(1325, 552);
+ this.Root.Size = new System.Drawing.Size(1074, 900);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -317,7 +317,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
this.layoutControlItem5.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem5.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.layoutControlItem5.Control = this.btnFIlter;
- this.layoutControlItem5.Location = new System.Drawing.Point(975, 0);
+ this.layoutControlItem5.Location = new System.Drawing.Point(724, 0);
this.layoutControlItem5.MaxSize = new System.Drawing.Size(330, 30);
this.layoutControlItem5.MinSize = new System.Drawing.Size(330, 30);
this.layoutControlItem5.Name = "layoutControlItem5";
@@ -331,7 +331,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
this.emptySpaceItem1.AllowHotTrack = false;
this.emptySpaceItem1.Location = new System.Drawing.Point(403, 0);
this.emptySpaceItem1.Name = "emptySpaceItem1";
- this.emptySpaceItem1.Size = new System.Drawing.Size(572, 36);
+ this.emptySpaceItem1.Size = new System.Drawing.Size(321, 36);
this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
//
// layoutControlItem6
@@ -339,7 +339,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
this.layoutControlItem6.Control = this.gcControl;
this.layoutControlItem6.Location = new System.Drawing.Point(0, 36);
this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.Size = new System.Drawing.Size(1305, 501);
+ this.layoutControlItem6.Size = new System.Drawing.Size(1054, 849);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@@ -362,7 +362,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.FormVersion
// pageFormVersionView
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Inherit;
- this.ClientSize = new System.Drawing.Size(1325, 552);
+ this.ClientSize = new System.Drawing.Size(1074, 900);
this.Controls.Add(this.layoutControl1);
this.Name = "pageFormVersionView";
this.Text = "pageFormVersionView";
diff --git a/DeviceRepairAndOptimization/Pages/AM/Plan/pageAmMaintenancePlanView.Designer.cs b/DeviceRepairAndOptimization/Pages/AM/Plan/pageAmMaintenancePlanView.Designer.cs
index 6510f7a..043e08f 100644
--- a/DeviceRepairAndOptimization/Pages/AM/Plan/pageAmMaintenancePlanView.Designer.cs
+++ b/DeviceRepairAndOptimization/Pages/AM/Plan/pageAmMaintenancePlanView.Designer.cs
@@ -126,7 +126,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControl1.OptionsPrint.AppearanceGroupCaption.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center;
this.layoutControl1.Root = this.Root;
- this.layoutControl1.Size = new System.Drawing.Size(1517, 900);
+ this.layoutControl1.Size = new System.Drawing.Size(1854, 900);
this.layoutControl1.TabIndex = 1;
this.layoutControl1.Text = "layoutControl1";
//
@@ -134,9 +134,9 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
//
this.gridControl1.Location = new System.Drawing.Point(12, 42);
this.gridControl1.MainView = this.gridView1;
- this.gridControl1.MinimumSize = new System.Drawing.Size(1500, 0);
+ this.gridControl1.MinimumSize = new System.Drawing.Size(1800, 0);
this.gridControl1.Name = "gridControl1";
- this.gridControl1.Size = new System.Drawing.Size(1500, 829);
+ this.gridControl1.Size = new System.Drawing.Size(1830, 846);
this.gridControl1.TabIndex = 11;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -168,8 +168,11 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
this.gcRemarks});
this.gridView1.GridControl = this.gridControl1;
this.gridView1.Name = "gridView1";
+ this.gridView1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.False;
+ this.gridView1.OptionsView.RowAutoHeight = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
this.gridView1.RowHeight = 31;
+ this.gridView1.ViewCaptionHeight = 31;
this.gridView1.RowCellStyle += new DevExpress.XtraGrid.Views.Grid.RowCellStyleEventHandler(this.gridView1_RowCellStyle);
//
// gcDisplayEquipmentID
@@ -430,7 +433,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
//
// txtFilter
//
- this.txtFilter.Location = new System.Drawing.Point(1246, 7);
+ this.txtFilter.Location = new System.Drawing.Point(1576, 7);
this.txtFilter.Name = "txtFilter";
this.txtFilter.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
this.txtFilter.Properties.Appearance.Options.UseFont = true;
@@ -520,7 +523,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
// teYear
//
this.teYear.EditValue = new System.DateTime(2024, 6, 14, 0, 0, 0, 0);
- this.teYear.Location = new System.Drawing.Point(1147, 7);
+ this.teYear.Location = new System.Drawing.Point(1477, 7);
this.teYear.Name = "teYear";
this.teYear.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
this.teYear.Properties.Appearance.Options.UseFont = true;
@@ -535,13 +538,13 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
this.teYear.Properties.CalendarView = DevExpress.XtraEditors.Repository.CalendarView.TouchUI;
this.teYear.Properties.DisplayFormat.FormatString = "yyyy";
this.teYear.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.Custom;
- this.teYear.Properties.EditFormat.FormatString = "";
- this.teYear.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
this.teYear.Properties.EditValueChangedFiringMode = DevExpress.XtraEditors.Controls.EditValueChangedFiringMode.Buffered;
- this.teYear.Properties.MaskSettings.Set("mask", "yyyy");
+ this.teYear.Properties.Mask.EditMask = "yyyy";
+ this.teYear.Properties.Mask.UseMaskAsDisplayFormat = true;
+ this.teYear.Properties.ShowMonthHeaders = false;
this.teYear.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.teYear.Properties.UseMaskAsDisplayFormat = true;
- this.teYear.Properties.VistaCalendarInitialViewStyle = DevExpress.XtraEditors.VistaCalendarInitialViewStyle.YearView;
+ this.teYear.Properties.VistaCalendarInitialViewStyle = DevExpress.XtraEditors.VistaCalendarInitialViewStyle.YearsGroupView;
+ this.teYear.Properties.VistaCalendarViewStyle = DevExpress.XtraEditors.VistaCalendarViewStyle.YearsGroupView;
this.teYear.Properties.VistaDisplayMode = DevExpress.Utils.DefaultBoolean.False;
this.teYear.Size = new System.Drawing.Size(95, 26);
this.teYear.StyleController = this.layoutControl1;
@@ -573,7 +576,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
columnDefinition5.SizeType = System.Windows.Forms.SizeType.Absolute;
columnDefinition5.Width = 95D;
columnDefinition6.SizeType = System.Windows.Forms.SizeType.AutoSize;
- columnDefinition6.Width = 584D;
+ columnDefinition6.Width = 914D;
columnDefinition7.SizeType = System.Windows.Forms.SizeType.Absolute;
columnDefinition7.Width = 175D;
columnDefinition8.SizeType = System.Windows.Forms.SizeType.Absolute;
@@ -595,7 +598,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
rowDefinition1,
rowDefinition2});
this.Root.Padding = new DevExpress.XtraLayout.Utils.Padding(10, 10, 0, 10);
- this.Root.Size = new System.Drawing.Size(1524, 883);
+ this.Root.Size = new System.Drawing.Size(1854, 900);
this.Root.TextVisible = false;
//
// layoutControlItem2
@@ -654,7 +657,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
this.layoutControlItem6.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.layoutControlItem6.Control = this.teYear;
this.layoutControlItem6.CustomizationFormText = "计划年份：";
- this.layoutControlItem6.Location = new System.Drawing.Point(1059, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(1389, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 6;
this.layoutControlItem6.Size = new System.Drawing.Size(175, 40);
@@ -677,7 +680,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
this.layoutControlItem7.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Center;
this.layoutControlItem7.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
this.layoutControlItem7.Control = this.txtFilter;
- this.layoutControlItem7.Location = new System.Drawing.Point(1234, 0);
+ this.layoutControlItem7.Location = new System.Drawing.Point(1564, 0);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 7;
this.layoutControlItem7.Size = new System.Drawing.Size(270, 40);
@@ -691,7 +694,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnSpan = 8;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(1504, 833);
+ this.layoutControlItem8.Size = new System.Drawing.Size(1834, 850);
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
//
@@ -716,7 +719,7 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
// pageAmMaintenancePlanView
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(1517, 900);
+ this.ClientSize = new System.Drawing.Size(1854, 900);
this.Controls.Add(this.layoutControl1);
this.DoubleBuffered = true;
this.Name = "pageAmMaintenancePlanView";
diff --git a/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs b/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs
index 417a2a0..b05ccc7 100644
--- a/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs
+++ b/DeviceRepairAndOptimization/Pages/AM/Plan/pageDevicePlanEdit.cs
@@ -159,6 +159,11 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
}
}
+ ///
+ /// 查找设备
+ ///
+ ///
+ ///
private void txt_EquipmentID_KeyPress(object sender, KeyPressEventArgs e)
{
if (e.KeyChar == (char)Keys.Enter)
@@ -213,6 +218,11 @@ namespace DeviceRepairAndOptimization.Pages.AM.Plan
}
}
+ ///
+ /// 查找设备
+ ///
+ ///
+ ///
private void txt_EquipmentID_Properties_KeyPress(object sender, KeyPressEventArgs e)
{
//增加了自动切换大写，控制只能输入大写字母、数字、回退按钮、复制快捷键(复制的数据没有控制格式)
diff --git a/DeviceRepairAndOptimization/Pages/DriveInformation/page_DriveListInfo.Designer.cs b/DeviceRepairAndOptimization/Pages/DriveInformation/page_DriveListInfo.Designer.cs
index 60668eb..60280c7 100644
--- a/DeviceRepairAndOptimization/Pages/DriveInformation/page_DriveListInfo.Designer.cs
+++ b/DeviceRepairAndOptimization/Pages/DriveInformation/page_DriveListInfo.Designer.cs
@@ -30,34 +30,37 @@ namespace DeviceRepairAndOptimization.Pages
private void InitializeComponent()
{
System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
+ System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.Layout.StackPanel stackPanel1;
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(page_DriveListInfo));
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions13 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject49 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject50 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject51 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject52 = new DevExpress.Utils.SerializableAppearanceObject();
- System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions14 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject53 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject54 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject55 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject56 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.Layout.StackPanel stackPanel1;
- System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(page_DriveListInfo));
+ this.btn_Filter = new DevExpress.XtraEditors.SimpleButton();
+ this.EditSearch = new DevExpress.XtraEditors.ButtonEdit();
+ this.btn_Add = new DevExpress.XtraEditors.SimpleButton();
this.gridControl1 = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.OperatingParameters = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -82,22 +85,19 @@ namespace DeviceRepairAndOptimization.Pages
this.Operation = new DevExpress.XtraGrid.Columns.GridColumn();
this.btn_DeviceOperations = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.Operations = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.btn_Filter = new DevExpress.XtraEditors.SimpleButton();
- this.EditSearch = new DevExpress.XtraEditors.ButtonEdit();
- this.btn_Add = new DevExpress.XtraEditors.SimpleButton();
this.splashScreenManager1 = new DevExpress.XtraSplashScreen.SplashScreenManager(this, typeof(global::DeviceRepairAndOptimization.frmWaiting), true, true);
tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
stackPanel1 = new DevExpress.Utils.Layout.StackPanel();
tableLayoutPanel1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.btn_DeviceOperations)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.Operations)).BeginInit();
flowLayoutPanel1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.EditSearch.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(stackPanel1)).BeginInit();
stackPanel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.btn_DeviceOperations)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Operations)).BeginInit();
this.SuspendLayout();
//
// tableLayoutPanel1
@@ -105,9 +105,9 @@ namespace DeviceRepairAndOptimization.Pages
tableLayoutPanel1.ColumnCount = 2;
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F));
tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 450F));
- tableLayoutPanel1.Controls.Add(this.gridControl1, 0, 1);
tableLayoutPanel1.Controls.Add(flowLayoutPanel1, 1, 0);
tableLayoutPanel1.Controls.Add(stackPanel1, 0, 0);
+ tableLayoutPanel1.Controls.Add(this.gridControl1, 0, 1);
tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
tableLayoutPanel1.Location = new System.Drawing.Point(0, 0);
tableLayoutPanel1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
@@ -115,9 +115,91 @@ namespace DeviceRepairAndOptimization.Pages
tableLayoutPanel1.RowCount = 2;
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- tableLayoutPanel1.Size = new System.Drawing.Size(1854, 900);
+ tableLayoutPanel1.Size = new System.Drawing.Size(1641, 938);
tableLayoutPanel1.TabIndex = 1;
//
+ // flowLayoutPanel1
+ //
+ flowLayoutPanel1.Controls.Add(this.btn_Filter);
+ flowLayoutPanel1.Controls.Add(this.EditSearch);
+ flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
+ flowLayoutPanel1.Location = new System.Drawing.Point(1191, 0);
+ flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
+ flowLayoutPanel1.Name = "flowLayoutPanel1";
+ flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(7);
+ flowLayoutPanel1.Size = new System.Drawing.Size(450, 48);
+ flowLayoutPanel1.TabIndex = 0;
+ //
+ // btn_Filter
+ //
+ this.btn_Filter.Anchor = System.Windows.Forms.AnchorStyles.Right;
+ this.btn_Filter.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Filter.Appearance.Options.UseFont = true;
+ this.btn_Filter.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Filter.AppearanceDisabled.Options.UseFont = true;
+ this.btn_Filter.AppearanceHovered.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Filter.AppearanceHovered.Options.UseFont = true;
+ this.btn_Filter.AppearancePressed.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Filter.AppearancePressed.Options.UseFont = true;
+ this.btn_Filter.Location = new System.Drawing.Point(376, 11);
+ this.btn_Filter.Name = "btn_Filter";
+ this.btn_Filter.Size = new System.Drawing.Size(57, 26);
+ this.btn_Filter.TabIndex = 11;
+ this.btn_Filter.Text = "搜索";
+ this.btn_Filter.Click += new System.EventHandler(this.btn_Filter_Click);
+ //
+ // EditSearch
+ //
+ this.EditSearch.Location = new System.Drawing.Point(49, 11);
+ this.EditSearch.Margin = new System.Windows.Forms.Padding(4);
+ this.EditSearch.Name = "EditSearch";
+ this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.EditSearch.Properties.Appearance.Options.UseFont = true;
+ this.EditSearch.Properties.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.EditSearch.Properties.AppearanceDisabled.Options.UseFont = true;
+ this.EditSearch.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.EditSearch.Properties.AppearanceFocused.Options.UseFont = true;
+ this.EditSearch.Properties.AppearanceReadOnly.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.EditSearch.Properties.AppearanceReadOnly.Options.UseFont = true;
+ this.EditSearch.Properties.AutoHeight = false;
+ editorButtonImageOptions1.SvgImageSize = new System.Drawing.Size(16, 16);
+ this.EditSearch.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.EditSearch.Properties.NullValuePrompt = "输入序号/设备编号/设备名称/备注 查询";
+ this.EditSearch.Size = new System.Drawing.Size(320, 26);
+ this.EditSearch.TabIndex = 5;
+ //
+ // stackPanel1
+ //
+ stackPanel1.Controls.Add(this.btn_Add);
+ stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+ stackPanel1.Location = new System.Drawing.Point(0, 0);
+ stackPanel1.Margin = new System.Windows.Forms.Padding(0);
+ stackPanel1.Name = "stackPanel1";
+ stackPanel1.Size = new System.Drawing.Size(1191, 48);
+ stackPanel1.TabIndex = 2;
+ //
+ // btn_Add
+ //
+ this.btn_Add.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Add.Appearance.Options.UseFont = true;
+ this.btn_Add.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Add.AppearanceDisabled.Options.UseFont = true;
+ this.btn_Add.AppearanceHovered.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Add.AppearanceHovered.Options.UseFont = true;
+ this.btn_Add.AppearancePressed.Font = new System.Drawing.Font("Tahoma", 12F);
+ this.btn_Add.AppearancePressed.Options.UseFont = true;
+ this.btn_Add.AutoSize = true;
+ this.btn_Add.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Add.ImageOptions.Image")));
+ this.btn_Add.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
+ this.btn_Add.Location = new System.Drawing.Point(3, 2);
+ this.btn_Add.Name = "btn_Add";
+ this.btn_Add.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light;
+ this.btn_Add.Size = new System.Drawing.Size(58, 43);
+ this.btn_Add.TabIndex = 0;
+ this.btn_Add.Text = "新增";
+ this.btn_Add.Click += new System.EventHandler(this.btn_Add_Click);
+ //
// gridControl1
//
tableLayoutPanel1.SetColumnSpan(this.gridControl1, 2);
@@ -128,7 +210,7 @@ namespace DeviceRepairAndOptimization.Pages
this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.Operations,
this.btn_DeviceOperations});
- this.gridControl1.Size = new System.Drawing.Size(1848, 846);
+ this.gridControl1.Size = new System.Drawing.Size(1635, 884);
this.gridControl1.TabIndex = 1;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -450,12 +532,12 @@ namespace DeviceRepairAndOptimization.Pages
// btn_DeviceOperations
//
this.btn_DeviceOperations.AutoHeight = false;
- editorButtonImageOptions5.Image = global::DeviceRepairAndOptimization.Properties.Resources.edit_16x161;
- editorButtonImageOptions5.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
- editorButtonImageOptions11.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions2.Image = global::DeviceRepairAndOptimization.Properties.Resources.edit_16x161;
+ editorButtonImageOptions2.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions3.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
this.btn_DeviceOperations.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "编辑", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", "edit", null, DevExpress.Utils.ToolTipAnchor.Default),
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "维修记录", -1, true, false, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", "logs", null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "编辑", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", "edit", null, DevExpress.Utils.ToolTipAnchor.Default),
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "维修记录", -1, true, false, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", "logs", null, DevExpress.Utils.ToolTipAnchor.Default)});
this.btn_DeviceOperations.Name = "btn_DeviceOperations";
this.btn_DeviceOperations.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.btn_DeviceOperations.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.btn_DeviceOperation_ButtonClick);
@@ -463,96 +545,14 @@ namespace DeviceRepairAndOptimization.Pages
// Operations
//
this.Operations.AutoHeight = false;
- editorButtonImageOptions12.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
- editorButtonImageOptions13.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions4.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions5.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
this.Operations.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "编辑", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "禁用 / 启用", -1, true, true, false, editorButtonImageOptions13, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject49, serializableAppearanceObject50, serializableAppearanceObject51, serializableAppearanceObject52, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "编辑", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "禁用 / 启用", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.Operations.Name = "Operations";
this.Operations.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
- // flowLayoutPanel1
- //
- flowLayoutPanel1.Controls.Add(this.btn_Filter);
- flowLayoutPanel1.Controls.Add(this.EditSearch);
- flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- flowLayoutPanel1.Location = new System.Drawing.Point(1404, 0);
- flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
- flowLayoutPanel1.Name = "flowLayoutPanel1";
- flowLayoutPanel1.Padding = new System.Windows.Forms.Padding(7);
- flowLayoutPanel1.Size = new System.Drawing.Size(450, 48);
- flowLayoutPanel1.TabIndex = 0;
- //
- // btn_Filter
- //
- this.btn_Filter.Anchor = System.Windows.Forms.AnchorStyles.Right;
- this.btn_Filter.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Filter.Appearance.Options.UseFont = true;
- this.btn_Filter.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Filter.AppearanceDisabled.Options.UseFont = true;
- this.btn_Filter.AppearanceHovered.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Filter.AppearanceHovered.Options.UseFont = true;
- this.btn_Filter.AppearancePressed.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Filter.AppearancePressed.Options.UseFont = true;
- this.btn_Filter.Location = new System.Drawing.Point(376, 11);
- this.btn_Filter.Name = "btn_Filter";
- this.btn_Filter.Size = new System.Drawing.Size(57, 26);
- this.btn_Filter.TabIndex = 11;
- this.btn_Filter.Text = "搜索";
- this.btn_Filter.Click += new System.EventHandler(this.btn_Filter_Click);
- //
- // EditSearch
- //
- this.EditSearch.Location = new System.Drawing.Point(49, 11);
- this.EditSearch.Margin = new System.Windows.Forms.Padding(4);
- this.EditSearch.Name = "EditSearch";
- this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
- this.EditSearch.Properties.Appearance.Options.UseFont = true;
- this.EditSearch.Properties.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
- this.EditSearch.Properties.AppearanceDisabled.Options.UseFont = true;
- this.EditSearch.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F);
- this.EditSearch.Properties.AppearanceFocused.Options.UseFont = true;
- this.EditSearch.Properties.AppearanceReadOnly.Font = new System.Drawing.Font("Tahoma", 12F);
- this.EditSearch.Properties.AppearanceReadOnly.Options.UseFont = true;
- this.EditSearch.Properties.AutoHeight = false;
- editorButtonImageOptions14.SvgImageSize = new System.Drawing.Size(16, 16);
- this.EditSearch.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions14, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject53, serializableAppearanceObject54, serializableAppearanceObject55, serializableAppearanceObject56, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.EditSearch.Properties.NullValuePrompt = "输入序号/设备编号/设备名称/备注 查询";
- this.EditSearch.Size = new System.Drawing.Size(320, 26);
- this.EditSearch.TabIndex = 5;
- //
- // stackPanel1
- //
- stackPanel1.Controls.Add(this.btn_Add);
- stackPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
- stackPanel1.Location = new System.Drawing.Point(0, 0);
- stackPanel1.Margin = new System.Windows.Forms.Padding(0);
- stackPanel1.Name = "stackPanel1";
- stackPanel1.Size = new System.Drawing.Size(1404, 48);
- stackPanel1.TabIndex = 2;
- //
- // btn_Add
- //
- this.btn_Add.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Add.Appearance.Options.UseFont = true;
- this.btn_Add.AppearanceDisabled.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Add.AppearanceDisabled.Options.UseFont = true;
- this.btn_Add.AppearanceHovered.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Add.AppearanceHovered.Options.UseFont = true;
- this.btn_Add.AppearancePressed.Font = new System.Drawing.Font("Tahoma", 12F);
- this.btn_Add.AppearancePressed.Options.UseFont = true;
- this.btn_Add.AutoSize = true;
- this.btn_Add.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btn_Add.ImageOptions.Image")));
- this.btn_Add.ImageOptions.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.TopCenter;
- this.btn_Add.Location = new System.Drawing.Point(3, 2);
- this.btn_Add.Name = "btn_Add";
- this.btn_Add.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light;
- this.btn_Add.Size = new System.Drawing.Size(58, 43);
- this.btn_Add.TabIndex = 0;
- this.btn_Add.Text = "新增";
- this.btn_Add.Click += new System.EventHandler(this.btn_Add_Click);
- //
// splashScreenManager1
//
this.splashScreenManager1.ClosingDelay = 500;
@@ -560,21 +560,21 @@ namespace DeviceRepairAndOptimization.Pages
// page_DriveListInfo
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(1854, 900);
+ this.ClientSize = new System.Drawing.Size(1641, 938);
this.Controls.Add(tableLayoutPanel1);
this.Name = "page_DriveListInfo";
this.Text = "page_DriveListInfo";
this.Load += new System.EventHandler(this.page_DriveListInfo_Load);
tableLayoutPanel1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.btn_DeviceOperations)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.Operations)).EndInit();
flowLayoutPanel1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.EditSearch.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(stackPanel1)).EndInit();
stackPanel1.ResumeLayout(false);
stackPanel1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.btn_DeviceOperations)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.Operations)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.Designer.cs b/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.Designer.cs
index 297fa4d..807dc2d 100644
--- a/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.Designer.cs
+++ b/DeviceRepairAndOptimization/Pages/FormVersion/page_FormVersion.Designer.cs
@@ -30,27 +30,27 @@ namespace DeviceRepairAndOptimization.Pages
private void InitializeComponent()
{
System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1;
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.Layout.StackPanel stackPanel1;
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(page_FormVersion));
this.gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -99,7 +99,7 @@ namespace DeviceRepairAndOptimization.Pages
tableLayoutPanel1.RowCount = 2;
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- tableLayoutPanel1.Size = new System.Drawing.Size(1854, 900);
+ tableLayoutPanel1.Size = new System.Drawing.Size(471, 900);
tableLayoutPanel1.TabIndex = 0;
//
// gridControl1
@@ -111,7 +111,7 @@ namespace DeviceRepairAndOptimization.Pages
this.gridControl1.Name = "gridControl1";
this.gridControl1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.Operations});
- this.gridControl1.Size = new System.Drawing.Size(1848, 846);
+ this.gridControl1.Size = new System.Drawing.Size(465, 846);
this.gridControl1.TabIndex = 1;
this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -268,13 +268,13 @@ namespace DeviceRepairAndOptimization.Pages
// Operations
//
this.Operations.AutoHeight = false;
- editorButtonImageOptions1.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
- editorButtonImageOptions2.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
- editorButtonImageOptions3.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions5.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions6.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
+ editorButtonImageOptions7.Location = DevExpress.XtraEditors.ImageLocation.MiddleLeft;
this.Operations.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "编辑", 30, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "禁用 / 启用", 80, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绑定到设备", 100, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "编辑", 30, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "禁用 / 启用", 80, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default),
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绑定到设备", 100, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.Operations.Name = "Operations";
this.Operations.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -283,7 +283,7 @@ namespace DeviceRepairAndOptimization.Pages
flowLayoutPanel1.Controls.Add(this.btn_Filter);
flowLayoutPanel1.Controls.Add(this.EditSearch);
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- flowLayoutPanel1.Location = new System.Drawing.Point(1454, 0);
+ flowLayoutPanel1.Location = new System.Drawing.Point(71, 0);
flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
flowLayoutPanel1.Name = "flowLayoutPanel1";
flowLayoutPanel1.Size = new System.Drawing.Size(400, 48);
@@ -310,9 +310,9 @@ namespace DeviceRepairAndOptimization.Pages
this.EditSearch.Properties.AppearanceFocused.Font = new System.Drawing.Font("Tahoma", 12F);
this.EditSearch.Properties.AppearanceFocused.Options.UseFont = true;
this.EditSearch.Properties.AutoHeight = false;
- editorButtonImageOptions4.SvgImageSize = new System.Drawing.Size(16, 16);
+ editorButtonImageOptions8.SvgImageSize = new System.Drawing.Size(16, 16);
this.EditSearch.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.EditSearch.Properties.NullValuePrompt = "输入文档名称/编号/说明 查询";
this.EditSearch.Size = new System.Drawing.Size(320, 26);
this.EditSearch.TabIndex = 5;
@@ -329,7 +329,7 @@ namespace DeviceRepairAndOptimization.Pages
stackPanel1.Location = new System.Drawing.Point(0, 0);
stackPanel1.Margin = new System.Windows.Forms.Padding(0);
stackPanel1.Name = "stackPanel1";
- stackPanel1.Size = new System.Drawing.Size(1454, 48);
+ stackPanel1.Size = new System.Drawing.Size(71, 48);
stackPanel1.TabIndex = 2;
//
// btn_Add
@@ -396,7 +396,7 @@ namespace DeviceRepairAndOptimization.Pages
//
this.AcceptButton = this.btn_Filter;
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(1854, 900);
+ this.ClientSize = new System.Drawing.Size(471, 900);
this.Controls.Add(tableLayoutPanel1);
this.DoubleBuffered = true;
this.Font = new System.Drawing.Font("Verdana", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
diff --git a/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs b/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs
index 0f0be6f..c52cafd 100644
--- a/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs
+++ b/DeviceRepairAndOptimization/Pages/Maintain/pageMaintainEdit.cs
@@ -98,6 +98,11 @@ namespace DeviceRepairAndOptimization.Pages.Maintain
get { return (bool)ckbIsDown.EditValue; }
}
+ public pageMaintainEdit() : this(null)
+ {
+
+ }
+
public pageMaintainEdit(DeviceWarrantyRequestFormView qequestForm)
{
InitializeComponent();
diff --git a/DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.Designer.cs b/DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.Designer.cs
index db247d1..3d5aeb3 100644
--- a/DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.Designer.cs
+++ b/DeviceRepairAndOptimization/Pages/Plan/page_MaintenancePlan.Designer.cs
@@ -99,10 +99,10 @@ namespace DeviceRepairAndOptimization.Pages
flowLayoutPanel1.Controls.Add(this.EditSearch);
flowLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill;
flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
- flowLayoutPanel1.Location = new System.Drawing.Point(965, 0);
+ flowLayoutPanel1.Location = new System.Drawing.Point(648, 0);
flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0);
flowLayoutPanel1.Name = "flowLayoutPanel1";
- flowLayoutPanel1.Size = new System.Drawing.Size(477, 48);
+ flowLayoutPanel1.Size = new System.Drawing.Size(320, 48);
flowLayoutPanel1.TabIndex = 1;
//
// btn_Filter
@@ -110,7 +110,7 @@ namespace DeviceRepairAndOptimization.Pages
this.btn_Filter.Anchor = System.Windows.Forms.AnchorStyles.Right;
this.btn_Filter.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
this.btn_Filter.Appearance.Options.UseFont = true;
- this.btn_Filter.Location = new System.Drawing.Point(417, 7);
+ this.btn_Filter.Location = new System.Drawing.Point(260, 3);
this.btn_Filter.Name = "btn_Filter";
this.btn_Filter.Size = new System.Drawing.Size(57, 31);
this.btn_Filter.TabIndex = 10;
@@ -119,7 +119,7 @@ namespace DeviceRepairAndOptimization.Pages
//
// EditSearch
//
- this.EditSearch.Location = new System.Drawing.Point(109, 7);
+ this.EditSearch.Location = new System.Drawing.Point(15, 44);
this.EditSearch.Margin = new System.Windows.Forms.Padding(5, 7, 5, 7);
this.EditSearch.Name = "EditSearch";
this.EditSearch.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
@@ -243,18 +243,18 @@ namespace DeviceRepairAndOptimization.Pages
tableLayoutPanel2.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 50F));
tableLayoutPanel2.Controls.Add(this.EditYear, 1, 0);
tableLayoutPanel2.Dock = System.Windows.Forms.DockStyle.Fill;
- tableLayoutPanel2.Location = new System.Drawing.Point(478, 3);
+ tableLayoutPanel2.Location = new System.Drawing.Point(322, 3);
tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.RowCount = 1;
tableLayoutPanel2.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- tableLayoutPanel2.Size = new System.Drawing.Size(484, 42);
+ tableLayoutPanel2.Size = new System.Drawing.Size(323, 42);
tableLayoutPanel2.TabIndex = 4;
//
// EditYear
//
this.EditYear.Dock = System.Windows.Forms.DockStyle.Fill;
this.EditYear.EditValue = null;
- this.EditYear.Location = new System.Drawing.Point(120, 3);
+ this.EditYear.Location = new System.Drawing.Point(39, 3);
this.EditYear.Name = "EditYear";
this.EditYear.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F);
this.EditYear.Properties.Appearance.Options.UseFont = true;
@@ -280,7 +280,7 @@ namespace DeviceRepairAndOptimization.Pages
this.tb_pnl_Content.RowCount = 2;
this.tb_pnl_Content.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 48F));
this.tb_pnl_Content.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tb_pnl_Content.Size = new System.Drawing.Size(1442, 931);
+ this.tb_pnl_Content.Size = new System.Drawing.Size(968, 931);
this.tb_pnl_Content.TabIndex = 0;
//
// panel1
@@ -291,7 +291,7 @@ namespace DeviceRepairAndOptimization.Pages
this.panel1.Location = new System.Drawing.Point(0, 0);
this.panel1.Margin = new System.Windows.Forms.Padding(0);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(1442, 48);
+ this.panel1.Size = new System.Drawing.Size(968, 48);
this.panel1.TabIndex = 0;
//
// tableLayoutPanel1
@@ -309,7 +309,7 @@ namespace DeviceRepairAndOptimization.Pages
this.tableLayoutPanel1.Name = "tableLayoutPanel1";
this.tableLayoutPanel1.RowCount = 1;
this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
- this.tableLayoutPanel1.Size = new System.Drawing.Size(1442, 48);
+ this.tableLayoutPanel1.Size = new System.Drawing.Size(968, 48);
this.tableLayoutPanel1.TabIndex = 1;
//
// gridControl
@@ -627,7 +627,7 @@ namespace DeviceRepairAndOptimization.Pages
this.contextMenuStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.toolStripMenuItem1});
this.contextMenuStrip1.Name = "contextMenuStrip1";
- this.contextMenuStrip1.Size = new System.Drawing.Size(173, 26);
+ this.contextMenuStrip1.Size = new System.Drawing.Size(173, 48);
//
// toolStripMenuItem1
//
@@ -643,7 +643,7 @@ namespace DeviceRepairAndOptimization.Pages
// page_MaintenancePlan
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
- this.ClientSize = new System.Drawing.Size(1442, 931);
+ this.ClientSize = new System.Drawing.Size(968, 931);
this.Controls.Add(this.tb_pnl_Content);
this.DoubleBuffered = true;
this.Name = "page_MaintenancePlan";