gongqiuhong 1 anno fa
parent
commit
1c65172f8c

+ 147 - 106
DataSimulation.Forms/EditForms/TaskEditor.Designer.cs

@@ -45,6 +45,8 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txtHj = new DevExpress.XtraEditors.SearchLookUpEdit();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.mapControl = new DevExpress.XtraMap.MapControl();
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
             this.btnSaveOther = new DevExpress.XtraEditors.SimpleButton();
@@ -69,18 +71,21 @@
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
             this.emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.dxErrorProvider = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
             this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtHj.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.mapControl)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSpeed.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtBand.Properties)).BeginInit();
@@ -103,20 +108,22 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).BeginInit();
             this.SuspendLayout();
             // 
             // layoutControl1
             // 
+            this.layoutControl1.Controls.Add(this.txtHj);
             this.layoutControl1.Controls.Add(this.mapControl);
             this.layoutControl1.Controls.Add(this.btnSave);
             this.layoutControl1.Controls.Add(this.btnSaveOther);
@@ -134,22 +141,40 @@
             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(1189, 509);
+            this.layoutControl1.Size = new System.Drawing.Size(1243, 553);
             this.layoutControl1.TabIndex = 0;
             this.layoutControl1.Text = "layoutControl1";
             // 
+            // txtHj
+            // 
+            this.txtHj.Location = new System.Drawing.Point(12, 338);
+            this.txtHj.Name = "txtHj";
+            this.txtHj.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txtHj.Properties.PopupView = this.gridView1;
+            this.txtHj.Size = new System.Drawing.Size(291, 20);
+            this.txtHj.StyleController = this.layoutControl1;
+            this.txtHj.TabIndex = 17;
+            // 
+            // gridView1
+            // 
+            this.gridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+            this.gridView1.Name = "gridView1";
+            this.gridView1.OptionsSelection.EnableAppearanceFocusedCell = false;
+            this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
             // mapControl
             // 
-            this.mapControl.Location = new System.Drawing.Point(304, 12);
+            this.mapControl.Location = new System.Drawing.Point(317, 12);
             this.mapControl.Name = "mapControl";
-            this.mapControl.Size = new System.Drawing.Size(873, 485);
+            this.mapControl.Size = new System.Drawing.Size(914, 529);
             this.mapControl.TabIndex = 16;
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(256, 475);
+            this.btnSave.Location = new System.Drawing.Point(266, 519);
             this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(34, 22);
+            this.btnSave.Size = new System.Drawing.Size(37, 22);
             this.btnSave.StyleController = this.layoutControl1;
             this.btnSave.TabIndex = 15;
             this.btnSave.Text = "保存";
@@ -157,9 +182,9 @@
             // 
             // btnSaveOther
             // 
-            this.btnSaveOther.Location = new System.Drawing.Point(217, 475);
+            this.btnSaveOther.Location = new System.Drawing.Point(226, 519);
             this.btnSaveOther.Name = "btnSaveOther";
-            this.btnSaveOther.Size = new System.Drawing.Size(35, 22);
+            this.btnSaveOther.Size = new System.Drawing.Size(36, 22);
             this.btnSaveOther.StyleController = this.layoutControl1;
             this.btnSaveOther.TabIndex = 14;
             this.btnSaveOther.Text = "另存";
@@ -168,68 +193,68 @@
             // 
             // txtSpeed
             // 
-            this.txtSpeed.Location = new System.Drawing.Point(12, 423);
+            this.txtSpeed.Location = new System.Drawing.Point(12, 467);
             this.txtSpeed.Name = "txtSpeed";
             this.txtSpeed.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "m/s", -1, false, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtSpeed.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtSpeed.Properties.MaskSettings.Set("mask", "f3");
-            this.txtSpeed.Size = new System.Drawing.Size(278, 23);
+            this.txtSpeed.Size = new System.Drawing.Size(291, 23);
             this.txtSpeed.StyleController = this.layoutControl1;
             this.txtSpeed.TabIndex = 13;
             // 
             // txtBand
             // 
-            this.txtBand.Location = new System.Drawing.Point(12, 379);
+            this.txtBand.Location = new System.Drawing.Point(12, 423);
             this.txtBand.Name = "txtBand";
             this.txtBand.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtBand.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtBand.Properties.MaskSettings.Set("mask", "f3");
-            this.txtBand.Size = new System.Drawing.Size(278, 23);
+            this.txtBand.Size = new System.Drawing.Size(291, 23);
             this.txtBand.StyleController = this.layoutControl1;
             this.txtBand.TabIndex = 12;
             // 
             // txtFreqUp
             // 
-            this.txtFreqUp.Location = new System.Drawing.Point(12, 335);
+            this.txtFreqUp.Location = new System.Drawing.Point(12, 379);
             this.txtFreqUp.Name = "txtFreqUp";
             this.txtFreqUp.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "MHz", -1, false, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.txtFreqUp.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
             this.txtFreqUp.Properties.MaskSettings.Set("mask", "f3");
-            this.txtFreqUp.Size = new System.Drawing.Size(278, 23);
+            this.txtFreqUp.Size = new System.Drawing.Size(291, 23);
             this.txtFreqUp.StyleController = this.layoutControl1;
             this.txtFreqUp.TabIndex = 11;
             // 
             // txtRefStation
             // 
-            this.txtRefStation.Location = new System.Drawing.Point(12, 294);
+            this.txtRefStation.Location = new System.Drawing.Point(12, 297);
             this.txtRefStation.Name = "txtRefStation";
             this.txtRefStation.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtRefStation.Size = new System.Drawing.Size(278, 20);
+            this.txtRefStation.Size = new System.Drawing.Size(291, 20);
             this.txtRefStation.StyleController = this.layoutControl1;
             this.txtRefStation.TabIndex = 10;
             // 
             // txtTx
             // 
-            this.txtTx.Location = new System.Drawing.Point(12, 253);
+            this.txtTx.Location = new System.Drawing.Point(12, 256);
             this.txtTx.Name = "txtTx";
             this.txtTx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txtTx.Size = new System.Drawing.Size(278, 20);
+            this.txtTx.Size = new System.Drawing.Size(291, 20);
             this.txtTx.StyleController = this.layoutControl1;
             this.txtTx.TabIndex = 9;
             // 
             // txtAdjaSat2
             // 
-            this.txtAdjaSat2.Location = new System.Drawing.Point(12, 212);
+            this.txtAdjaSat2.Location = new System.Drawing.Point(12, 215);
             this.txtAdjaSat2.Name = "txtAdjaSat2";
             this.txtAdjaSat2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtAdjaSat2.Properties.PopupView = this.searchLookUpEdit3View;
-            this.txtAdjaSat2.Size = new System.Drawing.Size(278, 20);
+            this.txtAdjaSat2.Size = new System.Drawing.Size(291, 20);
             this.txtAdjaSat2.StyleController = this.layoutControl1;
             this.txtAdjaSat2.TabIndex = 8;
             // 
@@ -242,12 +267,12 @@
             // 
             // txtAdjaSat1
             // 
-            this.txtAdjaSat1.Location = new System.Drawing.Point(12, 171);
+            this.txtAdjaSat1.Location = new System.Drawing.Point(12, 174);
             this.txtAdjaSat1.Name = "txtAdjaSat1";
             this.txtAdjaSat1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtAdjaSat1.Properties.PopupView = this.searchLookUpEdit2View;
-            this.txtAdjaSat1.Size = new System.Drawing.Size(278, 20);
+            this.txtAdjaSat1.Size = new System.Drawing.Size(291, 20);
             this.txtAdjaSat1.StyleController = this.layoutControl1;
             this.txtAdjaSat1.TabIndex = 7;
             // 
@@ -260,12 +285,12 @@
             // 
             // txtMainSat
             // 
-            this.txtMainSat.Location = new System.Drawing.Point(12, 130);
+            this.txtMainSat.Location = new System.Drawing.Point(12, 133);
             this.txtMainSat.Name = "txtMainSat";
             this.txtMainSat.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txtMainSat.Properties.PopupView = this.searchLookUpEdit1View;
-            this.txtMainSat.Size = new System.Drawing.Size(278, 20);
+            this.txtMainSat.Size = new System.Drawing.Size(291, 20);
             this.txtMainSat.StyleController = this.layoutControl1;
             this.txtMainSat.TabIndex = 6;
             // 
@@ -280,7 +305,7 @@
             // 
             this.radioSimulationType.Location = new System.Drawing.Point(12, 70);
             this.radioSimulationType.Name = "radioSimulationType";
-            this.radioSimulationType.Size = new System.Drawing.Size(278, 39);
+            this.radioSimulationType.Size = new System.Drawing.Size(291, 42);
             this.radioSimulationType.StyleController = this.layoutControl1;
             this.radioSimulationType.TabIndex = 5;
             // 
@@ -288,7 +313,7 @@
             // 
             this.txtTaskName.Location = new System.Drawing.Point(12, 29);
             this.txtTaskName.Name = "txtTaskName";
-            this.txtTaskName.Size = new System.Drawing.Size(278, 20);
+            this.txtTaskName.Size = new System.Drawing.Size(291, 20);
             this.txtTaskName.StyleController = this.layoutControl1;
             this.txtTaskName.TabIndex = 4;
             // 
@@ -312,9 +337,10 @@
             this.layoutControlItem10,
             this.splitterItem1,
             this.emptySpaceItem1,
-            this.emptySpaceItem2});
+            this.emptySpaceItem2,
+            this.layoutControlItem14});
             this.Root.Name = "Root";
-            this.Root.Size = new System.Drawing.Size(1189, 509);
+            this.Root.Size = new System.Drawing.Size(1243, 553);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -322,7 +348,7 @@
             this.layoutControlItem1.Control = this.txtTaskName;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(282, 41);
+            this.layoutControlItem1.Size = new System.Drawing.Size(295, 41);
             this.layoutControlItem1.Text = "任务名称";
             this.layoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
@@ -333,7 +359,7 @@
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 41);
             this.layoutControlItem2.MinSize = new System.Drawing.Size(54, 60);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(282, 60);
+            this.layoutControlItem2.Size = new System.Drawing.Size(295, 63);
             this.layoutControlItem2.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem2.Text = "仿真类型";
             this.layoutControlItem2.TextLocation = DevExpress.Utils.Locations.Top;
@@ -342,9 +368,9 @@
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txtMainSat;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 101);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 104);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(282, 41);
+            this.layoutControlItem3.Size = new System.Drawing.Size(295, 41);
             this.layoutControlItem3.Text = "主星";
             this.layoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
@@ -352,9 +378,9 @@
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txtAdjaSat1;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 142);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 145);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.Size = new System.Drawing.Size(282, 41);
+            this.layoutControlItem4.Size = new System.Drawing.Size(295, 41);
             this.layoutControlItem4.Text = "邻星1";
             this.layoutControlItem4.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
@@ -362,9 +388,9 @@
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtAdjaSat2;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 183);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 186);
             this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.Size = new System.Drawing.Size(282, 41);
+            this.layoutControlItem5.Size = new System.Drawing.Size(295, 41);
             this.layoutControlItem5.Text = "邻星2";
             this.layoutControlItem5.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
@@ -372,9 +398,9 @@
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txtTx;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 224);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 227);
             this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.Size = new System.Drawing.Size(282, 41);
+            this.layoutControlItem6.Size = new System.Drawing.Size(295, 41);
             this.layoutControlItem6.Text = "天线";
             this.layoutControlItem6.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem6.TextSize = new System.Drawing.Size(48, 14);
@@ -382,49 +408,19 @@
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txtFreqUp;
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 306);
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 350);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(282, 44);
+            this.layoutControlItem8.Size = new System.Drawing.Size(295, 44);
             this.layoutControlItem8.Text = "上行频点";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;
             this.layoutControlItem8.TextSize = new System.Drawing.Size(48, 14);
             // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txtBand;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 350);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.Size = new System.Drawing.Size(282, 44);
-            this.layoutControlItem9.Text = "信号带宽";
-            this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txtSpeed;
-            this.layoutControlItem10.Location = new System.Drawing.Point(0, 394);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.Size = new System.Drawing.Size(282, 44);
-            this.layoutControlItem10.Text = "速度";
-            this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txtRefStation;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 265);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.Size = new System.Drawing.Size(282, 41);
-            this.layoutControlItem7.Text = "参考站";
-            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
-            // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.btnSaveOther;
-            this.layoutControlItem11.Location = new System.Drawing.Point(205, 463);
+            this.layoutControlItem11.Location = new System.Drawing.Point(214, 507);
             this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.Size = new System.Drawing.Size(39, 26);
+            this.layoutControlItem11.Size = new System.Drawing.Size(40, 26);
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
             this.layoutControlItem11.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
@@ -432,60 +428,101 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.btnSave;
-            this.layoutControlItem12.Location = new System.Drawing.Point(244, 463);
+            this.layoutControlItem12.Location = new System.Drawing.Point(254, 507);
             this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.Size = new System.Drawing.Size(38, 26);
+            this.layoutControlItem12.Size = new System.Drawing.Size(41, 26);
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
             // 
-            // emptySpaceItem2
-            // 
-            this.emptySpaceItem2.AllowHotTrack = false;
-            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 438);
-            this.emptySpaceItem2.Name = "emptySpaceItem2";
-            this.emptySpaceItem2.Size = new System.Drawing.Size(282, 25);
-            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
-            // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.mapControl;
-            this.layoutControlItem13.Location = new System.Drawing.Point(292, 0);
+            this.layoutControlItem13.Location = new System.Drawing.Point(305, 0);
             this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.Size = new System.Drawing.Size(877, 489);
+            this.layoutControlItem13.Size = new System.Drawing.Size(918, 533);
             this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem13.TextVisible = false;
             // 
-            // dxErrorProvider
+            // layoutControlItem7
             // 
-            this.dxErrorProvider.ContainerControl = this;
+            this.layoutControlItem7.Control = this.txtRefStation;
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 268);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.Size = new System.Drawing.Size(295, 41);
+            this.layoutControlItem7.Text = "参考站";
+            this.layoutControlItem7.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txtBand;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 394);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(295, 44);
+            this.layoutControlItem9.Text = "信号带宽";
+            this.layoutControlItem9.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txtSpeed;
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 438);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Size = new System.Drawing.Size(295, 44);
+            this.layoutControlItem10.Text = "速度";
+            this.layoutControlItem10.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(48, 14);
             // 
             // splitterItem1
             // 
             this.splitterItem1.AllowHotTrack = true;
-            this.splitterItem1.Location = new System.Drawing.Point(282, 0);
+            this.splitterItem1.Location = new System.Drawing.Point(295, 0);
             this.splitterItem1.Name = "splitterItem1";
-            this.splitterItem1.Size = new System.Drawing.Size(10, 489);
+            this.splitterItem1.Size = new System.Drawing.Size(10, 533);
             // 
             // emptySpaceItem1
             // 
             this.emptySpaceItem1.AllowHotTrack = false;
-            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 463);
+            this.emptySpaceItem1.Location = new System.Drawing.Point(0, 507);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(205, 26);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(214, 26);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
+            // emptySpaceItem2
+            // 
+            this.emptySpaceItem2.AllowHotTrack = false;
+            this.emptySpaceItem2.Location = new System.Drawing.Point(0, 482);
+            this.emptySpaceItem2.Name = "emptySpaceItem2";
+            this.emptySpaceItem2.Size = new System.Drawing.Size(295, 25);
+            this.emptySpaceItem2.TextSize = new System.Drawing.Size(0, 0);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txtHj;
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 309);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.Size = new System.Drawing.Size(295, 41);
+            this.layoutControlItem14.Text = "航迹";
+            this.layoutControlItem14.TextLocation = DevExpress.Utils.Locations.Top;
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // dxErrorProvider
+            // 
+            this.dxErrorProvider.ContainerControl = this;
+            // 
             // TaskEditor
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1189, 509);
+            this.ClientSize = new System.Drawing.Size(1243, 553);
             this.Controls.Add(this.layoutControl1);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
             this.Name = "TaskEditor";
             this.Text = "TaskEditor";
             this.Load += new System.EventHandler(this.TaskEditor_Load);
             ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
             this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtHj.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.mapControl)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtSpeed.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtBand.Properties)).EndInit();
@@ -508,16 +545,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitterItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.emptySpaceItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dxErrorProvider)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -559,5 +597,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.SplitterItem splitterItem1;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
+        private DevExpress.XtraEditors.SearchLookUpEdit txtHj;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
     }
 }

+ 7 - 2
DataSimulation.Forms/EditForms/TaskEditor.cs

@@ -1,4 +1,5 @@
-using DataSimulation.Repostory.EFContext;
+using DataSimulation.Repostory;
+using DataSimulation.Repostory.EFContext;
 using DataSimulation.Repostory.Model;
 using DevExpress.Utils.About;
 using DevExpress.XtraEditors.Controls;
@@ -37,7 +38,7 @@ namespace DataSimulation.Forms.EditForms
             this.radioSimulationType.Properties.Items.AddRange(radioGroups.ToArray());
             this.radioSimulationType.SelectedIndex = 0;
 
-
+          
         }
 
         public TaskEditor(TaskInfo info)
@@ -56,12 +57,16 @@ namespace DataSimulation.Forms.EditForms
             .UseExportImg()
             .UseExportXlsx()
             .UseExportCsv()
+            .UseFlightLine()
             .SetMapLayerType(null)
             .UseDrawRect(rect =>
             {
                 (double startLon, double startLat, double centerLon, double centerLat, double endLon, double endLat, double lonRange, double latRange) = rect;
             });
 
+            var hjList =await SimulationInfoCache.GetAllAsync();
+            this.txtHj.UseDefault().SetData(hjList, nameof(SimulationInfo.SimulationName)).UseDoubleClickToSelectAll();
+
             using (SimulationContext db = new SimulationContext())
             {
                 var sats = await db.SatInfos.ToListAsync();

+ 8 - 7
DataSimulation.Forms/Properties/licenses.licx

@@ -1,12 +1,13 @@
+DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.DateEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraCharts.Heatmap.HeatmapControl, DevExpress.XtraCharts.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.SearchLookUpEdit, DevExpress.XtraGrid.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ImageComboBoxEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraCharts.Heatmap.HeatmapControl, DevExpress.XtraCharts.v23.2.UI, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking.DockManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v23.2, Version=23.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

+ 195 - 29
DataSimulation.Forms/UserControl/CtrlHistoryTask.Designer.cs

@@ -30,8 +30,6 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CtrlHistoryTask));
-            this.gridHistoryTask = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
             this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
             this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
@@ -39,30 +37,38 @@
             this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
             this.btnDel = new DevExpress.XtraBars.BarButtonItem();
             this.popupMenu1 = new DevExpress.XtraBars.PopupMenu(this.components);
-            ((System.ComponentModel.ISupportInitialize)(this.gridHistoryTask)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.btnSearch = new DevExpress.XtraEditors.SimpleButton();
+            this.txtEndTime = new DevExpress.XtraEditors.DateEdit();
+            this.txtStartTime = new DevExpress.XtraEditors.DateEdit();
+            this.gridHistoryTask = new DevExpress.XtraGrid.GridControl();
+            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txtTaskName = new DevExpress.XtraEditors.TextEdit();
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridHistoryTask)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTaskName.Properties)).BeginInit();
             this.SuspendLayout();
             // 
-            // gridHistoryTask
-            // 
-            this.gridHistoryTask.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridHistoryTask.Location = new System.Drawing.Point(0, 0);
-            this.gridHistoryTask.MainView = this.gridView1;
-            this.gridHistoryTask.Name = "gridHistoryTask";
-            this.gridHistoryTask.Size = new System.Drawing.Size(647, 422);
-            this.gridHistoryTask.TabIndex = 0;
-            this.gridHistoryTask.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.GridControl = this.gridHistoryTask;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.PopupMenuShowing += new DevExpress.XtraGrid.Views.Grid.PopupMenuShowingEventHandler(this.gridView1_PopupMenuShowing);
-            this.gridView1.CustomDrawEmptyForeground += new DevExpress.XtraGrid.Views.Base.CustomDrawEventHandler(this.gridView1_CustomDrawEmptyForeground);
-            // 
             // barManager1
             // 
             this.barManager1.DockControls.Add(this.barDockControlTop);
@@ -121,31 +127,178 @@
             this.popupMenu1.Manager = this.barManager1;
             this.popupMenu1.Name = "popupMenu1";
             // 
+            // layoutControl1
+            // 
+            this.layoutControl1.Controls.Add(this.btnSearch);
+            this.layoutControl1.Controls.Add(this.txtEndTime);
+            this.layoutControl1.Controls.Add(this.txtStartTime);
+            this.layoutControl1.Controls.Add(this.gridHistoryTask);
+            this.layoutControl1.Controls.Add(this.txtTaskName);
+            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 = 5;
+            this.layoutControl1.Text = "layoutControl1";
+            // 
+            // btnSearch
+            // 
+            this.btnSearch.Location = new System.Drawing.Point(584, 12);
+            this.btnSearch.Name = "btnSearch";
+            this.btnSearch.Size = new System.Drawing.Size(51, 22);
+            this.btnSearch.StyleController = this.layoutControl1;
+            this.btnSearch.TabIndex = 8;
+            this.btnSearch.Text = "查询";
+            this.btnSearch.Click += new System.EventHandler(this.btnSearch_Click);
+            // 
+            // txtEndTime
+            // 
+            this.txtEndTime.EditValue = null;
+            this.txtEndTime.Location = new System.Drawing.Point(456, 12);
+            this.txtEndTime.MenuManager = this.barManager1;
+            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(124, 20);
+            this.txtEndTime.StyleController = this.layoutControl1;
+            this.txtEndTime.TabIndex = 7;
+            // 
+            // txtStartTime
+            // 
+            this.txtStartTime.EditValue = null;
+            this.txtStartTime.Location = new System.Drawing.Point(264, 12);
+            this.txtStartTime.MenuManager = this.barManager1;
+            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(128, 20);
+            this.txtStartTime.StyleController = this.layoutControl1;
+            this.txtStartTime.TabIndex = 6;
+            // 
+            // gridHistoryTask
+            // 
+            this.gridHistoryTask.Location = new System.Drawing.Point(12, 38);
+            this.gridHistoryTask.MainView = this.gridView1;
+            this.gridHistoryTask.MenuManager = this.barManager1;
+            this.gridHistoryTask.Name = "gridHistoryTask";
+            this.gridHistoryTask.Size = new System.Drawing.Size(623, 372);
+            this.gridHistoryTask.TabIndex = 5;
+            this.gridHistoryTask.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gridView1});
+            // 
+            // gridView1
+            // 
+            this.gridView1.GridControl = this.gridHistoryTask;
+            this.gridView1.Name = "gridView1";
+            // 
+            // Root
+            // 
+            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.Root.GroupBordersVisible = false;
+            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem1,
+            this.layoutControlItem2,
+            this.layoutControlItem3,
+            this.layoutControlItem4,
+            this.layoutControlItem5});
+            this.Root.Name = "Root";
+            this.Root.Size = new System.Drawing.Size(647, 422);
+            this.Root.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txtTaskName;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(192, 26);
+            this.layoutControlItem1.Text = "任务名";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.gridHistoryTask;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 26);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(627, 376);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem2.TextVisible = false;
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txtStartTime;
+            this.layoutControlItem3.Location = new System.Drawing.Point(192, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.Size = new System.Drawing.Size(192, 26);
+            this.layoutControlItem3.Text = "开始时间";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txtEndTime;
+            this.layoutControlItem4.Location = new System.Drawing.Point(384, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.Size = new System.Drawing.Size(188, 26);
+            this.layoutControlItem4.Text = "结束时间";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(48, 14);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.btnSearch;
+            this.layoutControlItem5.Location = new System.Drawing.Point(572, 0);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.Size = new System.Drawing.Size(55, 26);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem5.TextVisible = false;
+            // 
+            // txtTaskName
+            // 
+            this.txtTaskName.Location = new System.Drawing.Point(72, 12);
+            this.txtTaskName.MenuManager = this.barManager1;
+            this.txtTaskName.Name = "txtTaskName";
+            this.txtTaskName.Size = new System.Drawing.Size(128, 20);
+            this.txtTaskName.StyleController = this.layoutControl1;
+            this.txtTaskName.TabIndex = 4;
+            // 
             // CtrlHistoryTask
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.gridHistoryTask);
+            this.Controls.Add(this.layoutControl1);
             this.Controls.Add(this.barDockControlLeft);
             this.Controls.Add(this.barDockControlRight);
             this.Controls.Add(this.barDockControlBottom);
             this.Controls.Add(this.barDockControlTop);
             this.Name = "CtrlHistoryTask";
             this.Size = new System.Drawing.Size(647, 422);
-            this.Load += new System.EventHandler(this.CtrlAnt_Load);
-            ((System.ComponentModel.ISupportInitialize)(this.gridHistoryTask)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            this.Load += new System.EventHandler(this.CtrlHistoryTask_Load);
             ((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.popupMenu1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtEndTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtStartTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridHistoryTask)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtTaskName.Properties)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
         }
 
         #endregion
-
-        private DevExpress.XtraGrid.GridControl gridHistoryTask;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraBars.BarManager barManager1;
         private DevExpress.XtraBars.BarDockControl barDockControlTop;
         private DevExpress.XtraBars.BarDockControl barDockControlBottom;
@@ -153,5 +306,18 @@
         private DevExpress.XtraBars.BarDockControl barDockControlRight;
         private DevExpress.XtraBars.BarButtonItem btnDel;
         private DevExpress.XtraBars.PopupMenu popupMenu1;
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup Root;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraEditors.DateEdit txtEndTime;
+        private DevExpress.XtraEditors.DateEdit txtStartTime;
+        private DevExpress.XtraGrid.GridControl gridHistoryTask;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.SimpleButton btnSearch;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraEditors.TextEdit txtTaskName;
     }
 }

+ 22 - 2
DataSimulation.Forms/UserControl/CtrlHistoryTask.cs

@@ -14,6 +14,7 @@ using DataSimulation.Forms.EditForms;
 using DataSimulation.Repostory;
 using System.Threading.Tasks;
 using static System.Windows.Forms.VisualStyles.VisualStyleElement.TextBox;
+using ExtensionsDev;
 
 namespace DataSimulation.Forms.UserControl
 {
@@ -24,7 +25,7 @@ namespace DataSimulation.Forms.UserControl
         {
             InitializeComponent();
         }
-        private async void CtrlAnt_Load(object sender, EventArgs e)
+        private async void CtrlHistoryTask_Load(object sender, EventArgs e)
         {
             try
             {
@@ -33,6 +34,8 @@ namespace DataSimulation.Forms.UserControl
                 var taskListCache = await TaskCache.GetAllAsync();
                 list.AddRange(taskListCache.Where(w=>w.isHistory));
                 gridView1.RefreshData();
+                txtStartTime.UseDefault();
+                txtEndTime.UseDefault();
             }
             catch (Exception ex)
             {
@@ -96,6 +99,23 @@ namespace DataSimulation.Forms.UserControl
             }
         }
 
-
+        private void btnSearch_Click(object sender, EventArgs e)
+        {
+            var res = new List<TaskInfo>();
+            if (!string.IsNullOrEmpty(txtTaskName.Text))
+            {
+                //res = list.Where(w => !w.TaskName.Contains(txtTaskName.Text)).ToList();
+                //list.RemoveRange(w => !w.TaskName.Contains(txtTaskName.Text));
+            }
+            else if (txtStartTime.DateTime != DateTime.MinValue)
+            {
+                list = list.Where(w => w.CreateTime >= txtStartTime.DateTime).ToList();
+            }
+            else if (txtEndTime.DateTime != DateTime.MinValue)
+            {
+                list = list.Where(w => w.CreateTime <= txtEndTime.DateTime).ToList();
+            }
+            gridView1.RefreshData();
+        }
     }
 }

+ 1 - 0
DataSimulation.Repostory/DataSimulation.Repostory.csproj

@@ -97,6 +97,7 @@
     <Compile Include="Model\XlInfo.cs" />
     <Compile Include="PosData.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SimulationInfoCache.cs" />
     <Compile Include="TaskCache.cs" />
     <Compile Include="XlCache.cs" />
   </ItemGroup>

+ 50 - 0
DataSimulation.Repostory/SimulationInfoCache.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using DataSimulation.Repostory.EFContext;
+using DataSimulation.Repostory.Model;
+
+namespace DataSimulation.Repostory
+{
+    public static class SimulationInfoCache
+    {
+        /// <summary>
+        /// 获取数据库所有仿真航迹信息
+        /// </summary>
+        /// <returns></returns>
+        public static async Task<List<SimulationInfo>> GetAllAsync()
+        {
+            try
+            {
+                List<SimulationInfo> list = new List<SimulationInfo>();
+                var dir = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "DbPart");
+                if (!Directory.Exists(dir)) return list;
+                var yearDirs = Directory.EnumerateDirectories(dir).OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name));//年目录,倒叙排列
+                foreach (var yearDir in yearDirs)
+                {
+                    //每一天的db文件,倒序排列
+                    var dayFiles = Directory.EnumerateFiles(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, yearDir), "*.db").OrderByDescending(p => Convert.ToInt32(new DirectoryInfo(p).Name.Substring(0, 4)));
+                    foreach (var dayFile in dayFiles)
+                    {
+                        using (SimulationPartContext db = SimulationPartContext.GetContext(dayFile))
+                        {
+                            list.AddRange(await db.SimulationInfos.ToListAsync());
+                        }
+                    }
+                }
+                return list;
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Error(ex, "加载仿真航迹信息异常");
+                return null;
+            }
+        }
+
+
+    }
+}