From c615747f8ac9dfd3ee92f85e1bf48ef7cf676663 Mon Sep 17 00:00:00 2001
From: chenjinbu <jinbuchen@bimoun.com.cn>
Date: Mon, 22 Sep 2025 14:28:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=83=E7=BD=AE=E5=9B=BE=E5=BC=82=E5=B8=B8?=
 =?UTF-8?q?=E5=85=83=E4=BB=B6=E5=8F=A6=E5=A4=96=E4=B8=80=E4=B8=AAGrid?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...gnTimeResolveAssemblyReferencesInput.cache | Bin 2294 -> 2287 bytes
 newFront/c#前端/SWS.Electrical/GlobalObj.cs   |   6 +-
 .../DialogAutoArrangeLayoutViewModel.cs       | 126 +++++++--
 .../Views/DialogAutoArrangeLayout.xaml        | 255 +++++++++++-------
 .../Debug/Views/DialogAutoArrangeLayout.g.cs  |  23 +-
 .../Debug/Views/DialogAutoArrangeLayout.g.i.cs |  23 +-
 .../SWS.WPF/obj/Debug/SWS.WPF.g.resources     | Bin 104014 -> 104170 bytes
 .../DialogSignalManagement.g.i.cs             |  14 +-
 8 files changed, 305 insertions(+), 142 deletions(-)

diff --git a/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WeChat/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Learun.Framework.Module/Learun.Application.Module/Learun.Application.WeChat/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index 97b19aa843ce17a74e722ba7ef84be794e9b52ff..e67f1c240493fadf9852ae4bd03b020ea2e24984 100644
GIT binary patch
delta 233
zcmew+_+D^=bh46*Rm{to9WVCJeztaL%*%y4pU++wV_;wzlUPuomz<xMmYJ@OOG!au
za&}^RYB5w@A`W#M8^stULUBk=-oR)l;etbQGdt5n7KuC@vXeKmEtH(jh+Eco^G<eK
FMgY`8b$tK;

delta 254
zcmaDa_)TzvbegiWRZLN8L4J(0zl&>(fq`Ybi>Iz@PHJ*YVnKmka(-S~X1WGWH3f;u
z*@@|?#ZZMwxD;-z6JwMN!zDX;4Wpf;D=yj1OiUA5B=d1ePpngzJfEFs@^!XSsTquf
MRVi-X#BR$70QBBdK>z>%

diff --git a/newFront/c#前端/SWS.Electrical/GlobalObj.cs b/newFront/c#前端/SWS.Electrical/GlobalObj.cs
index a414c977..e5d7d323 100644
--- a/newFront/c#前端/SWS.Electrical/GlobalObj.cs
+++ b/newFront/c#前端/SWS.Electrical/GlobalObj.cs
@@ -97,9 +97,9 @@ namespace SWS.Electrical
                             var listProjects = (await projectService.GetProjects(1, 1000)).Rows;
                             var p = listProjects.FirstOrDefault(a => a.ProjectId == curProjId);
                             GlobalObject.curProject = p;
-                            var obj = await projectService.InitProjInfo(curProjId, "");
-                            var treeData = obj.First(x => (string)x["Name"] == "图纸树（按目录）")["data"];
-                            treeDrawings = JsonConvert.DeserializeObject<List<TreeModel>>(treeData.ToString());
+                            //var obj = await projectService.InitProjInfo(curProjId, "");
+                            //var treeData = obj.First(x => (string)x["Name"] == "图纸树（按目录）")["data"];
+                            //treeDrawings = JsonConvert.DeserializeObject<List<TreeModel>>(treeData.ToString());
 
                         });
                     }
diff --git a/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs b/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs
index 092b6d03..b91a8efe 100644
--- a/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs
+++ b/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs
@@ -49,7 +49,7 @@ namespace SWS.Electrical.ViewModels
         }
         private ObservableCollection<DtoAutoPlotLayout> _listBasePoint;
         /// <summary>
-        /// 基点元件列表
+        /// 正常基点元件列表
         /// </summary>
         public ObservableCollection<DtoAutoPlotLayout> listBasePoint
         {
@@ -63,6 +63,22 @@ namespace SWS.Electrical.ViewModels
                 }
             }
         }
+        private ObservableCollection<DtoAutoPlotLayout> _listErrBasePoint;
+        /// <summary>
+        /// 异常基点元件列表
+        /// </summary>
+        public ObservableCollection<DtoAutoPlotLayout> listErrBasePoint
+        {
+            get { return this._listErrBasePoint; }
+            set
+            {
+                if (value != this._listErrBasePoint)
+                {
+                    this._listErrBasePoint = value;
+                    RaisePropertyChanged(nameof(listErrBasePoint));
+                }
+            }
+        }
         private DtoAutoPlotLayout _SelectedTag;
         /// <summary>
         /// 基点元件
@@ -193,6 +209,24 @@ namespace SWS.Electrical.ViewModels
             get { return _inputValue; }
             set { _inputValue = value; OnPropertyChanged(nameof(inputValue)); }
         }
+        private string _NormalTagCount = "正常元件";
+        /// <summary>
+        /// 正常位号
+        /// </summary>
+        public string NormalTagCount
+        {
+            get { return _NormalTagCount; }
+            set { _NormalTagCount = value; OnPropertyChanged(nameof(NormalTagCount)); }
+        }
+        private string _ErrTagCount = "异常元件";
+        /// <summary>
+        /// 异常位号
+        /// </summary>
+        public string ErrTagCount
+        {
+            get { return _ErrTagCount; }
+            set { _ErrTagCount = value; OnPropertyChanged(nameof(ErrTagCount)); }
+        }
 
         /// <summary>
         /// 命令事件
@@ -238,6 +272,7 @@ namespace SWS.Electrical.ViewModels
             _ServiceDataItem = GlobalObject.container.Resolve<DataItemService>();
             listDrawings = new ObservableCollection<DtoDrawing>();
             listBasePoint = new ObservableCollection<DtoAutoPlotLayout>();
+            listErrBasePoint = new ObservableCollection<DtoAutoPlotLayout>();
             listMsg = new ObservableCollection<TextBlock>();
             var list = new ObservableCollection<KeyValueModel>();
             list.Add(new KeyValueModel { Key = "甲板号", Value = "甲板号" });
@@ -442,48 +477,91 @@ namespace SWS.Electrical.ViewModels
                 BusyContent = "数据加载中...";
                 AddMsg("开始查询布置图基点元件信息...");
                 List<DtoAutoPlotLayout> listDto = new List<DtoAutoPlotLayout>();
+                List<DtoAutoPlotLayout> listErrDto = new List<DtoAutoPlotLayout>();
+                bool isBasePointErr = false;
+                bool isTagErr = false;
+                int index = 1;
+                int count = listSelDwg.Count;
                 foreach (var dwg in listSelDwg)
                 {
+                    BusyContent = $"数据加载中......{index}/{count}";
                     var list = await _ServicePlotLayout.GetBasePointByDwg(selectRange.Value, selectOperator.Value, inputValue, dwg.DrawingFileID);
+                    index++;
                     if (list == null)
                     { continue; }
                     foreach (var basePoint in list)
                     {
                         if (basePoint.area != null && basePoint.area.ToLower() == "err")
-                        { continue; }
+                        { isBasePointErr = true; }
+                        else { isBasePointErr = false; }
                         if (basePoint.Tags.Any())
                         {
                             foreach (var tag in basePoint.Tags)
                             {
                                 if (tag.area != null && tag.area.ToLower() == "err")
-                                { continue; }
-                                listDto.Add(new DtoAutoPlotLayout()
+                                { isTagErr = true; }
+                                else { isTagErr = false; }
+                                if (isBasePointErr || isTagErr)
                                 {
-                                    IsSelected = true,
-                                    DrawingFileID = dwg.DrawingFileID,
-                                    DrawingFileName = dwg.DrawingFileName,
-                                    EngineDataID = basePoint.EngineDataID,
-                                    BasePointTagNumber = basePoint.TagNumber,
-                                    Scale = basePoint.Scale,
-                                    FileId = basePoint.FileId,
-                                    PixelOnDwg = basePoint.PixelOnDwg,
-                                    IsNotDefaultSymbol = basePoint.IsNotDefaultSymbol,
-                                    X = basePoint.X,
-                                    XOff = basePoint.XOff,
-                                    YOff = basePoint.YOff,
-                                    deck = basePoint.deck,
-                                    area = basePoint.area,
-                                    AutoDrawing = "未绘制",
-                                    TagNumber = tag.TagNumber,
-                                    TagNumber_Upper = basePoint.TagNumber_Upper,
-                                    TagNumber_Lower = basePoint.TagNumber_Lower,
-                                    Tag = tag
-                                });
+                                    string strErr = isBasePointErr ? "基点异常;" : "";
+                                    strErr += isTagErr ? "元件异常" : "";
+                                    strErr = strErr.Replace(";",""); 
+                                    listErrDto.Add(new DtoAutoPlotLayout()
+                                    {
+                                        IsSelected = true,
+                                        DrawingFileID = dwg.DrawingFileID,
+                                        DrawingFileName = dwg.DrawingFileName,
+                                        EngineDataID = basePoint.EngineDataID,
+                                        BasePointTagNumber = basePoint.TagNumber,
+                                        Scale = basePoint.Scale,
+                                        FileId = basePoint.FileId,
+                                        PixelOnDwg = basePoint.PixelOnDwg,
+                                        IsNotDefaultSymbol = basePoint.IsNotDefaultSymbol,
+                                        X = basePoint.X,
+                                        XOff = basePoint.XOff,
+                                        YOff = basePoint.YOff,
+                                        deck = basePoint.deck,
+                                        area = basePoint.area,
+                                        AutoDrawing = strErr,
+                                        TagNumber = tag.TagNumber,
+                                        TagNumber_Upper = basePoint.TagNumber_Upper,
+                                        TagNumber_Lower = basePoint.TagNumber_Lower,
+                                        Tag = tag
+                                    });
+                                }
+                                else
+                                {
+                                    listDto.Add(new DtoAutoPlotLayout()
+                                    {
+                                        IsSelected = true,
+                                        DrawingFileID = dwg.DrawingFileID,
+                                        DrawingFileName = dwg.DrawingFileName,
+                                        EngineDataID = basePoint.EngineDataID,
+                                        BasePointTagNumber = basePoint.TagNumber,
+                                        Scale = basePoint.Scale,
+                                        FileId = basePoint.FileId,
+                                        PixelOnDwg = basePoint.PixelOnDwg,
+                                        IsNotDefaultSymbol = basePoint.IsNotDefaultSymbol,
+                                        X = basePoint.X,
+                                        XOff = basePoint.XOff,
+                                        YOff = basePoint.YOff,
+                                        deck = basePoint.deck,
+                                        area = basePoint.area,
+                                        AutoDrawing = "未绘制",
+                                        TagNumber = tag.TagNumber,
+                                        TagNumber_Upper = basePoint.TagNumber_Upper,
+                                        TagNumber_Lower = basePoint.TagNumber_Lower,
+                                        Tag = tag
+                                    });
+                                }
                             }
                         }
                     }
                 }
                 listBasePoint = new ObservableCollection<DtoAutoPlotLayout>(listDto);
+                listErrBasePoint = new ObservableCollection<DtoAutoPlotLayout>(listErrDto);
+                NormalTagCount = $"正常元件({listBasePoint.Count}个)";
+                ErrTagCount = $"异常元件({listErrBasePoint.Count}个)";
                 IsSelectAll = listBasePoint.Any() ? true : false;
                 AddMsg("布置图基点元件信息查询完成！");
                 IsBusy = false;
diff --git a/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml b/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml
index ac0cbfba..494936aa 100644
--- a/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml
+++ b/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml
@@ -228,110 +228,161 @@
                         Content="开始自动绘图"
                         FontSize="16" />
                 </StackPanel>
-                <DataGrid
-                    x:Name="dgTag"
+                <TabControl
                     Grid.Row="2"
                     Grid.Column="0"
-                    Height="auto"
-                    AutoGenerateColumns="False"
-                    CanUserAddRows="False"
-                    CanUserResizeColumns="True"
-                    HeadersVisibility="Column"
-                    ItemsSource="{Binding listBasePoint, Mode=TwoWay}"
-                    LoadingRow="dgTag_LoadingRow"
-                    RowHeight="22"
-                    ScrollViewer.VerticalScrollBarVisibility="Auto"
-                    SelectedItem="{Binding SelectedTag, Mode=TwoWay}"
-                    SelectionMode="Single">
-                    <DataGrid.Columns>
-                        <!--<DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay}">
-                        <DataGridCheckBoxColumn.HeaderTemplate>
-                            <DataTemplate>
-                                <CheckBox
-                                    x:Name="ckbSelectedAll"
-                                    Margin="4"
-                                    Click="CheckAll_Click"
-                                    IsChecked="{Binding DataContext.IsSelectAll, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}" />
-                            </DataTemplate>
-                        </DataGridCheckBoxColumn.HeaderTemplate>
-                    </DataGridCheckBoxColumn>-->
-                        <DataGridTemplateColumn Width="30">
-                            <DataGridTemplateColumn.Header>
-                                <CheckBox IsChecked="{Binding DataContext.IsSelectAll, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}">
-                                    <i:Interaction.Triggers>
-                                        <i:EventTrigger EventName="Click">
-                                            <i:InvokeCommandAction Command="{Binding DataContext.Command_SelectedAll, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}" />
-                                        </i:EventTrigger>
-                                    </i:Interaction.Triggers>
-                                </CheckBox>
-                            </DataGridTemplateColumn.Header>
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <CheckBox
-                                        HorizontalAlignment="Center"
-                                        VerticalAlignment="Center"
-                                        IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-                                        <i:Interaction.Triggers>
-                                            <i:EventTrigger EventName="Click">
-                                                <i:InvokeCommandAction Command="{Binding DataContext.Command_SelectedTag, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}" CommandParameter="{Binding TagNumber}" />
-                                            </i:EventTrigger>
-                                        </i:Interaction.Triggers>
-                                    </CheckBox>
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <DataGridTemplateColumn Width="30" Header="序号">
-                            <DataGridTemplateColumn.CellTemplate>
-                                <DataTemplate>
-                                    <TextBlock HorizontalAlignment="Center" Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGridRow}, Path=Header}" />
-                                </DataTemplate>
-                            </DataGridTemplateColumn.CellTemplate>
-                        </DataGridTemplateColumn>
-                        <!--<DataGridCheckBoxColumn
-                        Width="30"
-                        Binding="{Binding isChecked}"
-                        Header=""
-                        IsReadOnly="False" />-->
-                        <DataGridTextColumn
-                            Width="0.65*"
-                            Binding="{Binding DrawingFileName}"
-                            Header="布置图"
-                            IsReadOnly="True" />
-                        <DataGridTextColumn
-                            Width="0.35*"
-                            Binding="{Binding BasePointTagNumber}"
-                            Header="基点"
-                            IsReadOnly="True" />
-                        <DataGridTextColumn
-                            Width="110"
-                            Binding="{Binding TagNumber}"
-                            Header="元件位号"
-                            IsReadOnly="True" />
-                        <DataGridTextColumn
-                            Width="60"
-                            Binding="{Binding AutoDrawing}"
-                            Header="绘制"
-                            IsReadOnly="True" />
-                        <DataGridTextColumn
-                            Width="70"
-                            Binding="{Binding TagPixelOnDwg}"
-                            Header="句柄"
-                            IsReadOnly="True" />
-                    </DataGrid.Columns>
-                    <DataGrid.RowStyle>
-                        <Style TargetType="DataGridRow">
-                            <Setter Property="Background" Value="White" />
-                            <Style.Triggers>
-                                <DataTrigger Binding="{Binding AutoDrawing}" Value="已绘制">
-                                    <Setter Property="Background" Value="LightGreen" />
-                                </DataTrigger>
-                                <DataTrigger Binding="{Binding AutoDrawing}" Value="已存在">
-                                    <Setter Property="Background" Value="LightYellow" />
-                                </DataTrigger>
-                            </Style.Triggers>
-                        </Style>
-                    </DataGrid.RowStyle>
-                </DataGrid>
+                    Height="auto">
+                    <TabItem Header="{Binding NormalTagCount}">
+                        <DataGrid
+                            x:Name="dgTag"
+                            AutoGenerateColumns="False"
+                            CanUserAddRows="False"
+                            CanUserResizeColumns="True"
+                            HeadersVisibility="Column"
+                            ItemsSource="{Binding listBasePoint, Mode=TwoWay}"
+                            LoadingRow="dgTag_LoadingRow"
+                            RowHeight="22"
+                            ScrollViewer.VerticalScrollBarVisibility="Auto"
+                            SelectedItem="{Binding SelectedTag, Mode=TwoWay}"
+                            SelectionMode="Single">
+                            <DataGrid.Columns>
+                                <!--<DataGridCheckBoxColumn Binding="{Binding IsSelected, Mode=TwoWay}">
+         <DataGridCheckBoxColumn.HeaderTemplate>
+             <DataTemplate>
+                 <CheckBox
+                     x:Name="ckbSelectedAll"
+                     Margin="4"
+                     Click="CheckAll_Click"
+                     IsChecked="{Binding DataContext.IsSelectAll, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}" />
+             </DataTemplate>
+         </DataGridCheckBoxColumn.HeaderTemplate>
+     </DataGridCheckBoxColumn>-->
+                                <DataGridTemplateColumn Width="30">
+                                    <DataGridTemplateColumn.Header>
+                                        <CheckBox IsChecked="{Binding DataContext.IsSelectAll, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}">
+                                            <i:Interaction.Triggers>
+                                                <i:EventTrigger EventName="Click">
+                                                    <i:InvokeCommandAction Command="{Binding DataContext.Command_SelectedAll, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}" />
+                                                </i:EventTrigger>
+                                            </i:Interaction.Triggers>
+                                        </CheckBox>
+                                    </DataGridTemplateColumn.Header>
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <CheckBox
+                                                HorizontalAlignment="Center"
+                                                VerticalAlignment="Center"
+                                                IsChecked="{Binding IsSelected, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                                                <i:Interaction.Triggers>
+                                                    <i:EventTrigger EventName="Click">
+                                                        <i:InvokeCommandAction Command="{Binding DataContext.Command_SelectedTag, RelativeSource={RelativeSource AncestorType=UserControl, AncestorLevel=1}}" CommandParameter="{Binding TagNumber}" />
+                                                    </i:EventTrigger>
+                                                </i:Interaction.Triggers>
+                                            </CheckBox>
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <DataGridTemplateColumn Width="30" Header="序号">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock HorizontalAlignment="Center" Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGridRow}, Path=Header}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+                                <!--<DataGridCheckBoxColumn
+         Width="30"
+         Binding="{Binding isChecked}"
+         Header=""
+         IsReadOnly="False" />-->
+                                <DataGridTextColumn
+                                    Width="0.65*"
+                                    Binding="{Binding DrawingFileName}"
+                                    Header="布置图"
+                                    IsReadOnly="True" />
+                                <DataGridTextColumn
+                                    Width="0.35*"
+                                    Binding="{Binding BasePointTagNumber}"
+                                    Header="基点"
+                                    IsReadOnly="True" />
+                                <DataGridTextColumn
+                                    Width="110"
+                                    Binding="{Binding TagNumber}"
+                                    Header="元件位号"
+                                    IsReadOnly="True" />
+                                <DataGridTextColumn
+                                    Width="60"
+                                    Binding="{Binding AutoDrawing}"
+                                    Header="绘制"
+                                    IsReadOnly="True" />
+                                <DataGridTextColumn
+                                    Width="70"
+                                    Binding="{Binding TagPixelOnDwg}"
+                                    Header="句柄"
+                                    IsReadOnly="True" />
+                            </DataGrid.Columns>
+                            <DataGrid.RowStyle>
+                                <Style TargetType="DataGridRow">
+                                    <Setter Property="Background" Value="White" />
+                                    <Style.Triggers>
+                                        <DataTrigger Binding="{Binding AutoDrawing}" Value="已绘制">
+                                            <Setter Property="Background" Value="LightGreen" />
+                                        </DataTrigger>
+                                        <DataTrigger Binding="{Binding AutoDrawing}" Value="已存在">
+                                            <Setter Property="Background" Value="LightYellow" />
+                                        </DataTrigger>
+                                    </Style.Triggers>
+                                </Style>
+                            </DataGrid.RowStyle>
+                        </DataGrid>
+                    </TabItem>
+                    <TabItem Header="{Binding ErrTagCount}">
+                        <DataGrid
+                            x:Name="dgErrTag"
+                            AutoGenerateColumns="False"
+                            CanUserAddRows="False"
+                            CanUserResizeColumns="True"
+                            HeadersVisibility="Column"
+                            ItemsSource="{Binding listErrBasePoint, Mode=TwoWay}"
+                            LoadingRow="dgTag_LoadingRow"
+                            RowHeight="22"
+                            ScrollViewer.VerticalScrollBarVisibility="Auto"
+                            SelectionMode="Single">
+                            <DataGrid.Columns>
+
+                                <DataGridTemplateColumn Width="50" Header="序号">
+                                    <DataGridTemplateColumn.CellTemplate>
+                                        <DataTemplate>
+                                            <TextBlock HorizontalAlignment="Center" Text="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=DataGridRow}, Path=Header}" />
+                                        </DataTemplate>
+                                    </DataGridTemplateColumn.CellTemplate>
+                                </DataGridTemplateColumn>
+
+                                <DataGridTextColumn
+                                    Width="0.65*"
+                                    Binding="{Binding DrawingFileName}"
+                                    Header="布置图"
+                                    IsReadOnly="True" />
+                                <DataGridTextColumn
+                                    Width="0.35*"
+                                    Binding="{Binding BasePointTagNumber}"
+                                    Header="基点"
+                                    IsReadOnly="True" />
+                                <DataGridTextColumn
+                                    Width="110"
+                                    Binding="{Binding TagNumber}"
+                                    Header="元件位号"
+                                    IsReadOnly="True" />
+                                <DataGridTextColumn
+                                    Width="110"
+                                    Binding="{Binding AutoDrawing}"
+                                    Header="绘制"
+                                    IsReadOnly="True" />
+
+                            </DataGrid.Columns>
+                        </DataGrid>
+                    </TabItem>
+                </TabControl>
+
             </Grid>
             <Grid
                 Grid.Row="2"
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.cs b/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.cs
index fe6d30ad..3fd1d88d 100644
--- a/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.cs
+++ b/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0C5F0216DF6BCDDDA98AFD5EEED25E2B5C8BB0236746F3B9CC6B583DD7624FD"
+#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D381518E6A709FE4FD61B7B59C0FE6A02830580BBED56CC9959DA9E027AC6A01"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -85,13 +85,21 @@ namespace SWS.Electrical.Views {
         #line hidden
         
         
-        #line 232 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+        #line 237 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgTag;
         
         #line default
         #line hidden
         
+        
+        #line 340 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.DataGrid dgErrTag;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -128,9 +136,18 @@ namespace SWS.Electrical.Views {
             case 2:
             this.dgTag = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 241 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+            #line 243 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
             this.dgTag.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgTag_LoadingRow);
             
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.dgErrTag = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 346 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+            this.dgErrTag.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgTag_LoadingRow);
+            
             #line default
             #line hidden
             return;
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.i.cs b/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.i.cs
index fe6d30ad..3fd1d88d 100644
--- a/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.i.cs
+++ b/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D0C5F0216DF6BCDDDA98AFD5EEED25E2B5C8BB0236746F3B9CC6B583DD7624FD"
+#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D381518E6A709FE4FD61B7B59C0FE6A02830580BBED56CC9959DA9E027AC6A01"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -85,13 +85,21 @@ namespace SWS.Electrical.Views {
         #line hidden
         
         
-        #line 232 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+        #line 237 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.DataGrid dgTag;
         
         #line default
         #line hidden
         
+        
+        #line 340 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.DataGrid dgErrTag;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -128,9 +136,18 @@ namespace SWS.Electrical.Views {
             case 2:
             this.dgTag = ((System.Windows.Controls.DataGrid)(target));
             
-            #line 241 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+            #line 243 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
             this.dgTag.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgTag_LoadingRow);
             
+            #line default
+            #line hidden
+            return;
+            case 3:
+            this.dgErrTag = ((System.Windows.Controls.DataGrid)(target));
+            
+            #line 346 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+            this.dgErrTag.LoadingRow += new System.EventHandler<System.Windows.Controls.DataGridRowEventArgs>(this.dgTag_LoadingRow);
+            
             #line default
             #line hidden
             return;
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.g.resources b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.g.resources
index bf10d726150269f3abd44fe9336f74f3add20f54..815fccc33bcd6450a01d5c2be7aaf3ac089c25cc 100644
GIT binary patch
delta 14876
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

delta 15167
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
MzW=r*<mJHs19Nw3q5uE@

diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs b/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs
index b9234fef..99e51553 100644
--- a/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs
+++ b/newFront/c#前端/SWS.WPF/obj/Debug/Views/DialogSignalManagements/DialogSignalManagement.g.i.cs
@@ -1,4 +1,4 @@
-#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "D4B655A725F9DA5CEF801330CC2E000E8A952FC6E92D22159739897F8A32A6A6"
+#pragma checksum "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "9BC88517AA32E047BA6D8CB1D1F60D2837D4E22C18FF9DE0448C2276C8824A00"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     此代码由工具生成。
@@ -86,7 +86,7 @@ namespace SWS.WPF.Views {
         #line hidden
         
         
-        #line 233 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+        #line 231 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtReviewCountdown;
         
@@ -94,7 +94,7 @@ namespace SWS.WPF.Views {
         #line hidden
         
         
-        #line 252 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+        #line 250 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.TextBlock txtConstructionCountdown;
         
@@ -102,7 +102,7 @@ namespace SWS.WPF.Views {
         #line hidden
         
         
-        #line 308 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+        #line 306 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal SWS.CustomControl.IconButton PopupButton;
         
@@ -110,7 +110,7 @@ namespace SWS.WPF.Views {
         #line hidden
         
         
-        #line 318 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+        #line 317 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Primitives.Popup CustomPopup;
         
@@ -118,7 +118,7 @@ namespace SWS.WPF.Views {
         #line hidden
         
         
-        #line 367 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+        #line 368 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal SWS.CustomControl.IconButton myButton;
         
@@ -126,7 +126,7 @@ namespace SWS.WPF.Views {
         #line hidden
         
         
-        #line 400 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
+        #line 401 "..\..\..\..\Views\DialogSignalManagements\DialogSignalManagement.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal Telerik.Windows.Controls.RadTreeListView RadGridView1;