1

SWSDBSchemeUpgradeTool/obj/Debug/SWSDBSchemeUpgradeTool_MarkupCompile.lref

@@ -1,5 +1,5 @@
 
 
-FD:\陈进步\项目\009\SWSDBSchemeUpgradeTool\MainWindow.xaml;;
+FE:\Di-Electrical\SWSDBSchemeUpgradeTool\MainWindow.xaml;;
-FD:\陈进步\项目\009\SWSDBSchemeUpgradeTool\SQLPreview.xaml;;
+FE:\Di-Electrical\SWSDBSchemeUpgradeTool\SQLPreview.xaml;;
 

newFront/c#前端/SWS.CAD/CADFunc/General.cs

@@ -5,6 +5,7 @@ using Bricscad.Global;
 using SWS.CAD.CADFunc.Editor;
 using SWS.CAD.Helper;
 using SWS.CAD.Views.CustomControl;
+using SWS.Commons;
 using System;
 using System.Collections.Generic;
 using System.Drawing;

newFront/c#前端/SWS.CAD/SWS.CAD.csproj

@@ -181,12 +181,8 @@
     <Compile Include="Helper\Converter\RadGridViewRowToBoolConverter.cs" />
     <Compile Include="Helper\Converter\StatusToColourConverter.cs" />
     <Compile Include="Helper\Converter\YesNotConverter.cs" />
-    <Compile Include="Helper\FileHelper.cs" />
-    <Compile Include="Helper\Behavior\PasswordHelper.cs" />
-    <Compile Include="Helper\TreeHelper.cs" />
     <Compile Include="Start.cs" />
     <Compile Include="GlobalObje.cs" />
-    <Compile Include="Helper\LoggerHelper.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ViewModels\CheckInApproveViewModel.cs" />
     <Compile Include="ViewModels\DialogCableConnectionVM\DialogCableConnection_NewStripViewModel.cs" />
@@ -534,11 +530,17 @@
       <Project>{51cb6f5b-16e9-4ee0-baa4-144dd1ec8580}</Project>
       <Name>SWS.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SWS.Share\SWS.Share.csproj">
+      <Project>{87E71797-E60A-4637-BA32-C8B57154ABC3}</Project>
+      <Name>SWS.Share</Name>
+    </ProjectReference>
     <ProjectReference Include="..\SWS.WPF\SWS.WPF.csproj">
       <Project>{7aff9117-78e7-4395-9f23-6dcfe09f9299}</Project>
       <Name>SWS.WPF</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Helper\Behavior\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

newFront/c#前端/SWS.CAD/ViewModels/DialogIODistributionVM/DialogCablePreAssignPreviewViewModel.cs

@@ -53,7 +53,7 @@ namespace SWS.CAD.ViewModels
         }
 
         private List<ec_Cable> CablePreAssigns;
-        public async void OnDialogOpened(IDialogParameters parameters)
+        public  void OnDialogOpened(IDialogParameters parameters)
         {
             //title = parameters.GetValue<string>(GlobalObject.dialogPar.title.ToString());
             title = "待分配的信号预览和统计";
@@ -128,7 +128,7 @@ namespace SWS.CAD.ViewModels
                     IDialogParameters para = new Prism.Services.Dialogs.DialogParameters();
                     para.Add(GlobalObject.dialogPar.para1.ToString(), PreAssignCables);
                     var _dialogService = GlobalObject._prismContainer.Resolve<IDialogService>();
-                    _dialogService.ShowDialog(nameof(DialogCablePreAssignResult), para, async (RES) =>
+                    _dialogService.ShowDialog(nameof(DialogCablePreAssignResult), para, (RES) =>
                     {
                         if (RES.Result == ButtonResult.Yes)
                         {
@@ -182,7 +182,7 @@ namespace SWS.CAD.ViewModels
         /// 页面左侧按钮
         /// </summary>
         /// <param name="parameter"></param>
-        public virtual async void Button_Click(object parameter)
+        public virtual  void Button_Click(object parameter)
         {
             if (parameter.ToString().Equals("全选"))
             {
@@ -288,7 +288,7 @@ namespace SWS.CAD.ViewModels
             TagNumber = ec_Cable.TagNumber;
             PreAssignIOType = ec_Cable.PreAssignIOType;
             CableClass = ec_Cable.CableClass.Equals("homerun") ? "是" : "否";
-            ToPanel_TagNumber = ec_Cable.ToPanel != null ? ec_Cable.ToPanel.TagNumber : null;
+            ToPanel_TagNumber = ec_Cable.AssignedPanel != null ? ec_Cable.AssignedPanel.TagNumber : null;
         }
         #endregion
 

newFront/c#前端/SWS.CAD/ViewModels/DialogIODistributionVM/DialogCablePreAssignResultViewModel.cs

@@ -108,6 +108,7 @@ namespace SWS.CAD.ViewModels
 
         public override async void ExecuteOKCommandAsync(object para)
         {
+            //只传入分配成功的电缆
             var Cables = new List<ec_Cable>();
             if (AllPreAssignCables != null)
             {
@@ -153,7 +154,7 @@ namespace SWS.CAD.ViewModels
                 {
                     foreach (var PreAssignCable in AllPreAssignCables)
                     {
-                        if (PreAssignCable.Sets != null && !string.IsNullOrEmpty(PreAssignCable.Sets.FirstOrDefault().ConnectionInfo))
+                        if (PreAssignCable.AssignedPanel!=null)
                         {
                             PreAssignCables.Add(PreAssignCable);
                         }
@@ -163,7 +164,7 @@ namespace SWS.CAD.ViewModels
                 {
                     foreach (var PreAssignCable in AllPreAssignCables)
                     {
-                        if (PreAssignCable.Sets == null || string.IsNullOrEmpty(PreAssignCable.Sets.FirstOrDefault().ConnectionInfo))
+                        if (PreAssignCable.AssignedPanel == null)
                         {
                             PreAssignCables.Add(PreAssignCable);
                         }
@@ -179,14 +180,14 @@ namespace SWS.CAD.ViewModels
 
             PreAllocationResultls = new ObservableCollection<PreAllocationResult>();
             if (cable == null) return;
-            if (cable.Sets != null)
+            if (cable.AssignedPanel != null)
             {
                 foreach (var Set in cable.Sets)
                 {
                     PreAllocationResult preAllocationResult = new PreAllocationResult();
                     preAllocationResult.CablePair = Set.CableSetName;
                     preAllocationResult.IOType = cable.PreAssignIOType;
-                    preAllocationResult.ToPanel_TagNumber = cable.ToPanel == null ? "" : cable.ToPanel.TagNumber;
+                    preAllocationResult.ToPanel_TagNumber = cable.AssignedPanel == null ? "" : cable.AssignedPanel.TagNumber;
                     preAllocationResult.Panel_TagNumber = string.IsNullOrEmpty(Set.ConnectionInfo) ? "" : Set.ConnectionInfo.Split('/')[0].Split('：')[1].Trim();
                     preAllocationResult.StripName = string.IsNullOrEmpty(Set.ConnectionInfo) ? "" : Set.ConnectionInfo.Split('/')[1].Split('：')[1].Trim();
                     preAllocationResult.Terms = new ObservableCollection<ec_PanelStripTerm>(Set.AssignedTerms);
@@ -220,7 +221,9 @@ namespace SWS.CAD.ViewModels
         public string CablePair
         {
             get { return _CablePair; }
-            set { _CablePair = value; }
+            set { _CablePair = value; 
+                RaisePropertyChanged(nameof(CablePair));
+            }
         }
 
         private string _IOType;
@@ -230,7 +233,9 @@ namespace SWS.CAD.ViewModels
         public string IOType
         {
             get { return _IOType; }
-            set { _IOType = value; }
+            set { _IOType = value;
+                RaisePropertyChanged(nameof(IOType));
+            }
         }
 
 
@@ -241,7 +246,9 @@ namespace SWS.CAD.ViewModels
         public string ToPanel_TagNumber
         {
             get { return _ToPanel_TagNumber; }
-            set { _ToPanel_TagNumber = value; }
+            set { _ToPanel_TagNumber = value; 
+                RaisePropertyChanged(nameof(ToPanel_TagNumber));
+            }
         }
 
         private string _Panel_TagNumber;
@@ -251,7 +258,9 @@ namespace SWS.CAD.ViewModels
         public string Panel_TagNumber
         {
             get { return _Panel_TagNumber; }
-            set { _Panel_TagNumber = value; }
+            set { _Panel_TagNumber = value;
+                RaisePropertyChanged(nameof(Panel_TagNumber));
+            }
         }
 
         private string _StripName;
@@ -261,7 +270,9 @@ namespace SWS.CAD.ViewModels
         public string StripName
         {
             get { return _StripName; }
-            set { _StripName = value; }
+            set { _StripName = value; 
+                RaisePropertyChanged(nameof(StripName));
+            }
         }
 
         private ObservableCollection<ec_PanelStripTerm> _Terms;
@@ -271,7 +282,9 @@ namespace SWS.CAD.ViewModels
         public ObservableCollection<ec_PanelStripTerm> Terms
         {
             get { return _Terms; }
-            set { _Terms = value; }
+            set { _Terms = value; 
+                RaisePropertyChanged(nameof(Terms));
+            }
         }
 
 

newFront/c#前端/SWS.CAD/ViewModels/DialogIODistributionVM/DialogIODistributionViewModel.cs

@@ -410,7 +410,7 @@ namespace SWS.CAD.ViewModels
         #endregion
 
         #region 改变关联和解除信号按钮的可用状态
-        private async void UpdateButtonEnabled()
+        private  void UpdateButtonEnabled()
         {
             if (SelectedChannelInfo != null)
             {
@@ -2723,7 +2723,7 @@ namespace SWS.CAD.ViewModels
                 IDialogParameters para = new Prism.Services.Dialogs.DialogParameters();
                 para.Add(GlobalObject.dialogPar.para1.ToString(), PreAssignCables);
                 var _dialogService = GlobalObject._prismContainer.Resolve<IDialogService>();
-                _dialogService.ShowDialog(nameof(DialogCablePreAssignPreview), para, async (RES) =>
+                _dialogService.ShowDialog(nameof(DialogCablePreAssignPreview), para,  (RES) =>
                 {
                     if (RES.Result == ButtonResult.Yes)
                     {

newFront/c#前端/SWS.CAD/ViewModels/DialogSignalPredistributionViewModel.cs

@@ -22,6 +22,9 @@ using Unity;
 
 namespace SWS.CAD.ViewModels
 {
+    /// <summary>
+    /// 信号预分配页面的模型类
+    /// </summary>
     public class DialogSignalPredistributionViewModel : DialogBase, IDialogAware
     {
         #region 字段

newFront/c#前端/SWS.CAD/ViewModels/LeftPanelViewModel.cs

@@ -506,7 +506,7 @@ namespace SWS.CAD.ViewModels
                 foreach (var id in listObjectTypeId)
                 {
                     //获取节点
-                    Model.TreeModel node = Helper.TreeHelper.GetTreeModel(GlobalObject.objectTypeTree, id);
+                    Model.TreeModel node = TreeHelper.GetTreeModel(GlobalObject.objectTypeTree, id);
                     if (node != null)
                     {
                         var node1 = (Model.TreeModel)node.Clone();
@@ -531,7 +531,7 @@ namespace SWS.CAD.ViewModels
             GlobalObject.AllDwgName.Clear();
             foreach (var dwg in Drawings)
             {
-                Helper.TreeHelper.GetTreeText(dwg);
+                TreeHelper.GetTreeText(dwg);
             }
             #endregion
 
@@ -1975,7 +1975,7 @@ namespace SWS.CAD.ViewModels
                         foreach (var dto in historyDrawingsTree)
                         {
                             //获取节点下的图纸
-                            node = Helper.TreeHelper.GetTreeModel(dto, item.DrawingFileID);
+                            node = TreeHelper.GetTreeModel(dto, item.DrawingFileID);
                             if (node != null)
                             {
                                 break;
@@ -2283,7 +2283,7 @@ namespace SWS.CAD.ViewModels
             if (string.IsNullOrEmpty(strRecentObjectType))
             {
                 //获取节点 
-                Model.TreeModel node = Helper.TreeHelper.GetTreeModel(GlobalObject.objectTypeTree, selectType.ID);
+                Model.TreeModel node = TreeHelper.GetTreeModel(GlobalObject.objectTypeTree, selectType.ID);
                 var addNode = (Model.TreeModel)node.Clone();
                 var firstNode = objectTypeTree[0];
                 //UI添加到最近使用
@@ -2304,7 +2304,7 @@ namespace SWS.CAD.ViewModels
                 }
                 listObjectTypeId.Insert(0, selectType.ID);
                 //获取节点
-                Model.TreeModel node = Helper.TreeHelper.GetTreeModel(GlobalObject.objectTypeTree, selectType.ID);
+                Model.TreeModel node = TreeHelper.GetTreeModel(GlobalObject.objectTypeTree, selectType.ID);
                 var addNode = (Model.TreeModel)node.Clone();
                 firstNode.ChildNodes.Insert(0, addNode);//UI添加到最近使用
                 ids = string.Join(",", listObjectTypeId);

newFront/c#前端/SWS.CAD/ViewModels/NewDrawingViewModel.cs

@@ -254,7 +254,7 @@ namespace SWS.CAD.ViewModels
             //所属系统下拉框
             foreach (var item in dwgSystem)
             {
-                var node = Helper.TreeHelper.GetTreeModel(item, dwgFile.DrawingSystem);
+                var node = TreeHelper.GetTreeModel(item, dwgFile.DrawingSystem);
                 if (node != null)
                 {
                     SelectedSystemItem = node;
@@ -264,7 +264,7 @@ namespace SWS.CAD.ViewModels
             //图纸目录下拉框
             foreach (var item in dwgCatalogueID)
             {
-                var node = Helper.TreeHelper.GetTreeModel(item, dwgFile.DrawingCatalogueID);
+                var node = TreeHelper.GetTreeModel(item, dwgFile.DrawingCatalogueID);
                 if (node != null)
                 {
                     SelectedCatalogueIDItem = node;
@@ -476,7 +476,7 @@ namespace SWS.CAD.ViewModels
             foreach (var catalogueId in tempCatalogueID)
             {
                 //遍历获取当前节点数据
-                node = Helper.TreeHelper.GetTreeModel(catalogueId, dwgNode.ID);
+                node = TreeHelper.GetTreeModel(catalogueId, dwgNode.ID);
                 if (node != null)
                 { break; }
             }

newFront/c#前端/SWS.CAD/Views/Dialog/DialogIODistributions/DialogCablePreAssignResult.xaml

@@ -92,6 +92,12 @@
                                             ShowGroupPanel="False" telerik:StyleManager.Theme="Office_Blue"
                                             ItemsSource="{Binding PreAllocationResultls}" SelectedItem="{Binding SelectedChannelInfo, Mode=TwoWay}"
                 >
+                                    <telerik:EventToCommandBehavior.EventBindings>
+                                        <telerik:EventBinding
+                                            Command="{Binding EditEndCmd}"
+                                            EventName="CellEditEnded"
+                                            PassEventArgsToCommand="True" />
+                                    </telerik:EventToCommandBehavior.EventBindings>
                                     <telerik:RadGridView.Columns>
                                         <telerik:GridViewDataColumn Header="电缆对" DataMemberBinding="{Binding CablePair}" IsReadOnly="True"/>
                                         <telerik:GridViewDataColumn Header="IO类型" DataMemberBinding="{Binding IOType}" IsReadOnly="True"/>

newFront/c#前端/SWS.CAD/Views/Dialog/DialogIODistributions/DialogIODistribution.xaml

@@ -540,18 +540,18 @@
                             <telerik:RadPathButton PathGeometry="{telerik:RadGlyph Glyph=&#xe649;}"
                          ToolTip="端子排模版设置" Padding="0"
                          Command="{Binding HeadButtonCmd}" CommandParameter="{Binding ToolTip,RelativeSource={RelativeSource Self}}"/>
-                        <telerik:RadButton Content="上移通道(L)" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}"  Margin="5"/>
+                            <telerik:RadButton Content="上移通道(L)" Width="auto" Style="{StaticResource sysBtn}" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}"  Margin="5"/>
-                        <telerik:RadButton Content="下移通道(D)" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
+                            <telerik:RadButton Content="下移通道(D)" Width="auto" Style="{StaticResource sysBtn}" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
-                        <telerik:RadButton Content="迁移通道(M)" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
+                            <telerik:RadButton Content="迁移通道(M)" Width="auto" Style="{StaticResource sysBtn}" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
-                        <telerik:RadButton Content="锁定通道(L)" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
+                            <telerik:RadButton Content="锁定通道(L)" Width="auto" Style="{StaticResource sysBtn}" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
                             <telerik:RadButton Content="解锁通道(L)" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
-                        <telerik:RadButton Content="关联信号" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" IsEnabled="{Binding IsEnabledASButton}" Margin="5">
+                            <telerik:RadButton Content="关联信号" Style="{StaticResource sysBtn}" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" IsEnabled="{Binding IsEnabledASButton}" Margin="5">
 
                             </telerik:RadButton>
                             <telerik:RadButton Content="解除信号" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" IsEnabled="{Binding IsEnabledClearButton}" Margin="5"/>
                             <telerik:RadButton Content="母线详情" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
-                        <telerik:RadButton Content="批量分配" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
+                            <telerik:RadButton Content="批量分配" Style="{StaticResource sysBtn}" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5"/>
-                        <telerik:RadButton Content="保存" HorizontalAlignment="Right" Width="50" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5,5,0,5"/>
+                            <telerik:RadButton Style="{StaticResource sysBtn}" Content="保存" HorizontalAlignment="Right" Width="50" Command="{Binding TableButtonCmd}" CommandParameter="{Binding Content,RelativeSource={RelativeSource Self}}" Margin="5,5,0,5"/>
                         </DockPanel>
                         <Border  BorderThickness="0 0 0 1">
                             <TextBlock Text="通道详细信息" Foreground="White" />
@@ -564,13 +564,19 @@
                                          ShowGroupPanel="False" telerik:StyleManager.Theme="Office_Blue"
                                          ItemsSource="{Binding ChannelInfos}" SelectedItem="{Binding SelectedChannelInfo, Mode=TwoWay}"
                                         >
+                                <telerik:EventToCommandBehavior.EventBindings>
+                                    <telerik:EventBinding
+                                            Command="{Binding EditEndCmd}"
+                                            EventName="CellEditEnded"
+                                            PassEventArgsToCommand="True" />
+                                </telerik:EventToCommandBehavior.EventBindings>
                                 <telerik:RadGridView.Columns>
                                     <telerik:GridViewDataColumn Header="序号" CellTemplate="{StaticResource CellTemplate1}" CellStyle="{StaticResource CellTyle1}" IsReadOnly="True"/>
                                     <telerik:GridViewDataColumn Header="通道号" DataMemberBinding="{Binding ChannelNumber}"
                                                         IsCellMergingEnabled="True"/>
                                     <telerik:GridViewDataColumn Header="端子号" CellTemplate="{StaticResource CellTemplate2}" CellEditTemplate="{StaticResource CellEditTemplate2}"/>
-                                <telerik:GridViewDataColumn Header="占用人" DataMemberBinding="{Binding Occupant}" IsReadOnly="True"/>
+                                    <telerik:GridViewDataColumn Header="占用人" DataMemberBinding="{Binding Occupant}" IsReadOnly="True" Width="100" Background="#f0f0f0"/>
-                                <telerik:GridViewDataColumn Header="电缆位号" DataMemberBinding="{Binding CableTag}" IsReadOnly="True" Width="100">
+                                    <telerik:GridViewDataColumn Header="电缆位号" DataMemberBinding="{Binding CableTag}" IsReadOnly="True" Width="100" Background="#f0f0f0">
                                         <telerik:GridViewDataColumn.CellTemplate>
                                             <DataTemplate>
                                                 <TextBlock Text="{Binding CableTag}"
@@ -583,8 +589,8 @@
                                     <telerik:GridViewDataColumn Header="电缆线号" CellTemplate="{StaticResource CellTemplate3}" CellEditTemplate="{StaticResource CellEditTemplate3}"/>
                                     <telerik:GridViewDataColumn Header="极性" CellTemplate="{StaticResource CellTemplate4}" CellEditTemplate="{StaticResource CellEditTemplate4}"/>
                                     <telerik:GridViewDataColumn Header="信号名称" DataMemberBinding="{Binding SignalName}"/>
-                                <telerik:GridViewDataColumn Header="信号组别" DataMemberBinding="{Binding GroupOther}"  IsReadOnly="True"/>
+                                    <telerik:GridViewDataColumn Header="信号组别" DataMemberBinding="{Binding GroupOther}"  IsReadOnly="True" Background="#f0f0f0"/>
-                                <telerik:GridViewDataColumn Header="信号编码" DataMemberBinding="{Binding SignalCode}"  IsReadOnly="True"/>
+                                    <telerik:GridViewDataColumn Header="信号编码" DataMemberBinding="{Binding SignalCode}"  IsReadOnly="True" Background="#f0f0f0"/>
                                     <telerik:GridViewDataColumn Header="中文描述" DataMemberBinding="{Binding ChineseDescription}" Width="120">
                                         <telerik:GridViewDataColumn.CellTemplate>
                                             <DataTemplate>

newFront/c#前端/SWS.CAD/Views/Dialog/DialogSectionBox.xaml

@@ -0,0 +1,12 @@
+<UserControl x:Class="SWS.CAD.Views.Dialog.DialogSectionBox"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:SWS.CAD.Views.Dialog"
+             mc:Ignorable="d" 
+             d:DesignHeight="450" d:DesignWidth="800">
+    <Grid>
+            
+    </Grid>
+</UserControl>

newFront/c#前端/SWS.CAD/Views/Dialog/DialogSectionBox.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace SWS.CAD.Views.Dialog
+{
+    /// <summary>
+    /// DialogSectionBox.xaml 的交互逻辑
+    /// </summary>
+    public partial class DialogSectionBox : UserControl
+    {
+        public DialogSectionBox()
+        {
+            InitializeComponent();
+        }
+    }
+}

newFront/c#前端/SWS.CAD/Views/Login.xaml

@@ -4,7 +4,7 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
     xmlns:local="clr-namespace:SWS.CAD.Views.CustomControl"
-    xmlns:local2="clr-namespace:SWS.CAD.Helper"
+    xmlns:local2="clr-namespace:SWS.Commons;assembly=SWS.Commons"
     xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation" 
     Width="300"
     Height="250"

newFront/c#前端/SWS.CAD/Views/Style/CustomStyles.xaml

@@ -39,6 +39,10 @@
 
                 <Setter Property="Foreground" Value="Black" />
             </DataTrigger>
+            <!--  按钮禁用时  -->
+            <DataTrigger Binding="{Binding IsEnabled, RelativeSource={RelativeSource Self}}" Value="false">
+                <Setter Property="Foreground" Value="Black" />
+            </DataTrigger>
         </Style.Triggers>
     </Style>
     <Style x:Key="sysBtn2" TargetType="Button">

newFront/c#前端/SWS.Commons/SWS.Commons.csproj

@@ -130,6 +130,10 @@
       <Project>{1995385b-d1b0-4c55-835e-d3e769972a6a}</Project>
       <Name>SWS.Model</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SWS.Share\SWS.Share.csproj">
+      <Project>{87E71797-E60A-4637-BA32-C8B57154ABC3}</Project>
+      <Name>SWS.Share</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Images\OpenProject.png" />

newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogTest2.g.cs

@@ -23,6 +23,7 @@ using Prism.Regions.Behaviors;
 using Prism.Services.Dialogs;
 using Prism.Unity;
 using SWS.CustomControl;
+using SWS.Electrical;
 using SWS.Electrical.Views;
 using System;
 using System.Diagnostics;

newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogTest2.g.i.cs

@@ -23,6 +23,7 @@ using Prism.Regions.Behaviors;
 using Prism.Services.Dialogs;
 using Prism.Unity;
 using SWS.CustomControl;
+using SWS.Electrical;
 using SWS.Electrical.Views;
 using System;
 using System.Diagnostics;

newFront/c#前端/SWS.Model/SWS.Model.csproj

@@ -115,7 +115,6 @@
     <Compile Include="ec_wire_group_notice.cs" />
     <Compile Include="ec_wire_group_propertyhis.cs" />
     <Compile Include="KeyValueModel.cs" />
-    <Compile Include="LayoutTagInfoBrief.cs" />
     <Compile Include="NoEntity\BomConfig.cs" />
     <Compile Include="NoEntity\CheckInLogNeedApproveModel.cs" />
     <Compile Include="NoEntity\CheckInModel.cs" />
@@ -141,5 +140,11 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\SWS.Share\SWS.Share.csproj">
+      <Project>{87e71797-e60a-4637-ba32-c8b57154abc3}</Project>
+      <Name>SWS.Share</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

newFront/c#前端/SWS.Model/SWS.Model.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>

newFront/c#前端/SWS.Model/Signal/SignalManagementInfo.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using SWS.Model;
+using SWS.Share;
 using Telerik.Windows.Controls;
 using Telerik.Windows.Data;
 

newFront/c#前端/SWS.Model/Signal/SignalNotice.cs

@@ -67,11 +67,11 @@ namespace SWS.Model
             set { _IO_Type = value; }
         }
 
-        private Model.Action _ActionID;
+        private Share.Action _ActionID;
         /// <summary>
         /// 操作ID
         /// </summary>
-        public Model.Action ActionID
+        public Share.Action ActionID
         {
             get { return _ActionID; }
             set { _ActionID = value; }

newFront/c#前端/SWS.Model/ec_Cable.cs

@@ -107,6 +107,8 @@ namespace SWS.Model
         /// </summary>
         public ec_Panel ToPanel { set; get; }
 
+        public ec_Panel AssignedPanel { set; get; }
+
         #endregion
     }
 }

newFront/c#前端/SWS.Model/ec_Wire_Group.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using SWS.Share;
 
 namespace SWS.Model
 {
@@ -393,43 +394,4 @@ namespace SWS.Model
         public List<ec_wire_group_log> Logs { get; set; }
         #endregion
     }
-    public enum WireGroupStatusEnum
-    {
-        /// <summary>
-        /// 待删除
-        /// </summary>
-        [Description("待删除")]
-        ToDelete = 01,
-        /// <summary>
-        /// 新增的
-        /// </summary>
-        [Description("新增的")]
-        New = 02,
-        /// <summary>
-        /// 已关联
-        /// </summary>
-        [Description("已使用（关联）")]
-        Used = 03,
-        /// <summary>
-        /// 已审核
-        /// </summary>
-        [Description("已确认（审核）")]
-        Confirmed = 04,
-        /// <summary>
-        /// 重新打开
-        /// </summary>
-        [Description("重新打开")]
-        Reopen = 05,
-        /// <summary>
-        /// 彻底删除
-        /// </summary>
-        [Description("彻底删除")]
-        deleted = 06
-    }
-    public class ActionHistory
-    {
-        public DateTime? ActionTime { get; set; }
-        public Action ActionType { get; set; }
-        public string reason { get; set; }
-    }
 }

newFront/c#前端/SWS.Model/ec_wire_group_log.cs

@@ -10,7 +10,7 @@ namespace SWS.Model
         {
                 
         }
-        public ec_wire_group_log(Action OperateType, string WireGroupID)
+        public ec_wire_group_log(Share.Action OperateType, string WireGroupID)
         {
             this.OperateType = OperateType;
             this.WireGroupID = WireGroupID;
@@ -22,7 +22,7 @@ namespace SWS.Model
         /// <param name="OperateType"></param>
         /// <param name="WireGroupID"></param>
         /// <param name="createtime">因为<see cref="ec_Wire_GroupEntity.ActionHistorys"/>的关系，所以时间是有值的</param>
-        public ec_wire_group_log(Action OperateType, string WireGroupID, DateTime? createtime)
+        public ec_wire_group_log(Share.Action OperateType, string WireGroupID, DateTime? createtime)
         {
             this.OperateType = OperateType;
             this.WireGroupID = WireGroupID;
@@ -50,7 +50,7 @@ namespace SWS.Model
         /// </summary>
         /// <returns></returns>
         [JsonConverter(typeof(StringEnumConverter))]
-        public Action OperateType { get; set; }
+        public Share.Action OperateType { get; set; }
         /// <summary>
         /// 备注
         /// </summary>

newFront/c#前端/SWS.Model/ec_wire_group_notice.cs

@@ -3,24 +3,6 @@
 namespace SWS.Model
 
 {
-    /// <summary>
-    /// 动作。和状态是两码事情。
-    /// </summary>
-    public enum Action
-    {
-
-        新增 = 0,
-        修改 = 1,
-        准备删除 = 2,
-        撤销删除 = 3,
-        删除 = 4,
-        关联通道 = 5,
-        审核 = 6,
-        重新打开 = 7,
-        关联解除 = 8,
-        回收站恢复 = 9
-    }
-
     public enum Department
     {
         轮机 = 0,

newFront/c#前端/SWS.Service/PlotLayoutService.cs

@@ -3,6 +3,7 @@ using System.Threading.Tasks;
 using Newtonsoft.Json.Linq;
 using SWS.Commons;
 using SWS.Model;
+using SWS.Share;
 
 namespace SWS.Service
 {

newFront/c#前端/SWS.Service/WireGroupService.cs

@@ -62,7 +62,7 @@ namespace SWS.Service
         /// </summary>
         /// <param name="entity"></param>
         /// <returns></returns>
-        public async Task<string> CanSaveSignals(WireGroups entity ,Model.Action ActionType)
+        public async Task<string> CanSaveSignals(WireGroups entity ,Share.Action ActionType)
         {
             var res = await this.PostBodyAsync<List<ec_Wire_Group>, WireGroups>($"WireGroupApi/CanSaveSignals?projId={GlobalObject.curProject?.ProjectId}&ActionType={ActionType}", entity);
             if (res.code == 200)

newFront/c#前端/SWS.Share/.vs/SWS.Share.csproj.dtbcache.json

@@ -0,0 +1 @@
+{"RootPath":"E:\\Di-Electrical\\newFront\\c#前端\\SWS.Share","ProjectFileName":"SWS.Share.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"BOMGroupInfo.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.6.1.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.DataSetExtensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.6.1\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\newFront\\c#前端\\SWS.Share\\bin\\Debug\\SWS.Share.dll","OutputItemRelativePath":"SWS.Share.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}

newFront/c#前端/SWS.Share/ActionHistory.cs

@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SWS.Share
+{
+    public class ActionHistory
+    {
+        public DateTime? ActionTime { get; set; }
+        public Action ActionType { get; set; }
+        public string reason { get; set; }
+    }
+}

newFront/c#前端/SWS.Share/Enums/Action.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SWS.Share
+{
+    /// <summary>
+    /// 动作。和状态是两码事情。
+    /// </summary>
+    public enum Action
+    {
+        新增 = 0,
+        修改 = 1,
+        准备删除 = 2,
+        撤销删除 = 3,
+        删除 = 4,
+        关联通道 = 5,
+        审核 = 6,
+        重新打开 = 7,
+        关联解除 = 8,
+        回收站恢复 = 9
+    }
+}

newFront/c#前端/SWS.Share/Enums/WireGroupStatusEnum.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SWS.Share
+{
+    public enum WireGroupStatusEnum
+    {
+        /// <summary>
+        /// 待删除
+        /// </summary>
+        [Description("待删除")]
+        ToDelete = 01,
+        /// <summary>
+        /// 新增的
+        /// </summary>
+        [Description("新增的")]
+        New = 02,
+        /// <summary>
+        /// 已关联
+        /// </summary>
+        [Description("已使用（关联）")]
+        Used = 03,
+        /// <summary>
+        /// 已审核
+        /// </summary>
+        [Description("已确认（审核）")]
+        Confirmed = 04,
+        /// <summary>
+        /// 重新打开
+        /// </summary>
+        [Description("重新打开")]
+        Reopen = 05,
+        /// <summary>
+        /// 彻底删除
+        /// </summary>
+        [Description("彻底删除")]
+        deleted = 06
+    }
+}

newFront/c#前端/SWS.Share/LayoutTagInfoBrief.cs

@@ -0,0 +1,80 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SWS.Share
+{
+    /// <summary>
+    /// 精简的类，用于布置图绘制
+    /// </summary>
+    public class LayoutTagInfoBrief
+    {
+        public LayoutTagInfoBrief()
+        {
+        }
+        #region 实体成员
+        /// <summary>
+        /// 工程数据ID
+        /// </summary> 
+        public string EngineDataID { get; set; }
+        /// <summary>
+        /// 位号
+        /// </summary>
+        public string TagNumber { get; set; } = "";
+        /// <summary>
+        /// tag
+        /// </summary>
+        public string TagNumber_Upper { get; set; } = "";
+        /// <summary>
+        /// system
+        /// </summary>
+        public string TagNumber_Lower { get; set; } = "";
+
+        /// <summary>
+        /// 图元文件Id
+        /// </summary>
+        public string FileId { get; set; }
+        /// <summary>
+        /// 基点在布置图上的句柄
+        /// </summary>
+        public string PixelOnDwg { get; set; }
+        /// <summary>
+        /// 比例
+        /// </summary>
+        public double Scale { get; set; }
+        /// <summary>
+        /// true:默认块，false：异性块
+        /// </summary>
+        public bool IsNotDefaultSymbol { get; set; }
+        /// <summary>
+        /// 肋位号 和 偏移量
+        /// </summary>
+        public double X { get; set; }
+        private string _XOff;
+        public string XOff
+        {
+            get { return string.IsNullOrEmpty(_XOff) ? "0" : _XOff; }
+            set { _XOff = value; }
+        }
+        /// <summary>
+        /// 纵骨号 偏移量
+        /// </summary>
+        private string _YOff;
+        public string YOff
+        {
+            get { return string.IsNullOrEmpty(_YOff) ? "0" : _YOff; }
+            set { _YOff = value; }
+        }
+
+        public string deck { get; set; }
+        public string area { get; set; }
+
+        /// <summary>
+        /// 基点从属的、或者说附近的设备位号
+        /// </summary>
+        public List<LayoutTagInfoBrief> Tags { get; set; } = new List<LayoutTagInfoBrief>();
+        #endregion
+    }
+}

newFront/c#前端/SWS.Share/SWS.Share.csproj

@@ -42,8 +42,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Enums\Action.cs" />
+    <Compile Include="ActionHistory.cs" />
     <Compile Include="BOMGroupInfo.cs" />
+    <Compile Include="LayoutTagInfoBrief.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Enums\WireGroupStatusEnum.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

newFront/c#前端/SWS.Share/SWS.Share.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ProjectFiles</ProjectView>
+    <ProjectView>ShowAllFiles</ProjectView>
   </PropertyGroup>
 </Project>

newFront/c#前端/SWS.WPF/SWS.WPF.csproj

@@ -191,6 +191,10 @@
       <Project>{51cb6f5b-16e9-4ee0-baa4-144dd1ec8580}</Project>
       <Name>SWS.Service</Name>
     </ProjectReference>
+    <ProjectReference Include="..\SWS.Share\SWS.Share.csproj">
+      <Project>{87E71797-E60A-4637-BA32-C8B57154ABC3}</Project>
+      <Name>SWS.Share</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="Style\StyleSelectors\" />

newFront/c#前端/SWS.WPF/SWS.WPF.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ProjectView>ShowAllFiles</ProjectView>
+    <ProjectView>ProjectFiles</ProjectView>
   </PropertyGroup>
 </Project>

newFront/c#前端/SWS.WPF/ViewModels/DialogSignalManagementVM/DialogSignalManagementViewModel.cs

@@ -20,6 +20,7 @@ using DryIoc;
 using ImTools;
 using System.Timers;
 using System.Windows.Threading;
+using SWS.Share;
 
 namespace SWS.WPF.ViewModels
 {
@@ -903,7 +904,7 @@ namespace SWS.WPF.ViewModels
                                             new ActionHistory()
                                             {
                                                 ActionTime= DateTime.Now,
-                                                ActionType = SWS.Model.Action.准备删除,
+                                                ActionType = Share.Action.准备删除,
                                                 reason = Reason
 
                                             }
@@ -961,7 +962,7 @@ namespace SWS.WPF.ViewModels
                         new ActionHistory()
                         {
                             ActionTime= DateTime.Now,
-                            ActionType = Model.Action.撤销删除,
+                            ActionType = Share.Action.撤销删除,
 
                         }
                     };
@@ -1022,7 +1023,7 @@ namespace SWS.WPF.ViewModels
 
                     WireGroups ent = new WireGroups();
                     ent.Signals = Signals;
-                    string message = await _wireGroupService.CanSaveSignals(ent, Model.Action.删除);
+                    string message = await _wireGroupService.CanSaveSignals(ent, Share.Action.删除);
                     if (message != "OK")
                     {
                         // 显示消息框
@@ -1036,7 +1037,7 @@ namespace SWS.WPF.ViewModels
                             new ActionHistory()
                             {
                                 ActionTime= DateTime.Now,
-                                ActionType = Model.Action.删除,
+                                ActionType = Share.Action.删除,
                                 reason = ""
 
                             }
@@ -1113,7 +1114,7 @@ namespace SWS.WPF.ViewModels
                                     new ActionHistory()
                                     {
                                         ActionTime= DateTime.Now,
-                                        ActionType = Model.Action.回收站恢复,
+                                        ActionType = Share.Action.回收站恢复,
                                         reason = Reason
 
                                     }
@@ -1166,7 +1167,7 @@ namespace SWS.WPF.ViewModels
                     };
                     WireGroups ent = new WireGroups();
                     ent.Signals = Signals;
-                    string message = await _wireGroupService.CanSaveSignals(ent, Model.Action.审核);
+                    string message = await _wireGroupService.CanSaveSignals(ent, Share.Action.审核);
                     if (message != "OK")
                     {
                         // 显示消息框
@@ -1180,7 +1181,7 @@ namespace SWS.WPF.ViewModels
                                     new ActionHistory()
                                     {
                                         ActionTime= DateTime.Now,
-                                        ActionType = Model.Action.审核,
+                                        ActionType = Share.Action.审核,
                                         reason = ""
 
                                     }
@@ -1222,7 +1223,7 @@ namespace SWS.WPF.ViewModels
                                             new ActionHistory()
                                             {
                                                 ActionTime= DateTime.Now,
-                                                ActionType = Model.Action.重新打开,
+                                                ActionType = Share.Action.重新打开,
                                                 reason = Reason
 
                                             }

newFront/c#前端/SWS.WPF/ViewModels/DialogSignalManagementVM/DialogSignalPropertyhisAndLogsViewModel.cs

@@ -212,11 +212,11 @@ namespace SWS.WPF.ViewModels
             set { _WireGroupID = value; }
         }
         [JsonConverter(typeof(StringEnumConverter))]
-        private Model.Action _OperateType;
+        private Share.Action _OperateType;
         /// <summary>
         /// 操作
         /// </summary>
-        public Model.Action OperateType
+        public Share.Action OperateType
         {
             get { return _OperateType; }
             set { _OperateType = value; }