Browse Source

Merge branch 'master' of http://139.155.15.221:3000/zoulei/DW5S

gongqiuhong 5 months ago
parent
commit
14ab236655

+ 240 - 261
DW5S.App/UserControl/CtrlCgRes.Designer.cs

@@ -29,321 +29,300 @@ namespace DW5S.App.UserControl
         /// </summary>
         private void InitializeComponent()
         {
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.gridCg = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.txtTimeCho = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            this.txtStartTime = new DevExpress.XtraEditors.DateEdit();
-            this.txtEndTime = new DevExpress.XtraEditors.DateEdit();
-            this.btnSearch = new DevExpress.XtraEditors.SimpleButton();
-            this.txtTask = new DevExpress.XtraEditors.SearchLookUpEdit();
-            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemStart = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemEnd = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.btnDraw = new DevExpress.XtraEditors.SimpleButton();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gridCg)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTimeCho.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTask.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemStart)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemEnd)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            this.SuspendLayout();
+            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            gridCg = new DevExpress.XtraGrid.GridControl();
+            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            txtTimeCho = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            txtStartTime = new DevExpress.XtraEditors.DateEdit();
+            txtEndTime = new DevExpress.XtraEditors.DateEdit();
+            btnSearch = new DevExpress.XtraEditors.SimpleButton();
+            txtTask = new DevExpress.XtraEditors.SearchLookUpEdit();
+            searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            btnDraw = new DevExpress.XtraEditors.SimpleButton();
+            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            itemStart = new DevExpress.XtraLayout.LayoutControlItem();
+            itemEnd = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+            layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)gridCg).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtTimeCho.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties.CalendarTimeProperties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties.CalendarTimeProperties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtTask.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)itemStart).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)itemEnd).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
+            SuspendLayout();
             // 
             // layoutControl1
             // 
-            this.layoutControl1.Controls.Add(this.gridCg);
-            this.layoutControl1.Controls.Add(this.txtTimeCho);
-            this.layoutControl1.Controls.Add(this.txtStartTime);
-            this.layoutControl1.Controls.Add(this.txtEndTime);
-            this.layoutControl1.Controls.Add(this.btnSearch);
-            this.layoutControl1.Controls.Add(this.txtTask);
-            this.layoutControl1.Controls.Add(this.btnDraw);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(1200, 465);
-            this.layoutControl1.TabIndex = 7;
-            this.layoutControl1.Text = "layoutControl2";
+            layoutControl1.Controls.Add(gridCg);
+            layoutControl1.Controls.Add(txtTimeCho);
+            layoutControl1.Controls.Add(txtStartTime);
+            layoutControl1.Controls.Add(txtEndTime);
+            layoutControl1.Controls.Add(btnSearch);
+            layoutControl1.Controls.Add(txtTask);
+            layoutControl1.Controls.Add(btnDraw);
+            layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            layoutControl1.Location = new System.Drawing.Point(0, 0);
+            layoutControl1.Name = "layoutControl1";
+            layoutControl1.Root = layoutControlGroup1;
+            layoutControl1.Size = new System.Drawing.Size(1200, 465);
+            layoutControl1.TabIndex = 7;
+            layoutControl1.Text = "layoutControl2";
             // 
             // gridCg
             // 
-            this.gridCg.Location = new System.Drawing.Point(2, 26);
-            this.gridCg.MainView = this.gridView1;
-            this.gridCg.Name = "gridCg";
-            this.gridCg.Size = new System.Drawing.Size(1196, 437);
-            this.gridCg.TabIndex = 4;
-            this.gridCg.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
+            gridCg.Location = new System.Drawing.Point(2, 26);
+            gridCg.MainView = gridView1;
+            gridCg.Name = "gridCg";
+            gridCg.Size = new System.Drawing.Size(1196, 437);
+            gridCg.TabIndex = 4;
+            gridCg.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
             // 
             // gridView1
             // 
-            this.gridView1.GridControl = this.gridCg;
-            this.gridView1.Name = "gridView1";
+            gridView1.GridControl = gridCg;
+            gridView1.Name = "gridView1";
             // 
             // txtTimeCho
             // 
-            this.txtTimeCho.EditValue = 1;
-            this.txtTimeCho.Location = new System.Drawing.Point(319, 4);
-            this.txtTimeCho.Name = "txtTimeCho";
-            this.txtTimeCho.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTimeCho.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1小时", 1, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近6小时", 6, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近12小时", 12, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1天", 24, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近3天", 72, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("自定义", 0, -1)});
-            this.txtTimeCho.Size = new System.Drawing.Size(99, 20);
-            this.txtTimeCho.StyleController = this.layoutControl1;
-            this.txtTimeCho.TabIndex = 11;
-            this.txtTimeCho.SelectedIndexChanged += new System.EventHandler(this.txtTimeCho_SelectedIndexChanged);
+            txtTimeCho.EditValue = 1;
+            txtTimeCho.Location = new System.Drawing.Point(315, 2);
+            txtTimeCho.Name = "txtTimeCho";
+            txtTimeCho.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtTimeCho.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] { new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1小时", 1, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近6小时", 6, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近12小时", 12, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1天", 24, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近3天", 72, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("自定义", 0, -1) });
+            txtTimeCho.Size = new System.Drawing.Size(103, 20);
+            txtTimeCho.StyleController = layoutControl1;
+            txtTimeCho.TabIndex = 11;
+            txtTimeCho.SelectedIndexChanged += txtTimeCho_SelectedIndexChanged;
             // 
             // txtStartTime
             // 
-            this.txtStartTime.EditValue = null;
-            this.txtStartTime.Location = new System.Drawing.Point(489, 4);
-            this.txtStartTime.Name = "txtStartTime";
-            this.txtStartTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtStartTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtStartTime.Size = new System.Drawing.Size(199, 20);
-            this.txtStartTime.StyleController = this.layoutControl1;
-            this.txtStartTime.TabIndex = 7;
+            txtStartTime.EditValue = null;
+            txtStartTime.Location = new System.Drawing.Point(485, 2);
+            txtStartTime.Name = "txtStartTime";
+            txtStartTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtStartTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtStartTime.Size = new System.Drawing.Size(203, 20);
+            txtStartTime.StyleController = layoutControl1;
+            txtStartTime.TabIndex = 7;
             // 
             // txtEndTime
             // 
-            this.txtEndTime.EditValue = null;
-            this.txtEndTime.Location = new System.Drawing.Point(759, 4);
-            this.txtEndTime.Name = "txtEndTime";
-            this.txtEndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtEndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtEndTime.Size = new System.Drawing.Size(199, 20);
-            this.txtEndTime.StyleController = this.layoutControl1;
-            this.txtEndTime.TabIndex = 8;
+            txtEndTime.EditValue = null;
+            txtEndTime.Location = new System.Drawing.Point(755, 2);
+            txtEndTime.Name = "txtEndTime";
+            txtEndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtEndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtEndTime.Size = new System.Drawing.Size(203, 20);
+            txtEndTime.StyleController = layoutControl1;
+            txtEndTime.TabIndex = 8;
             // 
             // btnSearch
             // 
-            this.btnSearch.Location = new System.Drawing.Point(962, 2);
-            this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(86, 20);
-            this.btnSearch.StyleController = this.layoutControl1;
-            this.btnSearch.TabIndex = 9;
-            this.btnSearch.Text = "查询";
-            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            btnSearch.Location = new System.Drawing.Point(962, 2);
+            btnSearch.MaximumSize = new System.Drawing.Size(0, 21);
+            btnSearch.MinimumSize = new System.Drawing.Size(0, 21);
+            btnSearch.Name = "btnSearch";
+            btnSearch.Size = new System.Drawing.Size(86, 21);
+            btnSearch.StyleController = layoutControl1;
+            btnSearch.TabIndex = 9;
+            btnSearch.Text = "查询";
+            btnSearch.Click += btnSearch_Click;
             // 
             // txtTask
             // 
-            this.txtTask.EditValue = 1;
-            this.txtTask.Location = new System.Drawing.Point(35, 4);
-            this.txtTask.Name = "txtTask";
-            this.txtTask.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTask.Properties.NullText = "";
-            this.txtTask.Properties.PopupSizeable = false;
-            this.txtTask.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtTask.Size = new System.Drawing.Size(213, 20);
-            this.txtTask.StyleController = this.layoutControl1;
-            this.txtTask.TabIndex = 11;
+            txtTask.EditValue = 1;
+            txtTask.Location = new System.Drawing.Point(31, 2);
+            txtTask.Name = "txtTask";
+            txtTask.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtTask.Properties.NullText = "";
+            txtTask.Properties.PopupSizeable = false;
+            txtTask.Properties.PopupView = searchLookUpEdit1View;
+            txtTask.Size = new System.Drawing.Size(217, 20);
+            txtTask.StyleController = layoutControl1;
+            txtTask.TabIndex = 11;
             // 
             // searchLookUpEdit1View
             // 
-            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
-            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            // 
+            // btnDraw
+            // 
+            btnDraw.Location = new System.Drawing.Point(1052, 2);
+            btnDraw.MaximumSize = new System.Drawing.Size(0, 21);
+            btnDraw.MinimumSize = new System.Drawing.Size(0, 21);
+            btnDraw.Name = "btnDraw";
+            btnDraw.Size = new System.Drawing.Size(86, 21);
+            btnDraw.StyleController = layoutControl1;
+            btnDraw.TabIndex = 9;
+            btnDraw.Text = "绘图";
+            btnDraw.Click += btnDraw_Click;
             // 
             // layoutControlGroup1
             // 
-            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup1.GroupBordersVisible = false;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem2,
-            this.layoutControlItem3,
-            this.itemStart,
-            this.itemEnd,
-            this.layoutControlItem6,
-            this.layoutControlItem1,
-            this.layoutControlItem4});
-            this.layoutControlGroup1.Name = "Root";
-            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1200, 465);
-            this.layoutControlGroup1.TextVisible = false;
+            layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            layoutControlGroup1.GroupBordersVisible = false;
+            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, itemStart, itemEnd, layoutControlItem6, layoutControlItem1, layoutControlItem4 });
+            layoutControlGroup1.Name = "Root";
+            layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup1.Size = new System.Drawing.Size(1200, 465);
+            layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.gridCg;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(1200, 441);
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
+            layoutControlItem2.Control = gridCg;
+            layoutControlItem2.Location = new System.Drawing.Point(0, 24);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new System.Drawing.Size(1200, 441);
+            layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem2.TextVisible = false;
             // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txtTimeCho;
-            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem3.CustomizationFormText = "时间选择";
-            this.layoutControlItem3.Location = new System.Drawing.Point(250, 0);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(170, 24);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(170, 24);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(170, 24);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem3.Text = "时间选择";
-            this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
-            this.layoutControlItem3.TextToControlDistance = 5;
+            layoutControlItem3.Control = txtTimeCho;
+            layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem3.CustomizationFormText = "时间选择";
+            layoutControlItem3.Location = new System.Drawing.Point(250, 0);
+            layoutControlItem3.MaxSize = new System.Drawing.Size(170, 24);
+            layoutControlItem3.MinSize = new System.Drawing.Size(170, 24);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
+            layoutControlItem3.Size = new System.Drawing.Size(170, 24);
+            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem3.Text = "时间选择";
+            layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
+            layoutControlItem3.TextToControlDistance = 5;
             // 
             // itemStart
             // 
-            this.itemStart.Control = this.txtStartTime;
-            this.itemStart.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.itemStart.CustomizationFormText = "开始时间";
-            this.itemStart.Location = new System.Drawing.Point(420, 0);
-            this.itemStart.MaxSize = new System.Drawing.Size(270, 24);
-            this.itemStart.MinSize = new System.Drawing.Size(270, 24);
-            this.itemStart.Name = "itemStart";
-            this.itemStart.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
-            this.itemStart.Size = new System.Drawing.Size(270, 24);
-            this.itemStart.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemStart.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.itemStart.Text = "开始时间";
-            this.itemStart.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.itemStart.TextSize = new System.Drawing.Size(48, 14);
-            this.itemStart.TextToControlDistance = 5;
-            this.itemStart.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            itemStart.Control = txtStartTime;
+            itemStart.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            itemStart.CustomizationFormText = "开始时间";
+            itemStart.Location = new System.Drawing.Point(420, 0);
+            itemStart.MaxSize = new System.Drawing.Size(270, 24);
+            itemStart.MinSize = new System.Drawing.Size(270, 24);
+            itemStart.Name = "itemStart";
+            itemStart.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
+            itemStart.Size = new System.Drawing.Size(270, 24);
+            itemStart.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            itemStart.Text = "开始时间";
+            itemStart.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            itemStart.TextSize = new System.Drawing.Size(48, 14);
+            itemStart.TextToControlDistance = 5;
+            itemStart.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // itemEnd
             // 
-            this.itemEnd.Control = this.txtEndTime;
-            this.itemEnd.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.itemEnd.CustomizationFormText = "结束时间";
-            this.itemEnd.Location = new System.Drawing.Point(690, 0);
-            this.itemEnd.MaxSize = new System.Drawing.Size(270, 24);
-            this.itemEnd.MinSize = new System.Drawing.Size(270, 24);
-            this.itemEnd.Name = "itemEnd";
-            this.itemEnd.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
-            this.itemEnd.Size = new System.Drawing.Size(270, 24);
-            this.itemEnd.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemEnd.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.itemEnd.Text = "结束时间";
-            this.itemEnd.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.itemEnd.TextSize = new System.Drawing.Size(48, 14);
-            this.itemEnd.TextToControlDistance = 5;
-            this.itemEnd.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            itemEnd.Control = txtEndTime;
+            itemEnd.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            itemEnd.CustomizationFormText = "结束时间";
+            itemEnd.Location = new System.Drawing.Point(690, 0);
+            itemEnd.MaxSize = new System.Drawing.Size(270, 24);
+            itemEnd.MinSize = new System.Drawing.Size(270, 24);
+            itemEnd.Name = "itemEnd";
+            itemEnd.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
+            itemEnd.Size = new System.Drawing.Size(270, 24);
+            itemEnd.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            itemEnd.Text = "结束时间";
+            itemEnd.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            itemEnd.TextSize = new System.Drawing.Size(48, 14);
+            itemEnd.TextToControlDistance = 5;
+            itemEnd.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.btnSearch;
-            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem6.CustomizationFormText = "layoutControlItemSearch";
-            this.layoutControlItem6.Location = new System.Drawing.Point(960, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Text = "layoutControlItemSearch";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
+            layoutControlItem6.Control = btnSearch;
+            layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem6.CustomizationFormText = "layoutControlItemSearch";
+            layoutControlItem6.Location = new System.Drawing.Point(960, 0);
+            layoutControlItem6.MaxSize = new System.Drawing.Size(90, 24);
+            layoutControlItem6.MinSize = new System.Drawing.Size(90, 24);
+            layoutControlItem6.Name = "layoutControlItem6";
+            layoutControlItem6.Size = new System.Drawing.Size(90, 24);
+            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem6.Text = "layoutControlItemSearch";
+            layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem6.TextVisible = false;
             // 
             // layoutControlItem1
             // 
-            this.layoutControlItem1.Control = this.txtTask;
-            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem1.CustomizationFormText = "时间选择";
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(250, 24);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(250, 24);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(250, 24);
-            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem1.Text = "任务";
-            this.layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(24, 14);
-            this.layoutControlItem1.TextToControlDistance = 5;
-            // 
-            // btnDraw
-            // 
-            this.btnDraw.Location = new System.Drawing.Point(1052, 2);
-            this.btnDraw.Name = "btnDraw";
-            this.btnDraw.Size = new System.Drawing.Size(86, 20);
-            this.btnDraw.StyleController = this.layoutControl1;
-            this.btnDraw.TabIndex = 9;
-            this.btnDraw.Text = "绘图";
-            this.btnDraw.Click += new System.EventHandler(this.btnDraw_Click);
+            layoutControlItem1.Control = txtTask;
+            layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem1.CustomizationFormText = "时间选择";
+            layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            layoutControlItem1.MaxSize = new System.Drawing.Size(250, 24);
+            layoutControlItem1.MinSize = new System.Drawing.Size(250, 24);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Size = new System.Drawing.Size(250, 24);
+            layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem1.Text = "任务";
+            layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            layoutControlItem1.TextSize = new System.Drawing.Size(24, 14);
+            layoutControlItem1.TextToControlDistance = 5;
             // 
             // layoutControlItem4
             // 
-            this.layoutControlItem4.Control = this.btnDraw;
-            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem4.CustomizationFormText = "layoutControlItemSearch";
-            this.layoutControlItem4.Location = new System.Drawing.Point(1050, 0);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(150, 24);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Text = "layoutControlItemSearch";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem4.TextVisible = false;
+            layoutControlItem4.Control = btnDraw;
+            layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem4.CustomizationFormText = "layoutControlItemSearch";
+            layoutControlItem4.Location = new System.Drawing.Point(1050, 0);
+            layoutControlItem4.MaxSize = new System.Drawing.Size(90, 24);
+            layoutControlItem4.MinSize = new System.Drawing.Size(90, 24);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Size = new System.Drawing.Size(150, 24);
+            layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem4.Text = "layoutControlItemSearch";
+            layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem4.TextVisible = false;
             // 
             // CtrlCgRes
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.layoutControl1);
-            this.Name = "CtrlCgRes";
-            this.Size = new System.Drawing.Size(1200, 465);
-            this.Load += new System.EventHandler(this.CtrlCgRes_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gridCg)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTimeCho.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTask.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemStart)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemEnd)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            this.ResumeLayout(false);
-
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(layoutControl1);
+            Name = "CtrlCgRes";
+            Size = new System.Drawing.Size(1200, 465);
+            Load += CtrlCgRes_Load;
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+            layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)gridCg).EndInit();
+            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtTimeCho.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties.CalendarTimeProperties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties.CalendarTimeProperties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtTask.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+            ((System.ComponentModel.ISupportInitialize)itemStart).EndInit();
+            ((System.ComponentModel.ISupportInitialize)itemEnd).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
+            ResumeLayout(false);
         }
 
         #endregion

+ 6 - 4
DW5S.App/UserControl/CtrlCgRes.cs

@@ -38,16 +38,18 @@ namespace DW5S.App.UserControl
         public CtrlCgRes()
         {
             InitializeComponent();
-            layoutControl1.UseDefault();
-            txtStartTime.UseDefault();
-            txtEndTime.UseDefault();
-            gridCg.UseDefault(list, showScrollH: true).UseDeleteAsync<CgRes>(DelCg);
+           
         }
 
         private async void CtrlCgRes_Load(object sender, EventArgs e)
         {
             try
             {
+                layoutControl1.UseDefault();
+                txtStartTime.UseDefault();
+                txtEndTime.UseDefault();
+                gridCg.UseDefault(list, showScrollH:true).UseMultiSelect().UseRowNumber().UseDeleteAsync<CgRes>(DelCg);
+
                 List<TaskInfo> tskList = new List<TaskInfo>();
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsTask = unitOfWork.Of<TaskInfo>();

+ 27 - 27
DW5S.App/UserControl/CtrlCgRes.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

+ 251 - 288
DW5S.App/UserControl/CtrlRefCgRes.Designer.cs

@@ -29,349 +29,313 @@ namespace DW5S.App.UserControl
         /// </summary>
         private void InitializeComponent()
         {
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.ctrlPaging = new DW5S.App.UserControl.CtrlPaging();
-            this.gridCg = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.txtTimeCho = new DevExpress.XtraEditors.ImageComboBoxEdit();
-            this.txtStartTime = new DevExpress.XtraEditors.DateEdit();
-            this.txtEndTime = new DevExpress.XtraEditors.DateEdit();
-            this.btnSearch = new DevExpress.XtraEditors.SimpleButton();
-            this.txtSat = new DevExpress.XtraEditors.SearchLookUpEdit();
-            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.btnDraw = new DevExpress.XtraEditors.SimpleButton();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemStart = new DevExpress.XtraLayout.LayoutControlItem();
-            this.itemEnd = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gridCg)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTimeCho.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSat.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemStart)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemEnd)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            this.SuspendLayout();
+            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            gridCg = new DevExpress.XtraGrid.GridControl();
+            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            txtTimeCho = new DevExpress.XtraEditors.ImageComboBoxEdit();
+            txtStartTime = new DevExpress.XtraEditors.DateEdit();
+            txtEndTime = new DevExpress.XtraEditors.DateEdit();
+            btnSearch = new DevExpress.XtraEditors.SimpleButton();
+            txtSat = new DevExpress.XtraEditors.SearchLookUpEdit();
+            searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            btnDraw = new DevExpress.XtraEditors.SimpleButton();
+            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            itemStart = new DevExpress.XtraLayout.LayoutControlItem();
+            itemEnd = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+            layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)gridCg).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtTimeCho.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties.CalendarTimeProperties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties.CalendarTimeProperties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)txtSat.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)itemStart).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)itemEnd).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
+            SuspendLayout();
             // 
             // layoutControl1
             // 
-            this.layoutControl1.Controls.Add(this.ctrlPaging);
-            this.layoutControl1.Controls.Add(this.gridCg);
-            this.layoutControl1.Controls.Add(this.txtTimeCho);
-            this.layoutControl1.Controls.Add(this.txtStartTime);
-            this.layoutControl1.Controls.Add(this.txtEndTime);
-            this.layoutControl1.Controls.Add(this.btnSearch);
-            this.layoutControl1.Controls.Add(this.txtSat);
-            this.layoutControl1.Controls.Add(this.btnDraw);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.Root = this.layoutControlGroup1;
-            this.layoutControl1.Size = new System.Drawing.Size(1200, 465);
-            this.layoutControl1.TabIndex = 7;
-            this.layoutControl1.Text = "layoutControl2";
-            // 
-            // ctrlPaging
-            // 
-            this.ctrlPaging.Location = new System.Drawing.Point(2, 431);
-            this.ctrlPaging.Name = "ctrlPaging";
-            this.ctrlPaging.Size = new System.Drawing.Size(1196, 32);
-            this.ctrlPaging.TabIndex = 12;
+            layoutControl1.Controls.Add(gridCg);
+            layoutControl1.Controls.Add(txtTimeCho);
+            layoutControl1.Controls.Add(txtStartTime);
+            layoutControl1.Controls.Add(txtEndTime);
+            layoutControl1.Controls.Add(btnSearch);
+            layoutControl1.Controls.Add(txtSat);
+            layoutControl1.Controls.Add(btnDraw);
+            layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            layoutControl1.Location = new System.Drawing.Point(0, 0);
+            layoutControl1.Name = "layoutControl1";
+            layoutControl1.Root = layoutControlGroup1;
+            layoutControl1.Size = new System.Drawing.Size(1200, 465);
+            layoutControl1.TabIndex = 7;
+            layoutControl1.Text = "layoutControl2";
             // 
             // gridCg
             // 
-            this.gridCg.Location = new System.Drawing.Point(2, 26);
-            this.gridCg.MainView = this.gridView1;
-            this.gridCg.Name = "gridCg";
-            this.gridCg.Size = new System.Drawing.Size(1196, 401);
-            this.gridCg.TabIndex = 4;
-            this.gridCg.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
+            gridCg.Location = new System.Drawing.Point(2, 26);
+            gridCg.MainView = gridView1;
+            gridCg.Name = "gridCg";
+            gridCg.Size = new System.Drawing.Size(1196, 437);
+            gridCg.TabIndex = 7;
+            gridCg.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
             // 
             // gridView1
             // 
-            this.gridView1.GridControl = this.gridCg;
-            this.gridView1.Name = "gridView1";
+            gridView1.GridControl = gridCg;
+            gridView1.Name = "gridView1";
             // 
             // txtTimeCho
             // 
-            this.txtTimeCho.EditValue = 1;
-            this.txtTimeCho.Location = new System.Drawing.Point(319, 4);
-            this.txtTimeCho.Name = "txtTimeCho";
-            this.txtTimeCho.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTimeCho.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] {
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1小时", 1, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近6小时", 6, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近12小时", 12, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1天", 24, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近3天", 72, -1),
-            new DevExpress.XtraEditors.Controls.ImageComboBoxItem("自定义", 0, -1)});
-            this.txtTimeCho.Size = new System.Drawing.Size(99, 20);
-            this.txtTimeCho.StyleController = this.layoutControl1;
-            this.txtTimeCho.TabIndex = 11;
-            this.txtTimeCho.SelectedIndexChanged += new System.EventHandler(this.txtTimeCho_SelectedIndexChanged);
+            txtTimeCho.EditValue = 1;
+            txtTimeCho.Location = new System.Drawing.Point(315, 2);
+            txtTimeCho.Name = "txtTimeCho";
+            txtTimeCho.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtTimeCho.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.ImageComboBoxItem[] { new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1小时", 1, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近6小时", 6, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近12小时", 12, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近1天", 24, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("最近3天", 72, -1), new DevExpress.XtraEditors.Controls.ImageComboBoxItem("自定义", 0, -1) });
+            txtTimeCho.Size = new System.Drawing.Size(103, 20);
+            txtTimeCho.StyleController = layoutControl1;
+            txtTimeCho.TabIndex = 2;
+            txtTimeCho.SelectedIndexChanged += txtTimeCho_SelectedIndexChanged;
             // 
             // txtStartTime
             // 
-            this.txtStartTime.EditValue = null;
-            this.txtStartTime.Location = new System.Drawing.Point(489, 4);
-            this.txtStartTime.Name = "txtStartTime";
-            this.txtStartTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtStartTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtStartTime.Size = new System.Drawing.Size(199, 20);
-            this.txtStartTime.StyleController = this.layoutControl1;
-            this.txtStartTime.TabIndex = 7;
+            txtStartTime.EditValue = null;
+            txtStartTime.Location = new System.Drawing.Point(485, 2);
+            txtStartTime.Name = "txtStartTime";
+            txtStartTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtStartTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtStartTime.Size = new System.Drawing.Size(203, 20);
+            txtStartTime.StyleController = layoutControl1;
+            txtStartTime.TabIndex = 3;
             // 
             // txtEndTime
             // 
-            this.txtEndTime.EditValue = null;
-            this.txtEndTime.Location = new System.Drawing.Point(759, 4);
-            this.txtEndTime.Name = "txtEndTime";
-            this.txtEndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtEndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtEndTime.Size = new System.Drawing.Size(199, 20);
-            this.txtEndTime.StyleController = this.layoutControl1;
-            this.txtEndTime.TabIndex = 8;
+            txtEndTime.EditValue = null;
+            txtEndTime.Location = new System.Drawing.Point(755, 2);
+            txtEndTime.Name = "txtEndTime";
+            txtEndTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtEndTime.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtEndTime.Size = new System.Drawing.Size(203, 20);
+            txtEndTime.StyleController = layoutControl1;
+            txtEndTime.TabIndex = 4;
             // 
             // btnSearch
             // 
-            this.btnSearch.Location = new System.Drawing.Point(966, 4);
-            this.btnSearch.MaximumSize = new System.Drawing.Size(0, 19);
-            this.btnSearch.MinimumSize = new System.Drawing.Size(0, 19);
-            this.btnSearch.Name = "btnSearch";
-            this.btnSearch.Size = new System.Drawing.Size(82, 19);
-            this.btnSearch.StyleController = this.layoutControl1;
-            this.btnSearch.TabIndex = 9;
-            this.btnSearch.Text = "查询";
-            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            btnSearch.Location = new System.Drawing.Point(962, 2);
+            btnSearch.MaximumSize = new System.Drawing.Size(0, 21);
+            btnSearch.MinimumSize = new System.Drawing.Size(0, 21);
+            btnSearch.Name = "btnSearch";
+            btnSearch.Size = new System.Drawing.Size(86, 21);
+            btnSearch.StyleController = layoutControl1;
+            btnSearch.TabIndex = 5;
+            btnSearch.Text = "查询";
+            btnSearch.Click += btnSearch_Click;
             // 
             // txtSat
             // 
-            this.txtSat.EditValue = 1;
-            this.txtSat.Location = new System.Drawing.Point(35, 4);
-            this.txtSat.Name = "txtSat";
-            this.txtSat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtSat.Properties.NullText = "";
-            this.txtSat.Properties.PopupSizeable = false;
-            this.txtSat.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtSat.Size = new System.Drawing.Size(213, 20);
-            this.txtSat.StyleController = this.layoutControl1;
-            this.txtSat.TabIndex = 11;
+            txtSat.EditValue = 1;
+            txtSat.Location = new System.Drawing.Point(31, 2);
+            txtSat.Name = "txtSat";
+            txtSat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtSat.Properties.NullText = "";
+            txtSat.Properties.PopupSizeable = false;
+            txtSat.Properties.PopupView = searchLookUpEdit1View;
+            txtSat.Size = new System.Drawing.Size(217, 20);
+            txtSat.StyleController = layoutControl1;
+            txtSat.TabIndex = 0;
             // 
             // searchLookUpEdit1View
             // 
-            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
-            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
             // btnDraw
             // 
-            this.btnDraw.Location = new System.Drawing.Point(1056, 4);
-            this.btnDraw.MaximumSize = new System.Drawing.Size(0, 19);
-            this.btnDraw.MinimumSize = new System.Drawing.Size(0, 19);
-            this.btnDraw.Name = "btnDraw";
-            this.btnDraw.Size = new System.Drawing.Size(82, 19);
-            this.btnDraw.StyleController = this.layoutControl1;
-            this.btnDraw.TabIndex = 9;
-            this.btnDraw.Text = "绘图";
-            this.btnDraw.Click += new System.EventHandler(this.btnDraw_Click);
+            btnDraw.Location = new System.Drawing.Point(1052, 2);
+            btnDraw.MaximumSize = new System.Drawing.Size(0, 21);
+            btnDraw.MinimumSize = new System.Drawing.Size(0, 21);
+            btnDraw.Name = "btnDraw";
+            btnDraw.Size = new System.Drawing.Size(86, 21);
+            btnDraw.StyleController = layoutControl1;
+            btnDraw.TabIndex = 6;
+            btnDraw.Text = "绘图";
+            btnDraw.Click += btnDraw_Click;
             // 
             // layoutControlGroup1
             // 
-            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup1.GroupBordersVisible = false;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem2,
-            this.layoutControlItem3,
-            this.itemStart,
-            this.itemEnd,
-            this.layoutControlItem6,
-            this.layoutControlItem1,
-            this.layoutControlItem4,
-            this.layoutControlItem5});
-            this.layoutControlGroup1.Name = "Root";
-            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1200, 465);
-            this.layoutControlGroup1.TextVisible = false;
+            layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            layoutControlGroup1.GroupBordersVisible = false;
+            layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, itemStart, itemEnd, layoutControlItem6, layoutControlItem1, layoutControlItem4, emptySpaceItem1 });
+            layoutControlGroup1.Name = "Root";
+            layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            layoutControlGroup1.Size = new System.Drawing.Size(1200, 465);
+            layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.gridCg;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(1200, 405);
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
+            layoutControlItem2.Control = gridCg;
+            layoutControlItem2.Location = new System.Drawing.Point(0, 24);
+            layoutControlItem2.MinSize = new System.Drawing.Size(104, 24);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new System.Drawing.Size(1200, 441);
+            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem2.TextVisible = false;
             // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txtTimeCho;
-            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem3.CustomizationFormText = "时间选择";
-            this.layoutControlItem3.Location = new System.Drawing.Point(250, 0);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(170, 24);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(170, 24);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
-            this.layoutControlItem3.Size = new System.Drawing.Size(170, 24);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem3.Text = "时间选择";
-            this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
-            this.layoutControlItem3.TextToControlDistance = 5;
+            layoutControlItem3.Control = txtTimeCho;
+            layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem3.CustomizationFormText = "时间选择";
+            layoutControlItem3.Location = new System.Drawing.Point(250, 0);
+            layoutControlItem3.MaxSize = new System.Drawing.Size(170, 24);
+            layoutControlItem3.MinSize = new System.Drawing.Size(170, 24);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
+            layoutControlItem3.Size = new System.Drawing.Size(170, 24);
+            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem3.Text = "时间选择";
+            layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
+            layoutControlItem3.TextToControlDistance = 5;
             // 
             // itemStart
             // 
-            this.itemStart.Control = this.txtStartTime;
-            this.itemStart.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.itemStart.CustomizationFormText = "开始时间";
-            this.itemStart.Location = new System.Drawing.Point(420, 0);
-            this.itemStart.MaxSize = new System.Drawing.Size(270, 24);
-            this.itemStart.MinSize = new System.Drawing.Size(270, 24);
-            this.itemStart.Name = "itemStart";
-            this.itemStart.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
-            this.itemStart.Size = new System.Drawing.Size(270, 24);
-            this.itemStart.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemStart.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.itemStart.Text = "开始时间";
-            this.itemStart.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.itemStart.TextSize = new System.Drawing.Size(48, 14);
-            this.itemStart.TextToControlDistance = 5;
-            this.itemStart.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            itemStart.Control = txtStartTime;
+            itemStart.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            itemStart.CustomizationFormText = "开始时间";
+            itemStart.Location = new System.Drawing.Point(420, 0);
+            itemStart.MaxSize = new System.Drawing.Size(270, 24);
+            itemStart.MinSize = new System.Drawing.Size(270, 24);
+            itemStart.Name = "itemStart";
+            itemStart.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
+            itemStart.Size = new System.Drawing.Size(270, 24);
+            itemStart.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            itemStart.Text = "开始时间";
+            itemStart.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            itemStart.TextSize = new System.Drawing.Size(48, 14);
+            itemStart.TextToControlDistance = 5;
+            itemStart.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // itemEnd
             // 
-            this.itemEnd.Control = this.txtEndTime;
-            this.itemEnd.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.itemEnd.CustomizationFormText = "结束时间";
-            this.itemEnd.Location = new System.Drawing.Point(690, 0);
-            this.itemEnd.MaxSize = new System.Drawing.Size(270, 24);
-            this.itemEnd.MinSize = new System.Drawing.Size(270, 24);
-            this.itemEnd.Name = "itemEnd";
-            this.itemEnd.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
-            this.itemEnd.Size = new System.Drawing.Size(270, 24);
-            this.itemEnd.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.itemEnd.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.itemEnd.Text = "结束时间";
-            this.itemEnd.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.itemEnd.TextSize = new System.Drawing.Size(48, 14);
-            this.itemEnd.TextToControlDistance = 5;
-            this.itemEnd.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+            itemEnd.Control = txtEndTime;
+            itemEnd.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            itemEnd.CustomizationFormText = "结束时间";
+            itemEnd.Location = new System.Drawing.Point(690, 0);
+            itemEnd.MaxSize = new System.Drawing.Size(270, 24);
+            itemEnd.MinSize = new System.Drawing.Size(270, 24);
+            itemEnd.Name = "itemEnd";
+            itemEnd.Padding = new DevExpress.XtraLayout.Utils.Padding(12, 2, 2, 2);
+            itemEnd.Size = new System.Drawing.Size(270, 24);
+            itemEnd.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            itemEnd.Text = "结束时间";
+            itemEnd.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            itemEnd.TextSize = new System.Drawing.Size(48, 14);
+            itemEnd.TextToControlDistance = 5;
+            itemEnd.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.btnSearch;
-            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem6.CustomizationFormText = "layoutControlItemSearch";
-            this.layoutControlItem6.Location = new System.Drawing.Point(960, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem6.Text = "layoutControlItemSearch";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
+            layoutControlItem6.Control = btnSearch;
+            layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem6.CustomizationFormText = "layoutControlItemSearch";
+            layoutControlItem6.Location = new System.Drawing.Point(960, 0);
+            layoutControlItem6.MaxSize = new System.Drawing.Size(90, 24);
+            layoutControlItem6.MinSize = new System.Drawing.Size(90, 24);
+            layoutControlItem6.Name = "layoutControlItem6";
+            layoutControlItem6.Size = new System.Drawing.Size(90, 24);
+            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem6.Text = "layoutControlItemSearch";
+            layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem6.TextVisible = false;
             // 
             // layoutControlItem1
             // 
-            this.layoutControlItem1.Control = this.txtSat;
-            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem1.CustomizationFormText = "时间选择";
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.MaxSize = new System.Drawing.Size(250, 24);
-            this.layoutControlItem1.MinSize = new System.Drawing.Size(250, 24);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(250, 24);
-            this.layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem1.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem1.Text = "卫星";
-            this.layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(24, 14);
-            this.layoutControlItem1.TextToControlDistance = 5;
+            layoutControlItem1.Control = txtSat;
+            layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem1.CustomizationFormText = "时间选择";
+            layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            layoutControlItem1.MaxSize = new System.Drawing.Size(250, 24);
+            layoutControlItem1.MinSize = new System.Drawing.Size(250, 24);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Size = new System.Drawing.Size(250, 24);
+            layoutControlItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem1.Text = "卫星";
+            layoutControlItem1.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            layoutControlItem1.TextSize = new System.Drawing.Size(24, 14);
+            layoutControlItem1.TextToControlDistance = 5;
             // 
             // layoutControlItem4
             // 
-            this.layoutControlItem4.Control = this.btnDraw;
-            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem4.CustomizationFormText = "layoutControlItemSearch";
-            this.layoutControlItem4.Location = new System.Drawing.Point(1050, 0);
-            this.layoutControlItem4.MaxSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(150, 24);
-            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem4.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem4.Text = "layoutControlItemSearch";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem4.TextVisible = false;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.ctrlPaging;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 429);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(1200, 36);
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem5.TextVisible = false;
+            layoutControlItem4.Control = btnDraw;
+            layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem4.CustomizationFormText = "layoutControlItemSearch";
+            layoutControlItem4.Location = new System.Drawing.Point(1050, 0);
+            layoutControlItem4.MaxSize = new System.Drawing.Size(90, 26);
+            layoutControlItem4.MinSize = new System.Drawing.Size(90, 24);
+            layoutControlItem4.Name = "layoutControlItem4";
+            layoutControlItem4.Size = new System.Drawing.Size(90, 24);
+            layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem4.Text = "layoutControlItemSearch";
+            layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem4.TextVisible = false;
+            // 
+            // emptySpaceItem1
+            // 
+            emptySpaceItem1.AllowHotTrack = false;
+            emptySpaceItem1.Location = new System.Drawing.Point(1140, 0);
+            emptySpaceItem1.Name = "emptySpaceItem1";
+            emptySpaceItem1.Size = new System.Drawing.Size(60, 24);
+            emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // CtrlRefCgRes
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.layoutControl1);
-            this.Name = "CtrlRefCgRes";
-            this.Size = new System.Drawing.Size(1200, 465);
-            this.Load += new System.EventHandler(this.CtrlRefCgRes_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gridCg)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtTimeCho.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txtSat.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemStart)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.itemEnd)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            this.ResumeLayout(false);
-
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(layoutControl1);
+            Name = "CtrlRefCgRes";
+            Size = new System.Drawing.Size(1200, 465);
+            Load += CtrlRefCgRes_Load;
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+            layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)gridCg).EndInit();
+            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtTimeCho.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties.CalendarTimeProperties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtStartTime.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties.CalendarTimeProperties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtEndTime.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)txtSat.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+            ((System.ComponentModel.ISupportInitialize)itemStart).EndInit();
+            ((System.ComponentModel.ISupportInitialize)itemEnd).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
+            ResumeLayout(false);
         }
 
         #endregion
@@ -393,7 +357,6 @@ namespace DW5S.App.UserControl
         private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
         private DevExpress.XtraEditors.SimpleButton btnDraw;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private CtrlPaging ctrlPaging;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
     }
 }

+ 23 - 20
DW5S.App/UserControl/CtrlRefCgRes.cs

@@ -1,5 +1,6 @@
 using DW5S.Entity;
 using DW5S.Repostory;
+using DW5S.ViewModel;
 using DxHelper;
 using ExtensionsDev;
 using Microsoft.EntityFrameworkCore;
@@ -9,40 +10,42 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using XdCxRhDW5S.ViewModel;
 
 namespace DW5S.App.UserControl
 {
     public partial class CtrlRefCgRes : DevExpress.XtraEditors.XtraUserControl
     {
-        List<RefCgRes> list = new List<RefCgRes>();
+        List<RefCgResViewModel> list = new List<RefCgResViewModel>();
         public CtrlRefCgRes()
         {
             InitializeComponent();
-            layoutControl1.UseDefault();
-            txtStartTime.UseDefault();
-            txtEndTime.UseDefault();
-            gridCg.UseDefault(list, showScrollH: true).UseDeleteAsync<RefCgRes>(DelCg);
         }
 
         private async void CtrlRefCgRes_Load(object sender, EventArgs e)
         {
             try
             {
-                List<SatInfo> satList = new List<SatInfo>();
 
+                layoutControl1.UseDefault();
+                txtStartTime.UseDefault();
+                txtEndTime.UseDefault();
+                gridCg.UseDefault(list).UseMultiSelect().UseRowNumber().UseDeleteAsync<RefCgResViewModel>(DelCg);
+
+                List<SatInfo> satList = new List<SatInfo>();
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsSat = unitOfWork.Of<SatInfo>();
                 satList.AddRange(await repsSat.GetAllAsync(p => p.UpdateTime));
 
-                this.txtSat.UseDefault().SetData(satList, nameof(SatInfo.Sat)).UseDoubleClickToSelectAll();
-                ctrlPaging.CurrentPageChanged += async (int currentPage) =>
-                {
+                this.txtSat.UseDefault().SetData(satList.To<List<SatViewModel>>(), nameof(SatViewModel.Sat)).UseDoubleClickToSelectAll();
+                //ctrlPaging.CurrentPageChanged += async (int currentPage) =>
+                //{
 
-                };
-                ctrlPaging.PageCountChanged += async (int pageCount) =>
-                {
+                //};
+                //ctrlPaging.PageCountChanged += async (int pageCount) =>
+                //{
 
-                };
+                //};
 
             }
             catch (Exception ex)
@@ -53,13 +56,13 @@ namespace DW5S.App.UserControl
             }
         }
 
-        private async Task<bool> DelCg(List<RefCgRes> selectedRes)
+        private async Task<bool> DelCg(List<RefCgResViewModel> selectedRes)
         {
             try
             {
                 var unitOfWork = IocContainer.UnitOfWork;
                 var repsCg = unitOfWork.OfLong<RefCgRes>();
-                await repsCg.DeleteAsync(selectedRes);
+                await repsCg.DeleteAsync(selectedRes.To<List<RefCgRes>>());
                 await unitOfWork.SaveAsync();
                 return true;
             }
@@ -119,7 +122,7 @@ namespace DW5S.App.UserControl
             gridView1.BestFitColumns();
             GC.Collect();
         }
-        private async Task<List<RefCgRes>> searchPos()
+        private async Task<List<RefCgResViewModel>> searchPos()
         {
             try
             {
@@ -141,13 +144,13 @@ namespace DW5S.App.UserControl
                         queryableRefCg = queryableRefCg.Where(p => p.SatInfoId == ((SatInfo)txtSat.EditValue).Id);
 
                     var max = queryableRefCg.MaxBy(p => p.SigTime);
-                    if (max == null) return new List<RefCgRes>();
+                    if (max == null) return new List<RefCgResViewModel>();
                     end = max.SigTime;
                     start = end.AddHours(-(int)txtTimeCho.EditValue);
                 }
                 if (end == DateTime.MinValue)
                 {
-                    return new List<RefCgRes>();//没有数据不查询
+                    return new List<RefCgResViewModel>();//没有数据不查询
                 }
                 var queryable = repsCg.AsQueryable();
                 if (hasSat)
@@ -157,14 +160,14 @@ namespace DW5S.App.UserControl
                       .Include(w => w.RefTxInfo)
                       .OrderByDescending(o => o.SigTime);
                 var cgRes = await queryable.ToListAsync();
-                return cgRes;
+                return cgRes.To<List<RefCgResViewModel>>();
             }
             catch (Exception ex)
             {
                 IocContainer.Logger.Error(ex, "参考参估结果查询异常");
                 MsgBoxHelper.ShowError("参考参估结果查询异常");
             }
-            return new List<RefCgRes>();
+            return new List<RefCgResViewModel>();
         }
 
         private void btnDraw_Click(object sender, EventArgs e)

+ 27 - 27
DW5S.App/UserControl/CtrlRefCgRes.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

+ 153 - 164
DW5S.App/UserControl/CtrlRefTask.Designer.cs

@@ -28,212 +28,201 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.gridRefTask = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
-            this.txtRef = new DevExpress.XtraEditors.SearchLookUpEdit();
-            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.btnStart = new DevExpress.XtraEditors.SimpleButton();
-            this.btnSerach = new DevExpress.XtraEditors.SimpleButton();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            ((System.ComponentModel.ISupportInitialize)(this.gridRefTask)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
-            this.layoutControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtRef.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            this.SuspendLayout();
+            gridRefTask = new DevExpress.XtraGrid.GridControl();
+            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            txtRef = new DevExpress.XtraEditors.SearchLookUpEdit();
+            searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+            btnStart = new DevExpress.XtraEditors.SimpleButton();
+            btnSerach = new DevExpress.XtraEditors.SimpleButton();
+            Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            ((System.ComponentModel.ISupportInitialize)gridRefTask).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
+            layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)txtRef.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
+            SuspendLayout();
             // 
             // gridRefTask
             // 
-            this.gridRefTask.Location = new System.Drawing.Point(12, 36);
-            this.gridRefTask.MainView = this.gridView1;
-            this.gridRefTask.Name = "gridRefTask";
-            this.gridRefTask.Size = new System.Drawing.Size(623, 374);
-            this.gridRefTask.TabIndex = 0;
-            this.gridRefTask.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
+            gridRefTask.Location = new System.Drawing.Point(12, 36);
+            gridRefTask.MainView = gridView1;
+            gridRefTask.Name = "gridRefTask";
+            gridRefTask.Size = new System.Drawing.Size(623, 374);
+            gridRefTask.TabIndex = 0;
+            gridRefTask.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
             // 
             // gridView1
             // 
-            this.gridView1.GridControl = this.gridRefTask;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.CustomDrawCell += new DevExpress.XtraGrid.Views.Base.RowCellCustomDrawEventHandler(this.gridView1_CustomDrawCell);
-            this.gridView1.DoubleClick += new System.EventHandler(this.gridView1_DoubleClick);
+            gridView1.GridControl = gridRefTask;
+            gridView1.Name = "gridView1";
+            gridView1.CustomDrawCell += gridView1_CustomDrawCell;
+            gridView1.DoubleClick += gridView1_DoubleClick;
             // 
             // layoutControl1
             // 
-            this.layoutControl1.Controls.Add(this.gridRefTask);
-            this.layoutControl1.Controls.Add(this.txtRef);
-            this.layoutControl1.Controls.Add(this.btnStart);
-            this.layoutControl1.Controls.Add(this.btnSerach);
-            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutControl1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControl1.Name = "layoutControl1";
-            this.layoutControl1.Root = this.Root;
-            this.layoutControl1.Size = new System.Drawing.Size(647, 422);
-            this.layoutControl1.TabIndex = 1;
-            this.layoutControl1.Text = "layoutControl1";
+            layoutControl1.Controls.Add(gridRefTask);
+            layoutControl1.Controls.Add(txtRef);
+            layoutControl1.Controls.Add(btnStart);
+            layoutControl1.Controls.Add(btnSerach);
+            layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            layoutControl1.Location = new System.Drawing.Point(0, 0);
+            layoutControl1.Name = "layoutControl1";
+            layoutControl1.Root = Root;
+            layoutControl1.Size = new System.Drawing.Size(647, 422);
+            layoutControl1.TabIndex = 1;
+            layoutControl1.Text = "layoutControl1";
             // 
             // txtRef
             // 
-            this.txtRef.EditValue = 1;
-            this.txtRef.Location = new System.Drawing.Point(57, 14);
-            this.txtRef.Name = "txtRef";
-            this.txtRef.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtRef.Properties.NullText = "";
-            this.txtRef.Properties.PopupSizeable = false;
-            this.txtRef.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtRef.Size = new System.Drawing.Size(201, 20);
-            this.txtRef.StyleController = this.layoutControl1;
-            this.txtRef.TabIndex = 11;
+            txtRef.EditValue = 1;
+            txtRef.Location = new System.Drawing.Point(53, 12);
+            txtRef.Name = "txtRef";
+            txtRef.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+            txtRef.Properties.NullText = "";
+            txtRef.Properties.PopupSizeable = false;
+            txtRef.Properties.PopupView = searchLookUpEdit1View;
+            txtRef.Size = new System.Drawing.Size(205, 20);
+            txtRef.StyleController = layoutControl1;
+            txtRef.TabIndex = 11;
             // 
             // searchLookUpEdit1View
             // 
-            this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
-            this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
-            this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
-            this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+            searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+            searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+            searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
             // 
             // btnStart
             // 
-            this.btnStart.Location = new System.Drawing.Point(553, 14);
-            this.btnStart.MaximumSize = new System.Drawing.Size(0, 19);
-            this.btnStart.MinimumSize = new System.Drawing.Size(0, 19);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(82, 19);
-            this.btnStart.StyleController = this.layoutControl1;
-            this.btnStart.TabIndex = 9;
-            this.btnStart.Text = "启动任务";
+            btnStart.Location = new System.Drawing.Point(549, 12);
+            btnStart.MaximumSize = new System.Drawing.Size(0, 21);
+            btnStart.MinimumSize = new System.Drawing.Size(0, 21);
+            btnStart.Name = "btnStart";
+            btnStart.Size = new System.Drawing.Size(86, 21);
+            btnStart.StyleController = layoutControl1;
+            btnStart.TabIndex = 9;
+            btnStart.Text = "启动任务";
             // 
             // btnSerach
             // 
-            this.btnSerach.Location = new System.Drawing.Point(266, 14);
-            this.btnSerach.MaximumSize = new System.Drawing.Size(0, 19);
-            this.btnSerach.MinimumSize = new System.Drawing.Size(0, 19);
-            this.btnSerach.Name = "btnSerach";
-            this.btnSerach.Size = new System.Drawing.Size(82, 19);
-            this.btnSerach.StyleController = this.layoutControl1;
-            this.btnSerach.TabIndex = 9;
-            this.btnSerach.Text = "查询";
-            this.btnSerach.Click += new System.EventHandler(this.btnSerach_Click);
+            btnSerach.Location = new System.Drawing.Point(262, 12);
+            btnSerach.MaximumSize = new System.Drawing.Size(0, 21);
+            btnSerach.MinimumSize = new System.Drawing.Size(0, 21);
+            btnSerach.Name = "btnSerach";
+            btnSerach.Size = new System.Drawing.Size(86, 21);
+            btnSerach.StyleController = layoutControl1;
+            btnSerach.TabIndex = 9;
+            btnSerach.Text = "查询";
+            btnSerach.Click += btnSerach_Click;
             // 
             // Root
             // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem3,
-            this.emptySpaceItem1,
-            this.layoutControlItem6,
-            this.layoutControlItem2});
-            this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(647, 422);
-            this.Root.TextVisible = false;
+            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            Root.GroupBordersVisible = false;
+            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem3, emptySpaceItem1, layoutControlItem6, layoutControlItem2 });
+            Root.Name = "Root";
+            Root.Size = new System.Drawing.Size(647, 422);
+            Root.TextVisible = false;
             // 
             // layoutControlItem1
             // 
-            this.layoutControlItem1.Control = this.gridRefTask;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 24);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(627, 378);
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem1.TextVisible = false;
+            layoutControlItem1.Control = gridRefTask;
+            layoutControlItem1.Location = new System.Drawing.Point(0, 24);
+            layoutControlItem1.Name = "layoutControlItem1";
+            layoutControlItem1.Size = new System.Drawing.Size(627, 378);
+            layoutControlItem1.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem1.TextVisible = false;
             // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txtRef;
-            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem3.CustomizationFormText = "时间选择";
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem3.MaxSize = new System.Drawing.Size(250, 24);
-            this.layoutControlItem3.MinSize = new System.Drawing.Size(250, 24);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(250, 24);
-            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem3.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem3.Text = "参考站";
-            this.layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(36, 14);
-            this.layoutControlItem3.TextToControlDistance = 5;
+            layoutControlItem3.Control = txtRef;
+            layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem3.CustomizationFormText = "时间选择";
+            layoutControlItem3.Location = new System.Drawing.Point(0, 0);
+            layoutControlItem3.MaxSize = new System.Drawing.Size(250, 24);
+            layoutControlItem3.MinSize = new System.Drawing.Size(250, 24);
+            layoutControlItem3.Name = "layoutControlItem3";
+            layoutControlItem3.Size = new System.Drawing.Size(250, 24);
+            layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem3.Text = "参考站";
+            layoutControlItem3.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
+            layoutControlItem3.TextSize = new System.Drawing.Size(36, 14);
+            layoutControlItem3.TextToControlDistance = 5;
             // 
             // emptySpaceItem1
             // 
-            this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(340, 0);
-            this.emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
-            this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(197, 24);
-            this.emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
+            emptySpaceItem1.AllowHotTrack = false;
+            emptySpaceItem1.Location = new System.Drawing.Point(340, 0);
+            emptySpaceItem1.MinSize = new System.Drawing.Size(104, 24);
+            emptySpaceItem1.Name = "emptySpaceItem1";
+            emptySpaceItem1.Size = new System.Drawing.Size(197, 24);
+            emptySpaceItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.btnStart;
-            this.layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem6.CustomizationFormText = "layoutControlItemSearch";
-            this.layoutControlItem6.Location = new System.Drawing.Point(537, 0);
-            this.layoutControlItem6.MaxSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(90, 24);
-            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem6.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem6.Text = "layoutControlItemSearch";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
+            layoutControlItem6.Control = btnStart;
+            layoutControlItem6.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem6.CustomizationFormText = "layoutControlItemSearch";
+            layoutControlItem6.Location = new System.Drawing.Point(537, 0);
+            layoutControlItem6.MaxSize = new System.Drawing.Size(90, 24);
+            layoutControlItem6.MinSize = new System.Drawing.Size(90, 24);
+            layoutControlItem6.Name = "layoutControlItem6";
+            layoutControlItem6.Size = new System.Drawing.Size(90, 24);
+            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem6.Text = "layoutControlItemSearch";
+            layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem6.TextVisible = false;
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.btnSerach;
-            this.layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem2.CustomizationFormText = "layoutControlItemSearch";
-            this.layoutControlItem2.Location = new System.Drawing.Point(250, 0);
-            this.layoutControlItem2.MaxSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem2.MinSize = new System.Drawing.Size(90, 24);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(90, 24);
-            this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem2.Spacing = new DevExpress.XtraLayout.Utils.Padding(4, 0, 2, 0);
-            this.layoutControlItem2.Text = "layoutControlItemSearch";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
+            layoutControlItem2.Control = btnSerach;
+            layoutControlItem2.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            layoutControlItem2.CustomizationFormText = "layoutControlItemSearch";
+            layoutControlItem2.Location = new System.Drawing.Point(250, 0);
+            layoutControlItem2.MaxSize = new System.Drawing.Size(90, 24);
+            layoutControlItem2.MinSize = new System.Drawing.Size(90, 24);
+            layoutControlItem2.Name = "layoutControlItem2";
+            layoutControlItem2.Size = new System.Drawing.Size(90, 24);
+            layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            layoutControlItem2.Text = "layoutControlItemSearch";
+            layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            layoutControlItem2.TextVisible = false;
             // 
             // CtrlRefTask
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.layoutControl1);
-            this.Name = "CtrlRefTask";
-            this.Size = new System.Drawing.Size(647, 422);
-            this.Load += new System.EventHandler(this.CtrlRefTask_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.gridRefTask)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
-            this.layoutControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txtRef.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            this.ResumeLayout(false);
-
+            AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
+            AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            Controls.Add(layoutControl1);
+            Name = "CtrlRefTask";
+            Size = new System.Drawing.Size(647, 422);
+            Load += CtrlRefTask_Load;
+            ((System.ComponentModel.ISupportInitialize)gridRefTask).EndInit();
+            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
+            layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)txtRef.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)searchLookUpEdit1View).EndInit();
+            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
+            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
+            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
+            ResumeLayout(false);
         }
 
         #endregion

+ 27 - 27
DW5S.App/UserControl/CtrlRefTask.resx

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->

+ 0 - 28
DW5S.Entity/RefCgRes.cs

@@ -18,115 +18,87 @@ namespace DW5S.Entity
         /// <summary>
         /// 信号时刻
         /// </summary>
-        [Display(Name = "信号时刻")]
         public DateTime SigTime { get; set; }
 
         /// <summary>
         /// 参考上行频点(Hz)
         /// </summary>
-        [Display(Name = "参考上行频点(Hz)", AutoGenerateField = false)]
         public double RefFreqUp { get; set; }
 
-        [Display(Name = "参考上行频点(MHz)")]
-        public double RefFreqUpDis => RefFreqUp / 1e6;
-
         /// <summary>
         /// 参考下行频点(Hz)
         /// </summary>
-        [Display(Name = "参考下行频点(Hz)", AutoGenerateField = false)]
         public double RefFreqDown { get; set; }
 
 
-        [Display(Name = "参考下行频点(MHz)")]
-        public double RefFreqDownDis => RefFreqDown / 1e6;
-
         /// <summary>
         /// 卫星
         /// </summary>
-        [Display(Name = "卫星编号", AutoGenerateField = false)]
         public int SatInfoId { get; set; }
 
         [Display(AutoGenerateField = false)]
-        [JsonIgnore]
         public virtual SatInfo SatInfo { get; set; }
 
 
-        [Display(Name = "卫星")]
-        public string Sat => SatInfo.Sat;
-
         /// <summary>
         /// 参考站ID
         /// </summary>
-        [Display(Name = "参考站ID", AutoGenerateField = false)]
         public long RefTxInfoID { get; set; }
 
 
         [Display(AutoGenerateField = false)]
-        [JsonIgnore]
         public virtual TxInfo RefTxInfo { get; set; }
         /// <summary>
         /// 参考站名称
         /// </summary>
-        [Display(Name = "参考站名称")]
-        public string RefName => RefTxInfo.Name;
 
         /// <summary>
         /// 样本时差(us)
         /// </summary>
-        [Display(Name = "样本时差(us)")]
         public double YbDto { get; set; }
 
         /// <summary>
         /// 样本频差(Hz)
         /// </summary>
-        [Display(Name = "样本频差(Hz)")]
         public double YbDfo { get; set; }
 
         /// <summary>
         /// 样本信噪比(dB)
         /// </summary>
-        [Display(Name = "样本信噪比(dB)")]
         public double YbSnr { get; set; }
        
         /// <summary>
         /// 卫星星历发布时刻
         /// </summary>
-        [Display(Name = "卫星星历发布时刻")]
         public DateTime SatXlTime { get; set; }
         /// <summary>
         /// 卫星坐标X
         /// </summary>
-        [Display(Name = "卫星坐标X")]
         public double SatX { get; set; }
 
         /// <summary>
         /// 卫星坐标Y
         /// </summary>
-        [Display(Name = "卫星坐标Y")]
         public double SatY { get; set; }
 
         /// <summary>
         /// 卫星坐标Z
         /// </summary>
-        [Display(Name = "卫星坐标Z")]
         public double SatZ { get; set; }
 
         /// <summary>
         /// 卫星速度Vx(m/s)
         /// </summary>
-        [Display(Name = "卫星速度Vx(m/s)")]
         public double SatVx { get; set; }
 
         /// <summary>
         /// 卫星速度Vy(m/s)
         /// </summary>
-        [Display(Name = "卫星速度Vy(m/s)")]
         public double SatVy { get; set; }
 
         /// <summary>
         /// 卫星速度Vz(m/s)
         /// </summary>
-        [Display(Name = "卫星速度Vz(m/s)")]
         public double SatVz { get; set; }
     }
 }

+ 132 - 0
DW5S.ViewModel/RefCgResViewModel.cs

@@ -0,0 +1,132 @@
+using DW5S.Entity;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace DW5S.ViewModel
+{
+    /// <summary>
+    /// 参考参数估计结果表
+    /// </summary>
+    public class RefCgResViewModel : BaseViewModel<long>
+    {
+        /// <summary>
+        /// 信号时刻
+        /// </summary>
+        [Display(Name = "信号时刻")]
+        public DateTime SigTime { get; set; }
+
+        /// <summary>
+        /// 参考上行频点(Hz)
+        /// </summary>
+        [Display(Name = "参考上行频点(Hz)", AutoGenerateField = false)]
+        public double RefFreqUp { get; set; }
+
+        [Display(Name = "参考上行频点(MHz)")]
+        public double RefFreqUpDis => RefFreqUp / 1e6;
+
+        /// <summary>
+        /// 参考下行频点(Hz)
+        /// </summary>
+        [Display(Name = "参考下行频点(Hz)", AutoGenerateField = false)]
+        public double RefFreqDown { get; set; }
+
+
+        [Display(Name = "参考下行频点(MHz)")]
+        public double RefFreqDownDis => RefFreqDown / 1e6;
+
+        /// <summary>
+        /// 卫星
+        /// </summary>
+        [Display(Name = "卫星编号", AutoGenerateField = false)]
+        public int SatInfoId { get; set; }
+
+        [Display(AutoGenerateField = false)]
+        [JsonIgnore]
+        public virtual SatInfo SatInfo { get; set; }
+
+
+        [Display(Name = "卫星")]
+        public string Sat => SatInfo.Sat;
+
+        /// <summary>
+        /// 参考站ID
+        /// </summary>
+        [Display(Name = "参考站ID", AutoGenerateField = false)]
+        public long RefTxInfoID { get; set; }
+
+
+        [Display(AutoGenerateField = false)]
+        [JsonIgnore]
+        public virtual TxInfo RefTxInfo { get; set; }
+        /// <summary>
+        /// 参考站名称
+        /// </summary>
+        [Display(Name = "参考站名称")]
+        public string RefName => RefTxInfo.Name;
+
+        /// <summary>
+        /// 样本时差(us)
+        /// </summary>
+        [Display(Name = "样本时差(us)")]
+        public double YbDto { get; set; }
+
+        /// <summary>
+        /// 样本频差(Hz)
+        /// </summary>
+        [Display(Name = "样本频差(Hz)")]
+        public double YbDfo { get; set; }
+
+        /// <summary>
+        /// 样本信噪比(dB)
+        /// </summary>
+        [Display(Name = "样本信噪比(dB)")]
+        public double YbSnr { get; set; }
+       
+        /// <summary>
+        /// 卫星星历发布时刻
+        /// </summary>
+        [Display(Name = "卫星星历发布时刻")]
+        public DateTime SatXlTime { get; set; }
+        /// <summary>
+        /// 卫星坐标X
+        /// </summary>
+        [Display(Name = "卫星坐标X")]
+        public double SatX { get; set; }
+
+        /// <summary>
+        /// 卫星坐标Y
+        /// </summary>
+        [Display(Name = "卫星坐标Y")]
+        public double SatY { get; set; }
+
+        /// <summary>
+        /// 卫星坐标Z
+        /// </summary>
+        [Display(Name = "卫星坐标Z")]
+        public double SatZ { get; set; }
+
+        /// <summary>
+        /// 卫星速度Vx(m/s)
+        /// </summary>
+        [Display(Name = "卫星速度Vx(m/s)")]
+        public double SatVx { get; set; }
+
+        /// <summary>
+        /// 卫星速度Vy(m/s)
+        /// </summary>
+        [Display(Name = "卫星速度Vy(m/s)")]
+        public double SatVy { get; set; }
+
+        /// <summary>
+        /// 卫星速度Vz(m/s)
+        /// </summary>
+        [Display(Name = "卫星速度Vz(m/s)")]
+        public double SatVz { get; set; }
+    }
+}