修改批量编辑目标

XdCxRhDW.App/Image/Edit.svg

@@ -0,0 +1,17 @@
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 32 32" style="enable-background:new 0 0 32 32;" xml:space="preserve">
+<style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Yellow{fill:#FFB115;}
+	.Red{fill:#D11C1C;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+</style>
+<path class="Black" d="M24,24.8V28H4V4h20v7.2l2-2V3c0-0.5-0.5-1-1-1H3C2.5,2,2,2.5,2,3v26c0,0.5,0.5,1,1,1h22c0.5,0,1-0.5,1-1v-6.2
+	L24,24.8z"/>
+<path class="Blue" d="M29,17l-8,8l-4-4l8-8L29,17z M30,16l1.7-1.7c0.4-0.4,0.4-1,0-1.3L29,10.3c-0.4-0.4-1-0.4-1.3,0L26,12L30,16z
+	 M16,22v4h4L16,22z"/>
+</svg>

XdCxRhDW.App/UserControl/CtrlHome.Designer.cs

@@ -36,15 +36,15 @@ namespace XdCxRhDW.App.UserControl
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(CtrlHome));
-            DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions7 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
-            DevExpress.Utils.SuperToolTip superToolTip7 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipItem toolTipItem7 = new DevExpress.Utils.ToolTipItem();
-            DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions8 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
-            DevExpress.Utils.SuperToolTip superToolTip8 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipItem toolTipItem8 = new DevExpress.Utils.ToolTipItem();
-            DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions9 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
-            DevExpress.Utils.SuperToolTip superToolTip9 = new DevExpress.Utils.SuperToolTip();
-            DevExpress.Utils.ToolTipItem toolTipItem9 = new DevExpress.Utils.ToolTipItem();
+            DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions1 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
+            DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
+            DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions2 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
+            DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+            DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions buttonImageOptions3 = new DevExpress.XtraEditors.ButtonsPanelControl.ButtonImageOptions();
+            DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
+            DevExpress.Utils.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
             this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
             this.txtTimeCho = new DevExpress.XtraEditors.ImageComboBoxEdit();
             this.barManager1 = new DevExpress.XtraBars.BarManager(this.components);
@@ -54,7 +54,6 @@ namespace XdCxRhDW.App.UserControl
             this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
             this.btnStart = new DevExpress.XtraBars.BarButtonItem();
             this.btnStop = new DevExpress.XtraBars.BarButtonItem();
-            this.btnTar = new DevExpress.XtraBars.BarButtonItem();
             this.btnDrawDto = new DevExpress.XtraBars.BarButtonItem();
             this.btnDrawDfo = new DevExpress.XtraBars.BarButtonItem();
             this.btnDrawCX = new DevExpress.XtraBars.BarButtonItem();
@@ -142,7 +141,7 @@ namespace XdCxRhDW.App.UserControl
             // txtTimeCho
             // 
             this.txtTimeCho.EditValue = 1;
-            this.txtTimeCho.Location = new System.Drawing.Point(247, 213);
+            this.txtTimeCho.Location = new System.Drawing.Point(245, 212);
             this.txtTimeCho.MenuManager = this.barManager1;
             this.txtTimeCho.Name = "txtTimeCho";
             this.txtTimeCho.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -154,7 +153,7 @@ namespace XdCxRhDW.App.UserControl
             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, 22);
+            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);
@@ -169,7 +168,6 @@ namespace XdCxRhDW.App.UserControl
             this.barManager1.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
             this.btnStart,
             this.btnStop,
-            this.btnTar,
             this.btnDrawDto,
             this.btnDrawDfo,
             this.btnDrawCX,
@@ -228,14 +226,6 @@ namespace XdCxRhDW.App.UserControl
             this.btnStop.Name = "btnStop";
             this.btnStop.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btn_ItemClick);
             // 
-            // btnTar
-            // 
-            this.btnTar.Caption = "编辑目标";
-            this.btnTar.Id = 3;
-            this.btnTar.ImageOptions.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("btnTar.ImageOptions.SvgImage")));
-            this.btnTar.Name = "btnTar";
-            this.btnTar.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.btnTar_ItemClick);
-            // 
             // btnDrawDto
             // 
             this.btnDrawDto.Caption = "绘制时差线";
@@ -267,7 +257,7 @@ namespace XdCxRhDW.App.UserControl
             // 
             // btnSearch
             // 
-            this.btnSearch.Location = new System.Drawing.Point(772, 213);
+            this.btnSearch.Location = new System.Drawing.Point(770, 212);
             this.btnSearch.Name = "btnSearch";
             this.btnSearch.Size = new System.Drawing.Size(84, 21);
             this.btnSearch.StyleController = this.layoutControl1;
@@ -278,44 +268,44 @@ namespace XdCxRhDW.App.UserControl
             // txtEndTime
             // 
             this.txtEndTime.EditValue = null;
-            this.txtEndTime.Location = new System.Drawing.Point(617, 213);
+            this.txtEndTime.Location = new System.Drawing.Point(615, 212);
             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(149, 22);
+            this.txtEndTime.Size = new System.Drawing.Size(149, 20);
             this.txtEndTime.StyleController = this.layoutControl1;
             this.txtEndTime.TabIndex = 8;
             // 
             // txtStartTime
             // 
             this.txtStartTime.EditValue = null;
-            this.txtStartTime.Location = new System.Drawing.Point(407, 213);
+            this.txtStartTime.Location = new System.Drawing.Point(405, 212);
             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(149, 22);
+            this.txtStartTime.Size = new System.Drawing.Size(149, 20);
             this.txtStartTime.StyleController = this.layoutControl1;
             this.txtStartTime.TabIndex = 7;
             // 
             // mapControl1
             // 
-            this.mapControl1.Location = new System.Drawing.Point(187, 2);
+            this.mapControl1.Location = new System.Drawing.Point(185, 2);
             this.mapControl1.Name = "mapControl1";
-            this.mapControl1.Size = new System.Drawing.Size(848, 170);
+            this.mapControl1.Size = new System.Drawing.Size(850, 170);
             this.mapControl1.TabIndex = 6;
             // 
             // gridHomePosRes
             // 
-            this.gridHomePosRes.Location = new System.Drawing.Point(188, 237);
+            this.gridHomePosRes.Location = new System.Drawing.Point(186, 236);
             this.gridHomePosRes.MainView = this.gridView2;
             this.gridHomePosRes.Name = "gridHomePosRes";
-            this.gridHomePosRes.Size = new System.Drawing.Size(846, 283);
+            this.gridHomePosRes.Size = new System.Drawing.Size(848, 284);
             this.gridHomePosRes.TabIndex = 5;
             this.gridHomePosRes.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView2});
@@ -376,30 +366,30 @@ namespace XdCxRhDW.App.UserControl
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.mapControl1;
-            this.layoutControlItem3.Location = new System.Drawing.Point(185, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(183, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.Size = new System.Drawing.Size(852, 174);
+            this.layoutControlItem3.Size = new System.Drawing.Size(854, 174);
             this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem3.TextVisible = false;
             // 
             // layoutControlGroup1
             // 
-            buttonImageOptions7.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions7.SvgImage")));
-            buttonImageOptions7.SvgImageSize = new System.Drawing.Size(20, 20);
-            toolTipItem7.Text = "新建任务";
-            superToolTip7.Items.Add(toolTipItem7);
-            buttonImageOptions8.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions8.SvgImage")));
-            buttonImageOptions8.SvgImageSize = new System.Drawing.Size(20, 20);
-            toolTipItem8.Text = "编辑任务";
-            superToolTip8.Items.Add(toolTipItem8);
-            buttonImageOptions9.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions9.SvgImage")));
-            buttonImageOptions9.SvgImageSize = new System.Drawing.Size(20, 20);
-            toolTipItem9.Text = "删除任务";
-            superToolTip9.Items.Add(toolTipItem9);
+            buttonImageOptions1.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions1.SvgImage")));
+            buttonImageOptions1.SvgImageSize = new System.Drawing.Size(20, 20);
+            toolTipItem1.Text = "新建任务";
+            superToolTip1.Items.Add(toolTipItem1);
+            buttonImageOptions2.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions2.SvgImage")));
+            buttonImageOptions2.SvgImageSize = new System.Drawing.Size(20, 20);
+            toolTipItem2.Text = "编辑任务";
+            superToolTip2.Items.Add(toolTipItem2);
+            buttonImageOptions3.SvgImage = ((DevExpress.Utils.Svg.SvgImage)(resources.GetObject("buttonImageOptions3.SvgImage")));
+            buttonImageOptions3.SvgImageSize = new System.Drawing.Size(20, 20);
+            toolTipItem3.Text = "删除任务";
+            superToolTip3.Items.Add(toolTipItem3);
             this.layoutControlGroup1.CustomHeaderButtons.AddRange(new DevExpress.XtraEditors.ButtonPanel.IBaseButton[] {
-            new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("新建任务", false, buttonImageOptions7, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip7, true, false, true, null, -1),
-            new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("编辑任务", false, buttonImageOptions8, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip8, true, false, true, null, -1),
-            new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("删除任务", false, buttonImageOptions9, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip9, true, false, true, null, -1)});
+            new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("新建任务", false, buttonImageOptions1, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip1, true, false, true, null, -1),
+            new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("编辑任务", false, buttonImageOptions2, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip2, true, false, true, null, -1),
+            new DevExpress.XtraEditors.ButtonsPanelControl.GroupBoxButton("删除任务", false, buttonImageOptions3, DevExpress.XtraBars.Docking2010.ButtonStyle.PushButton, "", -1, true, superToolTip3, true, false, true, null, -1)});
             this.layoutControlGroup1.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
             this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1});
@@ -427,10 +417,10 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItemSearch,
             this.layoutControlGroup3,
             this.emptySpaceItem1});
-            this.layoutControlGroup2.Location = new System.Drawing.Point(185, 186);
+            this.layoutControlGroup2.Location = new System.Drawing.Point(183, 184);
             this.layoutControlGroup2.Name = "layoutControlGroup2";
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(852, 337);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(854, 339);
             this.layoutControlGroup2.Text = "定位结果";
             // 
             // layoutControlItem2
@@ -439,7 +429,7 @@ namespace XdCxRhDW.App.UserControl
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem2.Size = new System.Drawing.Size(846, 283);
+            this.layoutControlItem2.Size = new System.Drawing.Size(848, 284);
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
             // 
@@ -520,7 +510,7 @@ namespace XdCxRhDW.App.UserControl
             this.emptySpaceItem1.AllowHotTrack = false;
             this.emptySpaceItem1.Location = new System.Drawing.Point(670, 0);
             this.emptySpaceItem1.Name = "emptySpaceItem1";
-            this.emptySpaceItem1.Size = new System.Drawing.Size(176, 28);
+            this.emptySpaceItem1.Size = new System.Drawing.Size(178, 28);
             this.emptySpaceItem1.TextSize = new System.Drawing.Size(0, 0);
             // 
             // splitterItem1
@@ -528,14 +518,14 @@ namespace XdCxRhDW.App.UserControl
             this.splitterItem1.AllowHotTrack = true;
             this.splitterItem1.Location = new System.Drawing.Point(173, 0);
             this.splitterItem1.Name = "splitterItem1";
-            this.splitterItem1.Size = new System.Drawing.Size(12, 523);
+            this.splitterItem1.Size = new System.Drawing.Size(10, 523);
             // 
             // splitterItem2
             // 
             this.splitterItem2.AllowHotTrack = true;
-            this.splitterItem2.Location = new System.Drawing.Point(185, 174);
+            this.splitterItem2.Location = new System.Drawing.Point(183, 174);
             this.splitterItem2.Name = "splitterItem2";
-            this.splitterItem2.Size = new System.Drawing.Size(852, 12);
+            this.splitterItem2.Size = new System.Drawing.Size(854, 10);
             // 
             // svgImageCollection1
             // 
@@ -563,7 +553,6 @@ namespace XdCxRhDW.App.UserControl
             // popupMenu2
             // 
             this.popupMenu2.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] {
-            new DevExpress.XtraBars.LinkPersistInfo(this.btnTar),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnDrawDto),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnDrawDfo),
             new DevExpress.XtraBars.LinkPersistInfo(this.btnDrawCX),
@@ -645,7 +634,6 @@ namespace XdCxRhDW.App.UserControl
         private DevExpress.Utils.Html.HtmlTemplateCollection htmlTemplateCollection1;
         private DevExpress.Utils.Html.HtmlTemplate htmlTemplate1;
         private DevExpress.XtraBars.PopupMenu popupMenu2;
-        private DevExpress.XtraBars.BarButtonItem btnTar;
         private DevExpress.XtraBars.BarButtonItem btnDrawDto;
         private DevExpress.XtraBars.BarButtonItem btnDrawDfo;
         private DevExpress.XtraBars.BarButtonItem btnDrawCX;

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -124,6 +124,10 @@ namespace XdCxRhDW.App.UserControl
                    {
                        UseMirr(items.ToList());
                    });
+                mapControl1.AddRectMenu<PosRes>("编辑目标", SvgHelper.LoadFromFile("Image\\Edit.svg"), items =>
+                {
+                    EditTarget(items.ToList());
+                });
                 mapControl1.AddPosMenu<PosRes>("绘制时差线", SvgHelper.LoadFromFile("Image\\DtoLine.svg"), item =>
                 {
                     DrawDtoLine(item);
@@ -256,6 +260,49 @@ namespace XdCxRhDW.App.UserControl
 
             WaitHelper.CloseForm();
         }
+        private async void EditTarget(List<PosRes> items)
+        {
+            if (items == null || items.Count() == 0)
+            {
+                DxHelper.MsgBoxHelper.ShowWarning($"请选择需要编辑目标的定位数据信息!");
+                return;
+            }
+            try
+            {
+                var firstItem = items.First();
+                EditorTar frm = new EditorTar(new TargetInfo() { ID = firstItem.TargetID.HasValue ? firstItem.TargetID.Value : 0, TargetName = firstItem.TarName });
+                if (frm.ShowDialog() != DialogResult.OK) return;
+                var tar = frm.info;
+                var groupItems = items.GroupBy(p => p.SigTime.ToString("yyyyMMdd"));
+                foreach (var groupItem in groupItems)
+                {
+                    var ids = groupItem.Select(m => m.ID).ToList();
+                    using (RHDWPartContext db = RHDWPartContext.GetContext(groupItem.First().SigTime))
+                    {
+                        var array = await db.PosRes.Where(p => ids.Contains(p.ID)).ToArrayAsync();
+                        EditTarget(array, tar);
+                        await db.SaveChangesAsync();
+                    }
+                }
+                EditTarget(items, tar);
+                gridView2.RefreshData();
+            }
+            catch (Exception ex)
+            {
+                Serilog.Log.Error(ex, "编辑定位目标异常!");
+                MsgBoxHelper.ShowError("编辑定位目标异常!");
+            }
+
+        }
+        private void EditTarget(IEnumerable<PosRes> pos, TargetInfo tar)
+        {
+            foreach (var item in pos)
+            {
+                item.TargetID = tar.ID;
+                item.TarName = tar.TargetName;
+            }
+
+        }
         private async void UseMirr(List<PosRes> items)
         {
             if (items == null || items.Count() == 0)
@@ -277,7 +324,6 @@ namespace XdCxRhDW.App.UserControl
                     {
                         var array = await db.PosRes.Where(p => ids.Contains(p.ID)).ToArrayAsync();
                         UseMirror(array);
-                        db.PosRes.AddOrUpdate(array);
                         await db.SaveChangesAsync();
 
                     }
@@ -712,39 +758,6 @@ namespace XdCxRhDW.App.UserControl
             mapControl1.UpdatePosItem(p);
         }
 
-        private async void btnTar_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
-        {
-            try
-            {
-                //var ids = gridView2.GetSelectedRows();
-                //if (ids.Length <= 0) return;
-
-                //var fisrtitem = gridView2.GetRow(ids[0]) as PosRes;
-                //EditorTar frm = new EditorTar(new TargetInfo() { ID = fisrtitem.TargetID.HasValue ? fisrtitem.TargetID.Value : 0, TargetName = fisrtitem.TarName });
-                //if (frm.ShowDialog() != DialogResult.OK) return;
-                //var tar = frm.info;
-                //using (RHDWContext db = new RHDWContext())
-                //{
-                //    foreach (var id in ids)
-                //    {
-                //        var item = gridView2.GetRow(id) as PosRes;
-                //        var tarItem = await db.PosRes.Where(p => p.ID == item.ID).FirstOrDefaultAsync();
-                //        if (tarItem != null)
-                //        {
-                //            item.TargetID = tarItem.TargetID = tar.ID;
-                //            item.TarName = tarItem.TarName = tar.TargetName;
-                //        }
-
-                //    }
-                //    await db.SaveChangesAsync();
-                //}
-            }
-            catch (Exception ex)
-            {
-                Serilog.Log.Error(ex, "编辑定位目标异常");
-                DxHelper.MsgBoxHelper.ShowError("编辑定位目标异常");
-            }
-        }
 
         private void btnDrawDto_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
         {

XdCxRhDW.App/UserControl/CtrlHome.resx

@@ -158,26 +158,6 @@
         djAuNGwtNC45LTMuMWMtMC44LTAuNS0xLjgtMC40LTIuNSwwLjNjLTAuOCwwLjgtMC44LDIuMSwwLDIu
         OWw5LjMsOS41YzEuMiwxLjMsMywyLjEsNC45LDIuMUgyMyAgIGMzLjMsMCw2LTIuNyw2LTZ2LTR2LTZW
         OEMyOSw2LjksMjguMSw2LDI3LDZ6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="btnTar.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAQDAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        Qmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9CgkuWWVsbG93e2ZpbGw6I0ZG
-        QjExNTt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
-        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8cGF0aCBkPSJNMjQsMjQu
-        OFYyOEg0VjRoMjB2Ny4ybDItMlYzYzAtMC41LTAuNS0xLTEtMUgzQzIuNSwyLDIsMi41LDIsM3YyNmMw
-        LDAuNSwwLjUsMSwxLDFoMjJjMC41LDAsMS0wLjUsMS0xdi02LjIgIEwyNCwyNC44eiIgY2xhc3M9IkJs
-        YWNrIiAvPg0KICA8cGF0aCBkPSJNMjksMTdsLTgsOGwtNC00bDgtOEwyOSwxN3ogTTMwLDE2bDEuNy0x
-        LjdjMC40LTAuNCwwLjQtMSwwLTEuM0wyOSwxMC4zYy0wLjQtMC40LTEtMC40LTEuMywwTDI2LDEyTDMw
-        LDE2eiAgIE0xNiwyMnY0aDRMMTYsMjJ6IiBjbGFzcz0iQmx1ZSIgLz4NCjwvc3ZnPgs=
 </value>
   </data>
   <data name="btnDrawCX.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -201,7 +181,7 @@
   <metadata name="toolTipController1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>391, 17</value>
   </metadata>
-  <data name="buttonImageOptions7.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="buttonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -220,7 +200,7 @@
         DQogIDwvZz4NCjwvc3ZnPgs=
 </value>
   </data>
-  <data name="buttonImageOptions8.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="buttonImageOptions2.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
@@ -241,7 +221,7 @@
         ICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="buttonImageOptions9.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="buttonImageOptions3.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi4z
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -566,6 +566,9 @@
     <Content Include="Image\DtoLine.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="Image\Edit.svg">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="Image\GDOP.svg">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>