1111

Service/CheckServer/MainForm.cs

@@ -1,4 +1,5 @@
-using DxHelper;
+using DevExpress.Utils;
+using DxHelper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -15,9 +16,10 @@ namespace CheckServer
         public MainForm()
         {
             InitializeComponent();
-            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>();
-            gridView1.Columns[0].MaxWidth = 150;
-            gridView1.Columns[1].MaxWidth = 120;
+            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>().SetLogImageColumn(nameof(LogInfo.LogType), typeof(EnumLogType));
+            gridView1.Columns[nameof(LogInfo.LogType)].MaxWidth = 100;
+            gridView1.Columns[nameof(LogInfo.LogTime)].MaxWidth = 160;
+            gridView1.Columns[nameof(LogInfo.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
             this.IconOptions.SvgImage = DxHelper.SvgHelper.LoadFromFile("Service.svg");
             LogHelper.Logger = info =>
             {

Service/CpuCgServer/MainForm.cs

@@ -1,4 +1,5 @@
-using DxHelper;
+using DevExpress.Utils;
+using DxHelper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -15,9 +16,10 @@ namespace CpuCgServer
         public MainForm()
         {
             InitializeComponent();
-            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>();
-            gridView1.Columns[0].MaxWidth = 150;
-            gridView1.Columns[1].MaxWidth = 120;
+            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>().SetLogImageColumn(nameof(LogInfo.LogType), typeof(EnumLogType));
+            gridView1.Columns[nameof(LogInfo.LogType)].MaxWidth = 100;
+            gridView1.Columns[nameof(LogInfo.LogTime)].MaxWidth = 160;
+            gridView1.Columns[nameof(LogInfo.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
             this.IconOptions.SvgImage = DxHelper.SvgHelper.LoadFromFile("Service.svg");
             LogHelper.Logger = info =>
             {

Service/GpuCgServer/MainForm.cs

@@ -1,4 +1,5 @@
-using DxHelper;
+using DevExpress.Utils;
+using DxHelper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -15,9 +16,10 @@ namespace GpuCgServer
         public MainForm()
         {
             InitializeComponent();
-            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>();
-            gridView1.Columns[0].MaxWidth = 150;
-            gridView1.Columns[1].MaxWidth = 120;
+            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>().SetLogImageColumn(nameof(LogInfo.LogType), typeof(EnumLogType));
+            gridView1.Columns[nameof(LogInfo.LogType)].MaxWidth = 100;
+            gridView1.Columns[nameof(LogInfo.LogTime)].MaxWidth = 160;
+            gridView1.Columns[nameof(LogInfo.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
             this.IconOptions.SvgImage = DxHelper.SvgHelper.LoadFromFile("Service.svg");
             LogHelper.Logger = info =>
             {

Service/X2D1NoRefTaskServer/LogInfo.cs

@@ -15,12 +15,13 @@ namespace X2D1NoRefTaskServer
             this.LogTime = DateTime.Now;
             this.LogType = EnumLogType.Info;
         }
-        [Display(Name = "时间")]
-        public DateTime LogTime { get; private set; }
-
         [Display(Name = "日志类型")]
         public EnumLogType LogType { get; set; }
 
+
+        [Display(Name = "时间")]
+        public DateTime LogTime { get; private set; }
+
         [Display(Name = "内容")]
         public string Msg { get; set; }
     }

Service/X2D1NoRefTaskServer/MainForm.cs

@@ -6,6 +6,8 @@ using System.Windows.Forms;
 using XdCxRhDW.Dto;
 using XdCxRhDW.WebApi;
 using X2D1NoRefTaskServer;
+using DevExpress.Utils;
+using DevExpress.XtraEditors.Repository;
 
 namespace X2D1NoRefTaskServer
 {
@@ -15,9 +17,10 @@ namespace X2D1NoRefTaskServer
         public MainForm()
         {
             InitializeComponent();
-            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>();
-            gridView1.Columns[0].MaxWidth = 150;
-            gridView1.Columns[1].MaxWidth = 120;
+            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>().SetLogImageColumn(nameof(LogInfo.LogType), typeof(EnumLogType));
+            gridView1.Columns[nameof(LogInfo.LogType)].MaxWidth = 100;
+            gridView1.Columns[nameof(LogInfo.LogTime)].MaxWidth = 160;
+            gridView1.Columns[nameof(LogInfo.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
             this.IconOptions.SvgImage = DxHelper.SvgHelper.LoadFromFile("Service.svg");
             LogHelper.Logger = info =>
             {
@@ -33,7 +36,7 @@ namespace X2D1NoRefTaskServer
             var posPlatformAddr = ConfigurationManager.AppSettings["PosPlatformAddr"].Trim();
             this.Text = EnumSvrType.X2D1NoRefHistoryTask.GetEnumDisplayName() + "-" + svrID;
             var localIp = IpHelper.GetLocalIp();
-            
+
             Startup.Start(port, $"{System.Reflection.Assembly.GetExecutingAssembly().GetName().Name}.xml", "XdCxRhDW.Dto.xml");
             LogHelper.Info($"服务启动成功.接口地址http://{localIp}:{port}/swagger");
 

Service/X2D1TaskServer54/MainForm.cs

@@ -1,4 +1,5 @@
-using DxHelper;
+using DevExpress.Utils;
+using DxHelper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -14,9 +15,10 @@ namespace X3TaskServer54
         public MainForm()
         {
             InitializeComponent();
-            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>();
-            gridView1.Columns[0].MaxWidth = 150;
-            gridView1.Columns[1].MaxWidth = 120;
+            gridLog.UseDefault(list).UseExportCsv().UseClear<LogInfo>().SetLogImageColumn(nameof(LogInfo.LogType), typeof(EnumLogType));
+            gridView1.Columns[nameof(LogInfo.LogType)].MaxWidth = 100;
+            gridView1.Columns[nameof(LogInfo.LogTime)].MaxWidth = 160;
+            gridView1.Columns[nameof(LogInfo.Msg)].AppearanceCell.TextOptions.HAlignment = HorzAlignment.Near;
             this.IconOptions.SvgImage = DxHelper.SvgHelper.LoadFromFile("Service.svg");
             LogHelper.Logger = info =>
             {

XdCxRhDW.App/Controllers/PosController.cs

@@ -943,7 +943,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.SxDto,4),
+                    Dto1 = Math.Round(dto.SxDto, 4),
                     Dfo1 = Math.Round(dto.SxDfo.Value, 4),
                     Snr1 = Math.Round(dto.SxSnr.Value, 4),
                     DtoCdb = Math.Round(dto.XdDto, 4),
@@ -1060,7 +1060,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1,4),
+                    Dto1 = Math.Round(dto.Dto1, 4),
                     Dfo1 = Math.Round(dto.Dfo1.Value, 4),
                     Snr1 = Math.Round(dto.Snr1.Value, 4),
                     Dto2 = Math.Round(dto.Dto2, 4),
@@ -1218,7 +1218,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1,4),
+                    Dto1 = Math.Round(dto.Dto1, 4),
                     Dfo1 = Math.Round(dto.Dfo1.Value, 4),
                     Snr1 = Math.Round(dto.Snr1.Value, 4),
                     Dto2 = Math.Round(dto.Dto2, 4),
@@ -1335,7 +1335,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1,4),
+                    Dto1 = Math.Round(dto.Dto1, 4),
                     Dfo1 = Math.Round(dto.Dfo1.Value, 4),
                     Snr1 = Math.Round(dto.Snr1.Value, 4),
                     Dto2 = Math.Round(dto.Dto2, 4),
@@ -1487,7 +1487,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1,4),
+                    Dto1 = Math.Round(dto.Dto1, 4),
                     Dfo1 = Math.Round(dto.Dfo1.Value, 4),
                     Snr1 = Math.Round(dto.Snr1.Value, 4),
                     Dto2 = Math.Round(dto.Dto2, 4),
@@ -1605,7 +1605,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1.Value,4),
+                    Dto1 = Math.Round(dto.Dto1.Value, 4),
                     Dfo1 = Math.Round(dto.Dfo1, 4),
                     Snr1 = Math.Round(dto.Snr1.Value, 4),
                     Dto2 = Math.Round(dto.Dto2.Value, 4),
@@ -1765,7 +1765,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto1.Value,4),
+                    Dto1 = Math.Round(dto.Dto1.Value, 4),
                     Dfo1 = Math.Round(dto.Dfo1, 4),
                     Snr1 = Math.Round(dto.Snr1.Value, 4),
                     Dto2 = Math.Round(dto.Dto2.Value, 4),
@@ -1888,7 +1888,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto,4),
+                    Dto1 = Math.Round(dto.Dto, 4),
                     Dfo1 = Math.Round(dto.Dfo, 4),
                     Snr1 = Math.Round(dto.Snr.Value, 4),
                     YbMainDto = Math.Round(dto.YbMainDto, 4),
@@ -2025,7 +2025,7 @@ namespace XdCxRhDW.App.Controllers
                 var cgRes = db.CgRes.Add(new CgRes()
                 {
                     SigTime = dto.SigTime,
-                    Dto1 = Math.Round(dto.Dto,4),
+                    Dto1 = Math.Round(dto.Dto, 4),
                     Dfo1 = Math.Round(dto.Dfo, 4),
                     Snr1 = Math.Round(dto.Snr.Value, 4),
                     YbMainDto = Math.Round(dto.YbMainDto, 4),
@@ -2168,18 +2168,17 @@ namespace XdCxRhDW.App.Controllers
                             query = query.Where(p => p.PosLon != 999);
                         if (dto.TarFrequpHz != null)
                             query = query.Where(p => p.FreqUpHz == dto.TarFrequpHz.Value);
-                        var posRes = await query.OrderByDescending(p => p.SigTime).ToListAsync();
+                        var posRes = await query.Include(p => p.CheckRes).OrderByDescending(p => p.SigTime).ToListAsync();
 
                         foreach (var itemPos in posRes)
                         {
-                            itemPos.TargetInfo = targets?.FirstOrDefault(p => p.ID == itemPos.TargetInfoID);
-                            if (itemPos.TargetInfo != null && !string.IsNullOrWhiteSpace(itemPos.TargetInfo.TargeColor))
+                            if (itemPos.TargetInfoID > 0)
                             {
-                                itemPos.ColorKey = itemPos.TargetInfo.TargeColor;
+                                itemPos.TargetInfo = targets.FirstOrDefault(p => p.ID == itemPos.TargetInfoID);
+                                if (itemPos.TargetInfo != null && !string.IsNullOrWhiteSpace(itemPos.TargetInfo.TargeColor))
+                                    itemPos.ColorKey = itemPos.TargetInfo.TargeColor;
+
                             }
-                            itemPos.BaseTargetName = itemPos.TargetInfo?.TargetName;
-                            itemPos.CheckRes = await db.CheckRes.FirstOrDefaultAsync(p => p.ID == itemPos.CheckResID);
-                            itemPos.BaseCheckType = itemPos.CheckRes?.PosCheckType?.GetEnumDisplayName();
                         }
                         posList.AddRange(posRes);
                     }
@@ -2390,8 +2389,6 @@ namespace XdCxRhDW.App.Controllers
                 TargetInfo = res.TargetInfo,
                 TargetInfoID = res.TargetInfoID,
                 UpdateTime = res.UpdateTime,
-                BaseTargetName = res.TargetInfo?.TargetName,
-                BaseCheckType = res.CheckRes?.PosCheckType?.GetEnumDisplayName(),
             };
         }
 

XdCxRhDW.App/DxHelper/SvgHelper.cs

@@ -552,5 +552,50 @@ namespace DxHelper
             ms.Dispose();
             return svg;
         }
+        /// <summary>
+        /// Info
+        /// </summary>
+        /// <returns></returns>
+        public static SvgImage CreateInfo (string color= "#1177D7", int width = 24, int height = 24)
+        {
+            string xml = $"<svg xmlns='http://www.w3.org/2000/svg\' width='{width}px' height='{height}px' viewBox='0 0 32 32'>"
+                + $"<path fill='{color}' d='M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M16,6c1.1,0,2,0.9,2,2s-0.9,2-2,2s-2-0.9-2-2S14.9,6,16,6z M20,24h-8v-2h2v-8h-2v-2h2h4v10h2V24z'/>\r\n"
+                + $"<path fill='{color}' d='M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M16,6c1.1,0,2,0.9,2,2s-0.9,2-2,2s-2-0.9-2-2S14.9,6,16,6z M20,24h-8v-2h2v-8h-2v-2h2h4v10h2V24z'/>\r\n"
+                + "</svg>";
+            MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            var svg = SvgLoader.LoadFromStream(ms);
+            ms.Dispose();
+            return svg;
+        }
+        /// <summary>
+        /// Warning
+        /// </summary>
+        /// <returns></returns>
+        public static SvgImage CreateWarning(string color= "#FFB115", int width = 24, int height = 24)
+        {
+            string xml = $"<svg xmlns='http://www.w3.org/2000/svg\' width='{width}px' height='{height}px' viewBox='0 0 32 32'>"
+                + $"<path fill='{color}' d='M14.9,4.7c0.6-1,1.5-1,2.1,0l12.7,21.5c0.6,1,0.1,1.8-1,1.8H3.3c-1.2,0-1.6-0.8-1-1.8L14.9,4.7z'/>"
+                + $"<circle fill='#727272' cx='16' cy='22' r='2'/>"
+                + $"<rect x='14' y='10' fill='#727272' width='4' height='8'/>"
+                + "</svg>";
+            MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            var svg = SvgLoader.LoadFromStream(ms);
+            ms.Dispose();
+            return svg;
+        }
+        /// <summary>
+        /// Error
+        /// </summary>
+        /// <returns></returns>
+        public static SvgImage CreateError(string color = "#D11C1C", int width = 24, int height = 24)
+        {
+            string xml = $"<svg xmlns='http://www.w3.org/2000/svg\' width='{width}px' height='{height}px' viewBox='0 0 32 32'>"
+                + $"<path fill='{color}' d='M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M16,24c-1.1,0-2-0.9-2-2s0.9-2,2-2s2,0.9,2,2S17.1,24,16,24z M18,18h-4V8h4V18z'/>"
+                + "</svg>";
+            MemoryStream ms = new MemoryStream(Encoding.UTF8.GetBytes(xml));
+            var svg = SvgLoader.LoadFromStream(ms);
+            ms.Dispose();
+            return svg;
+        }
     }
 }

XdCxRhDW.App/ExtensionsDev/GridControlEx.cs

@@ -6,6 +6,7 @@ using DevExpress.Utils.Svg;
 using DevExpress.XtraBars;
 using DevExpress.XtraEditors;
 using DevExpress.XtraEditors.Controls;
+using DevExpress.XtraEditors.Repository;
 using DevExpress.XtraGrid;
 using DevExpress.XtraGrid.Columns;
 using DevExpress.XtraGrid.Views.Grid;
@@ -361,6 +362,21 @@ public static class GridControlEx
         }, false);
         return grid;
     }
+    public static GridControl SetLogImageColumn(this GridControl grid, string columnFieldName,Type enumType)
+    {
+        var view = grid.MainView as GridView;
+        RepositoryItemImageComboBox edit = new RepositoryItemImageComboBox();
+        edit.AddEnum(enumType);
+        SvgImageCollection svgImages = new SvgImageCollection();
+        svgImages.ImageSize = new System.Drawing.Size(20, 20);
+        svgImages.Add(SvgHelper.CreateInfo());
+        svgImages.Add(SvgHelper.CreateWarning());
+        svgImages.Add(SvgHelper.CreateError());
+        edit.SmallImages = svgImages;
+        edit.GlyphAlignment = DevExpress.Utils.HorzAlignment.Center;
+        view.Columns[columnFieldName].ColumnEdit = edit;
+        return grid;
+    }
 
     /// <summary>
     /// 为GirdControl启用右键清除所有数据的功能

XdCxRhDW.App/ExtensionsDev/MapControlEx.cs

@@ -135,6 +135,12 @@ public static class MapControlEx
         ctrl.ToolTipController.BeforeShow += (sender, e) =>
         {
             if (e.SelectedObject == null) return;
+            if (e.SelectedObject is MapPolyline)
+            {
+                e.SuperTip = null;
+                e.ToolTip = null;
+                return;
+            }
             SuperToolTip superToolTip = new SuperToolTip();
             if (innerData.posMenu.Visible || innerData.mapMenu.Visible || innerData.rectMenu.Visible)
             {
@@ -550,8 +556,41 @@ public static class MapControlEx
             };
             list.Add(mapItem);
             innerData._dataCache.Add(p, mapItem);
+
         }
+        var itemList = items.OrderBy(p => p.SigTime).ToList().GroupBy(t => t.ColorKey);
+        List<MapPolyline> listLine = new List<MapPolyline>();
+        foreach (var groupItems in itemList)
+        {
+            var targets = groupItems.ToList();
+            var colorKey = targets.First().ColorKey;
+            for (int i = 0; i < targets.Count - 1; i++)
+            {
+                var line = new MapPolyline();
+                line.CanEdit = false;
+                line.CanMove = false;
+                line.CanResize = false;
+                line.CanRotate = false;
+                line.EnableSelection = DefaultBoolean.False;
+                line.EnableHighlighting = DefaultBoolean.False;
+                line.IsGeodesic = true;
+                line.Stroke = ColorHelper.IsHtmlColor(colorKey) ? ColorTranslator.FromHtml(colorKey) : ColorHelper.GetColor(colorKey);
+                line.EndLineCap.Width = 12;
+                line.EndLineCap.Length = 20;
+                line.EndLineCap.Visible = true;
+                line.EndLineCap.IsFilled = false;
+                line.StrokeWidth = 2;
+                //line.EndLineCap.Length = 100;
+                var p1 = new GeoPoint(targets[i].PosLat, targets[i].PosLon);
+                var p2 = new GeoPoint(targets[i + 1].PosLat, targets[i + 1].PosLon);
+                line.Points.Add(p1);
+                line.Points.Add(p2);
+                listLine.Add(line);
+            }
+        }
+
         innerData.posStorge.Items.AddRange(list);
+        innerData.posStorge.Items.AddRange(listLine);
     }
 
     /// <summary>
@@ -649,7 +688,7 @@ public static class MapControlEx
     /// <param name="setCenter">是否将这个点设置到地图中心显示</param>
     public static void UpdatePosItem<T>(this MapControl ctrl, T item, bool setCenter = false) where T : PosData, new()
     {
-        if (item == null||item.PosLon==999||item.PosLat==999) return;
+        if (item == null || item.PosLon == 999 || item.PosLat == 999) return;
         var innerData = ctrl.Tag as InnerData;
         var key = innerData._dataCache.Keys.Where(p => p.ID == item.ID).FirstOrDefault();
         if (key != null)
@@ -874,7 +913,7 @@ public static class MapControlEx
                 tileSource.LayerName = "satellite";
                 ImageLayer satelliteImageLayer = new ImageLayer()
                 {
-                     Name="WMTS:SJZX-SatMap"
+                    Name = "WMTS:SJZX-SatMap"
                 };
                 ctrl.Layers.Add(satelliteImageLayer);
                 satelliteImageLayer.DataProvider = provider;
@@ -889,7 +928,7 @@ public static class MapControlEx
                 tileSource.LayerName = "electron";
                 ImageLayer electronImageLayer = new ImageLayer()
                 {
-                    Name="WMTS:SJZX-Electron"
+                    Name = "WMTS:SJZX-Electron"
                 };
                 ctrl.Layers.Add(electronImageLayer);
                 electronImageLayer.DataProvider = provider;
@@ -936,7 +975,7 @@ public static class MapControlEx
                 tileSource.LayerType = layerType;
                 tileSource.LayerName = "overlay-final";
                 ImageLayer overlayImageLayer = new ImageLayer()
-                { 
+                {
                     Name = "WMTS:ZCJ-Overlay"
                 };
                 ctrl.Layers.Add(overlayImageLayer);
@@ -983,7 +1022,7 @@ public static class MapControlEx
         //    if (string.IsNullOrWhiteSpace(layerName))
         //        provider.ActiveLayerName = e.Layers[0].Name;
         //};
-        ImageLayer layer = new ImageLayer() { Name="WMTS:Wms"};
+        ImageLayer layer = new ImageLayer() { Name = "WMTS:Wms" };
         layer.DataProvider = provider;
         ctrl.Layers.Add(layer);
         return ctrl;
@@ -1906,7 +1945,7 @@ public static class MapControlEx
         mMapType = mapType;
         listMapCtrl.ForEach(t =>
         {
-            var localLayer =t.GetImageLayer()?.FirstOrDefault(p=>p.Name=="WMTS:Local");
+            var localLayer = t.GetImageLayer()?.FirstOrDefault(p => p.Name == "WMTS:Local");
             if (localLayer == null) return;
             var provider = localLayer.DataProvider as MapTileDataProviderBase;
             provider?.ClearCache();

XdCxRhDW.App/Model/ModelPosRes.cs

@@ -18,10 +18,10 @@ namespace XdCxRhDW.App.Model
         }
         [Display(Name = "目标名称")]
         [ToolTip]
-        public string TargetName => BaseTargetName;
+        public string TargetName => TargetInfo?.TargetName;
 
         [Display(Name = "检测方式")]
         [ToolTip]
-        public string CheckType => BaseCheckType;
+        public string CheckType => CheckRes?.PosCheckType?.GetEnumDisplayName();
     }
 }

XdCxRhDW.App/UserControl/CtrlHome.cs

@@ -1435,7 +1435,6 @@ namespace XdCxRhDW.App.UserControl
                 {
                     p.TargetInfoID = tar.ID;
                     p.TargetInfo = tar;
-                    p.BaseTargetName = tar.TargetName;
                     p.ColorKey = tar.TargeColor;
                 });
                 gridView2.RefreshData();

XdCxRhDW.Entity/PosRes.cs

@@ -35,10 +35,6 @@ namespace XdCxRhDW.Entity
         [JsonIgnore]
         public virtual CxRes CxRes { get; set; }
 
-        [NotMapped]
-        [Display(AutoGenerateField = false)]
-        public string BaseCheckType { get; set; }
-
         [Display(Name = "参估编号")]
         public long CgResID { get; set; }
 
@@ -48,17 +44,14 @@ namespace XdCxRhDW.Entity
 
         [Display(AutoGenerateField = false)]
         public int? TargetInfoID { get; set; }
-        public TargetInfo TargetInfo;
 
-        [NotMapped]
         [Display(AutoGenerateField = false)]
-        public string BaseTargetName { get; set; }
+        public virtual TargetInfo TargetInfo { get; set; }
 
         [Display(Name = "检测编号")]
         public long? CheckResID { get; set; }
 
         [Display(AutoGenerateField = false)]
-        [JsonIgnore]
         public virtual CheckRes CheckRes { get; set; }
 
         [Display(Name = "定位点")]