diff --git a/.gitignore b/.gitignore
index 024e8a8e..73db3b25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -961,3 +961,125 @@ bin/release/
/Learun.Application.Web/obj/Release/Package/PackageTmp/bin/Learun.Application.Web.dll
/Learun.Application.Web/obj/Release/Package/PackageTmp/bin/Learun.Application.Web.pdb
/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
+/.vs/009/v17
+/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.dll
+/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.pdb
+/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.cache
+/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.lref
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.dll
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.pdb
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.dll
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.pdb
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.dll
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.pdb
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.dll
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.pdb
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.dll
+/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.pdb
+/newFront/c#前端/SWS.WPF/.vs
+/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.dll
+/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.pdb
+/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.dll
+/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.pdb
+/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.dll
+/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.pdb
+/newFront/c#前端/SWS.Service/.vs/SWS.Service.csproj.dtbcache.json
+/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.dll
+/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.pdb
+/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.Model/.vs/SWS.Model.csproj.dtbcache.json
+/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.dll
+/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.pdb
+/newFront/c#前端/SWS.Event/.vs/SWS.Event.csproj.dtbcache.json
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.dll
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.g.resources
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.pdb
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.cache
+/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.lref
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.pdb
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.pdb
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.pdb
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.pdb
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.pdb
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.pdb
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.dll
+/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.pdb
+/newFront/c#前端/SWS.Electrical/.vs/SWS.Electrical.csproj.dtbcache.json
+/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.dll
+/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.pdb
+/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.cache
+/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.lref
+/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.dll
+/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.pdb
+/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.CustomControl/.vs/SWS.CustomControl.csproj.dtbcache.json
+/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.dll
+/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.pdb
+/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.dll
+/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.pdb
+/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.Commons/.vs/SWS.Commons.csproj.dtbcache.json
+/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.AssemblyReference.cache
+/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.CoreCompileInputs.cache
+/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.FileListAbsolute.txt
+/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.dll
+/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.pdb
+/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.dll
+/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.pdb
+/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.dll
+/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.pdb
+/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.dll
+/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.pdb
+/newFront/c#前端/SWS.CAD.Base/.vs/SWS.CAD.Base.csproj.dtbcache.json
+/newFront/c#前端/SWS.CAD/.vs/SWS.CAD.csproj.dtbcache.json
+/newFront/c#前端/DI-Electrical/.vs/DI-Electrical.csproj.dtbcache.json
+/newFront/c#前端/CAD.Extend/.vs/CAD.Extend.csproj.dtbcache.json
+/newFront/c#前端/.vs/SWS.CAD/v17/.suo
+/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.backup.json
+/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.json
+/newFront/c#前端/.vs/SWS.CAD/v17/fileList.bin
+/.vs/VSWorkspaceState.json
+/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/3ad7c96f-983b-4ac1-9f92-f5a7901a6021.vsidx
+/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/815c1f12-618a-42f1-9f48-530a4fe7066c.vsidx
+/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/cfdccd18-8f13-4a54-aace-917e664fe014.vsidx
+/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/da4d986e-a00f-4854-84e3-051892159db9.vsidx
+/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f3f7e679-645b-4fe3-a724-f2e55e8cd4fe.vsidx
+/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/f843a722-ec3e-425b-a704-f3537ea54b49.vsidx
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
deleted file mode 100644
index 6b611411..00000000
--- a/.vs/VSWorkspaceState.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
- "ExpandedNodes": [
- ""
- ],
- "PreviewInSolutionExplorer": false
-}
\ No newline at end of file
diff --git a/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/cfdccd18-8f13-4a54-aace-917e664fe014.vsidx b/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/cfdccd18-8f13-4a54-aace-917e664fe014.vsidx
deleted file mode 100644
index db5c76af..00000000
Binary files a/newFront/c#前端/.vs/SWS.CAD/FileContentIndex/cfdccd18-8f13-4a54-aace-917e664fe014.vsidx and /dev/null differ
diff --git a/newFront/c#前端/.vs/SWS.CAD/v17/.suo b/newFront/c#前端/.vs/SWS.CAD/v17/.suo
deleted file mode 100644
index 9f97253c..00000000
Binary files a/newFront/c#前端/.vs/SWS.CAD/v17/.suo and /dev/null differ
diff --git a/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.backup.json b/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.backup.json
deleted file mode 100644
index b689acee..00000000
--- a/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.backup.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "E:\\Di-Elec\\009_DI-Elec\\newFront\\c#\u524D\u7AEF\\",
- "Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{7AFF9117-78E7-4395-9F23-6DCFE09F9299}|SWS.WPF\\SWS.WPF.csproj|e:\\di-elec\\009_di-elec\\newfront\\c#\u524D\u7AEF\\sws.wpf\\viewmodels\\dialogsignalmanagementvm\\dialogsignalmanagementviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7AFF9117-78E7-4395-9F23-6DCFE09F9299}|SWS.WPF\\SWS.WPF.csproj|solutionrelative:sws.wpf\\viewmodels\\dialogsignalmanagementvm\\dialogsignalmanagementviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- }
- ],
- "DocumentGroupContainers": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "SelectedChildIndex": 2,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{f2e84780-2af1-11d1-a7fa-00a0c9110051}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:1787071360:0:{81164725-9a96-4ece-a4cb-440d8fd285e5}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "DialogSignalManagementViewModel.cs",
- "DocumentMoniker": "E:\\Di-Elec\\009_DI-Elec\\newFront\\c#\u524D\u7AEF\\SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "RelativeDocumentMoniker": "SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "ToolTip": "E:\\Di-Elec\\009_DI-Elec\\newFront\\c#\u524D\u7AEF\\SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "RelativeToolTip": "SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "ViewState": "AgIAAIgBAAAAAAAAAAAgwMkDAABLAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-08-15T09:22:56.821Z",
- "EditorCaption": ""
- }
- ]
- },
- {
- "DockedWidth": 184,
- "SelectedChildIndex": -1,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:1:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.json b/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.json
deleted file mode 100644
index 7bc46f92..00000000
--- a/newFront/c#前端/.vs/SWS.CAD/v17/DocumentLayout.json
+++ /dev/null
@@ -1,59 +0,0 @@
-{
- "Version": 1,
- "WorkspaceRootPath": "E:\\Di-Elec\\009_DI-Elec\\newFront\\c#\u524D\u7AEF\\",
- "Documents": [
- {
- "AbsoluteMoniker": "D:0:0:{7AFF9117-78E7-4395-9F23-6DCFE09F9299}|SWS.WPF\\SWS.WPF.csproj|e:\\di-elec\\009_di-elec\\newfront\\c#\u524D\u7AEF\\sws.wpf\\viewmodels\\dialogsignalmanagementvm\\dialogsignalmanagementviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
- "RelativeMoniker": "D:0:0:{7AFF9117-78E7-4395-9F23-6DCFE09F9299}|SWS.WPF\\SWS.WPF.csproj|solutionrelative:sws.wpf\\viewmodels\\dialogsignalmanagementvm\\dialogsignalmanagementviewmodel.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
- }
- ],
- "DocumentGroupContainers": [
- {
- "Orientation": 0,
- "VerticalTabListWidth": 256,
- "DocumentGroups": [
- {
- "DockedWidth": 200,
- "SelectedChildIndex": 2,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{f2e84780-2af1-11d1-a7fa-00a0c9110051}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:1787071360:0:{81164725-9a96-4ece-a4cb-440d8fd285e5}"
- },
- {
- "$type": "Document",
- "DocumentIndex": 0,
- "Title": "DialogSignalManagementViewModel.cs",
- "DocumentMoniker": "E:\\Di-Elec\\009_DI-Elec\\newFront\\c#\u524D\u7AEF\\SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "RelativeDocumentMoniker": "SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "ToolTip": "E:\\Di-Elec\\009_DI-Elec\\newFront\\c#\u524D\u7AEF\\SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "RelativeToolTip": "SWS.WPF\\ViewModels\\DialogSignalManagementVM\\DialogSignalManagementViewModel.cs",
- "ViewState": "AgIAAJsBAAAAAAAAAAAowMkDAABLAAAAAAAAAA==",
- "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
- "WhenOpened": "2025-08-15T09:22:56.821Z",
- "EditorCaption": ""
- }
- ]
- },
- {
- "DockedWidth": 184,
- "SelectedChildIndex": -1,
- "Children": [
- {
- "$type": "Bookmark",
- "Name": "ST:1:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- },
- {
- "$type": "Bookmark",
- "Name": "ST:0:0:{3ae79031-e1bc-11d0-8f78-00a0c9110057}"
- }
- ]
- }
- ]
- }
- ]
-}
\ No newline at end of file
diff --git a/newFront/c#前端/.vs/SWS.CAD/v17/fileList.bin b/newFront/c#前端/.vs/SWS.CAD/v17/fileList.bin
deleted file mode 100644
index 65b17308..00000000
Binary files a/newFront/c#前端/.vs/SWS.CAD/v17/fileList.bin and /dev/null differ
diff --git a/newFront/c#前端/CAD.Extend/.vs/CAD.Extend.csproj.dtbcache.json b/newFront/c#前端/CAD.Extend/.vs/CAD.Extend.csproj.dtbcache.json
deleted file mode 100644
index 2f4a7bd4..00000000
--- a/newFront/c#前端/CAD.Extend/.vs/CAD.Extend.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\CAD.Extend","ProjectFileName":"CAD.Extend.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Commands.cs"},{"SourceFile":"GlobalObject.cs"},{"SourceFile":"Model\\KeyValueModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"ViewModels\\DialogConvertBaseMapViewModel.cs"},{"SourceFile":"ViewModels\\myViewModelBase\\DialogBase.cs"},{"SourceFile":"Views\\CustomControl\\customWindowTitleBar.xaml.cs"},{"SourceFile":"Views\\CustomDialogWindow.xaml.cs"},{"SourceFile":"Views\\DialogConvertBaseMap.xaml.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\DryIoc.dll.5.4.3\\lib\\net45\\DryIoc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\\lib\\net462\\Microsoft.Extensions.DependencyInjection.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.122\\lib\\net462\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.Container.Abstractions.9.0.106\\lib\\net47\\Prism.Container.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.Container.DryIoc.9.0.106\\lib\\net47\\Prism.Container.DryIoc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.Container.Unity.9.0.106\\lib\\net462\\Prism.Container.Unity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.Core.9.0.537\\lib\\net47\\Prism.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.DryIoc.9.0.537\\lib\\net47\\Prism.DryIoc.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.Events.9.0.537\\lib\\net47\\Prism.Events.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.Unity.9.0.537\\lib\\net47\\Prism.Unity.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Prism.Wpf.9.0.537\\lib\\net47\\Prism.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD.Base\\bin\\Debug\\SWS.CAD.Base.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD.Base\\bin\\Debug\\SWS.CAD.Base.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.FileDialogs.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.GridView.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Input.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Navigation.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Unity.Abstractions.5.11.7\\lib\\net48\\Unity.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\packages\\Unity.Container.5.11.11\\lib\\net48\\Unity.Container.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Elec\\009_DI-Elec\\newFront\\c#前端\\CAD.Extend\\bin\\Debug\\CAD.Extend.dll","OutputItemRelativePath":"CAD.Extend.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/CAD.Extend/Images/pic1.png b/newFront/c#前端/CAD.Extend/Images/pic1.png
new file mode 100644
index 00000000..ca04b926
Binary files /dev/null and b/newFront/c#前端/CAD.Extend/Images/pic1.png differ
diff --git a/newFront/c#前端/CAD.Extend/Model/KeyValueModel.cs b/newFront/c#前端/CAD.Extend/Model/KeyValueModel.cs
new file mode 100644
index 00000000..5e73d672
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Model/KeyValueModel.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CAD.Extend.Model
+{
+ public class KeyValueModel
+ {
+ private string _Key;
+ ///
+ /// Key
+ ///
+ public string Key
+ {
+ get
+ {
+ return _Key;
+ }
+ set
+ {
+ _Key = value;
+ }
+ }
+ private string _Value;
+ ///
+ /// Key
+ ///
+ public string Value
+ {
+ get
+ {
+ return _Value;
+ }
+ set
+ {
+ _Value = value;
+ }
+ }
+ }
+}
diff --git a/newFront/c#前端/CAD.Extend/ViewModels/myViewModelBase/DialogBase.cs b/newFront/c#前端/CAD.Extend/ViewModels/myViewModelBase/DialogBase.cs
new file mode 100644
index 00000000..36196a16
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/ViewModels/myViewModelBase/DialogBase.cs
@@ -0,0 +1,88 @@
+using Bricscad.ApplicationServices;
+using Bricscad.Windows;
+using Prism.Dialogs;
+using Prism.Ioc;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Input;
+using Telerik.Windows.Controls;
+using Unity;
+
+namespace CAD.Extend.ViewModels
+{
+ ///
+ /// abstract 不同于接口，可以实现具体的代码
+ ///
+ public abstract class DialogBase : ViewModelBase
+ {
+ public DialogBase()
+ {
+ _dialogService = GlobalObject._prismContainer.Resolve();
+ window_loaded = new DelegateCommand(onWindow_loaded);
+ CloseCommand = new DelegateCommand(ExecuteCloseCommand);
+ OKCommand = new DelegateCommand(ExecuteOKCommandAsync);
+
+ }
+ #region binding
+ private bool _isbusy;
+
+ public bool IsBusy
+ {
+ get { return _isbusy; }
+ set { _isbusy = value; RaisePropertyChanged(nameof(IsBusy)); }
+ }
+ private string _BusyContent;
+
+ public string BusyContent
+ {
+ get { return _BusyContent; }
+ set { _BusyContent = value; RaisePropertyChanged(nameof(BusyContent)); }
+ }
+
+ ///
+ /// 加载后
+ ///
+ public ICommand window_loaded { get; }
+ public ICommand CloseCommand { get; }
+
+ public ICommand OKCommand { get; }
+ private string _title;
+
+ public string title
+ {
+ get { return _title; }
+ set { _title = value; RaisePropertyChanged(nameof(title)); }
+ }
+ #endregion
+ IUnityContainer _unityContainer;
+ public readonly IDialogService _dialogService;
+ ///
+ /// CODE-BEHAND里设置为this.close以关闭。调用时，.invoke即可
+ ///
+ public Action CloseWindowAction { get; set; }
+ ///
+ /// virtual 可以重写
+ ///
+ ///
+ public virtual void ExecuteCloseCommand(object parameter)
+ {
+ // 关闭窗口 (需要通过 CommandParameter 传入窗口实例)
+ if (parameter is System.Windows.Window window)
+ {
+ window.Close();
+ }
+ }
+ public virtual void onWindow_loaded(object para)
+ {
+
+ }
+ public virtual void ExecuteOKCommandAsync(object para)
+ {
+
+ }
+ }
+}
diff --git a/newFront/c#前端/CAD.Extend/Views/CustomControl/customWindowTitleBar.xaml b/newFront/c#前端/CAD.Extend/Views/CustomControl/customWindowTitleBar.xaml
new file mode 100644
index 00000000..d186402d
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Views/CustomControl/customWindowTitleBar.xaml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/newFront/c#前端/CAD.Extend/Views/CustomControl/customWindowTitleBar.xaml.cs b/newFront/c#前端/CAD.Extend/Views/CustomControl/customWindowTitleBar.xaml.cs
new file mode 100644
index 00000000..a82052e7
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Views/CustomControl/customWindowTitleBar.xaml.cs
@@ -0,0 +1,45 @@
+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 CAD.Extend.Views.CustomControl
+{
+ ///
+ /// customWindowTitleBar.xaml 的交互逻辑
+ ///
+ public partial class customWindowTitleBar : UserControl
+ {
+ public customWindowTitleBar()
+ {
+ InitializeComponent();
+ }
+ private void Border_MouseDown(object sender, MouseButtonEventArgs e)
+ {
+ // 将事件传递给父窗口，要求窗口进行拖动
+ if (e.ChangedButton == MouseButton.Left)
+ {
+ var window = Window.GetWindow(this); // 获取父窗口
+ window?.DragMove(); // 调用窗口的 DragMove 方法
+ }
+ }
+ ///
+ /// 设置Title
+ ///
+ ///
+ public void SetTitle(string title)
+ {
+ lblTitle.Content = title;
+ }
+ }
+}
diff --git a/newFront/c#前端/CAD.Extend/Views/CustomDialogWindow.xaml b/newFront/c#前端/CAD.Extend/Views/CustomDialogWindow.xaml
new file mode 100644
index 00000000..ea7319be
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Views/CustomDialogWindow.xaml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
diff --git a/newFront/c#前端/CAD.Extend/Views/CustomDialogWindow.xaml.cs b/newFront/c#前端/CAD.Extend/Views/CustomDialogWindow.xaml.cs
new file mode 100644
index 00000000..ac8f861a
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Views/CustomDialogWindow.xaml.cs
@@ -0,0 +1,36 @@
+using Prism.Dialogs;
+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 CAD.Extend.Views
+{
+ ///
+ /// Interaction logic for CustomDialogWindow.xaml
+ ///
+ public partial class CustomDialogWindow : Window, IDialogWindow
+ {
+ public CustomDialogWindow()
+ {
+ InitializeComponent();
+
+ // 设置窗口样式（可选）
+ WindowStartupLocation = WindowStartupLocation.CenterScreen;
+ ResizeMode = ResizeMode.NoResize;
+
+ }
+
+ public IDialogResult Result { get ; set ; }
+ }
+}
diff --git a/newFront/c#前端/CAD.Extend/Views/DialogConvertBaseMap.xaml b/newFront/c#前端/CAD.Extend/Views/DialogConvertBaseMap.xaml
new file mode 100644
index 00000000..2da316c2
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Views/DialogConvertBaseMap.xaml
@@ -0,0 +1,132 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/newFront/c#前端/CAD.Extend/Views/DialogConvertBaseMap.xaml.cs b/newFront/c#前端/CAD.Extend/Views/DialogConvertBaseMap.xaml.cs
new file mode 100644
index 00000000..da93dc76
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Views/DialogConvertBaseMap.xaml.cs
@@ -0,0 +1,16 @@
+using System.Windows.Controls;
+
+namespace CAD.Extend.Views
+{
+ ///
+ /// DialogConvertBaseMap.xaml 的交互逻辑
+ ///
+ public partial class DialogConvertBaseMap : UserControl
+ {
+ public DialogConvertBaseMap()
+ {
+ InitializeComponent();
+
+ }
+ }
+}
diff --git a/newFront/c#前端/CAD.Extend/Views/Style/CustomStyles.xaml b/newFront/c#前端/CAD.Extend/Views/Style/CustomStyles.xaml
new file mode 100644
index 00000000..602c4d5a
--- /dev/null
+++ b/newFront/c#前端/CAD.Extend/Views/Style/CustomStyles.xaml
@@ -0,0 +1,155 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/newFront/c#前端/CAD.Extend/obj/Debug/CAD.Extend.csproj.AssemblyReference.cache b/newFront/c#前端/CAD.Extend/obj/Debug/CAD.Extend.csproj.AssemblyReference.cache
index 5e68afd2..806e2185 100644
Binary files a/newFront/c#前端/CAD.Extend/obj/Debug/CAD.Extend.csproj.AssemblyReference.cache and b/newFront/c#前端/CAD.Extend/obj/Debug/CAD.Extend.csproj.AssemblyReference.cache differ
diff --git a/newFront/c#前端/CAD.Extend/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/newFront/c#前端/CAD.Extend/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
index d251fbda..ca2aed7d 100644
Binary files a/newFront/c#前端/CAD.Extend/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/newFront/c#前端/CAD.Extend/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ
diff --git a/newFront/c#前端/DI-Electrical/.vs/DI-Electrical.csproj.dtbcache.json b/newFront/c#前端/DI-Electrical/.vs/DI-Electrical.csproj.dtbcache.json
deleted file mode 100644
index 77dfad2d..00000000
--- a/newFront/c#前端/DI-Electrical/.vs/DI-Electrical.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\DI-Electrical","ProjectFileName":"DI-Electrical.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"App.xaml.cs"},{"SourceFile":"Event\\loginEvent.cs"},{"SourceFile":"GlobalObject.cs"},{"SourceFile":"Helper\\ConfigService.cs"},{"SourceFile":"Helper\\FileHelper.cs"},{"SourceFile":"Helper\\LoggerHelper.cs"},{"SourceFile":"Model\\ec_project.cs"},{"SourceFile":"Model\\NoEntity\\ConfigIni.cs"},{"SourceFile":"Model\\NoEntity\\learunHttpRes.cs"},{"SourceFile":"Model\\NoEntity\\loginRes.cs"},{"SourceFile":"Model\\NoEntity\\PageModel.cs"},{"SourceFile":"Model\\user.cs"},{"SourceFile":"Services\\HttpService.cs"},{"SourceFile":"Services\\LoginService.cs"},{"SourceFile":"Services\\ProjectService.cs"},{"SourceFile":"Services\\UserService.cs"},{"SourceFile":"ViewModels\\ConfigViewModel.cs"},{"SourceFile":"ViewModels\\LoginViewModel.cs"},{"SourceFile":"ViewModels\\DialogTestViewModel.cs"},{"SourceFile":"ViewModels\\myViewModelBase\\DialogBase.cs"},{"SourceFile":"ViewModels\\ProjectViewModel.cs"},{"SourceFile":"Views\\Config.xaml.cs"},{"SourceFile":"Views\\CustomControl\\customWindowTitleBar.xaml.cs"},{"SourceFile":"Helper\\PasswordHelper.cs"},{"SourceFile":"ViewModels\\MainWindowViewModel.cs"},{"SourceFile":"Views\\Dialog\\DialogTest.xaml.cs"},{"SourceFile":"Views\\Login.xaml.cs"},{"SourceFile":"Views\\MainWindow.xaml.cs"},{"SourceFile":"Views\\Project.xaml.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Properties\\Resources.Designer.cs"},{"SourceFile":"Properties\\Settings.Designer.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\DI-Electrical\\obj\\Debug\\Views\\Config.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\DI-Electrical\\obj\\Debug\\Views\\CustomControl\\customWindowTitleBar.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\DI-Electrical\\obj\\Debug\\Views\\Dialog\\DialogTest.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\DI-Electrical\\obj\\Debug\\Views\\MainWindow.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\DI-Electrical\\obj\\Debug\\Views\\Project.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\DI-Electrical\\obj\\Debug\\GeneratedInternalTypeHelper.g.cs"}],"References":[{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\DryIoc.dll.5.4.3\\lib\\net45\\DryIoc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\EasyEncryption.1.0.2\\lib\\EasyEncryption.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\ini-parser.2.5.2\\lib\\net20\\INIFileParser.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\\lib\\net462\\Microsoft.Extensions.DependencyInjection.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.FileDialogs.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.GridView.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Input.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Navigation.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.Abstractions.5.11.7\\lib\\net48\\Unity.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.Container.5.11.11\\lib\\net48\\Unity.Container.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\DI-Electrical\\bin\\Debug\\DI-Electrical.exe","OutputItemRelativePath":"DI-Electrical.exe"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/DI-Electrical/GlobalObject.cs b/newFront/c#前端/DI-Electrical/GlobalObject.cs
new file mode 100644
index 00000000..0c965a6c
--- /dev/null
+++ b/newFront/c#前端/DI-Electrical/GlobalObject.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net.Http;
+using DI_Electrical.Model;
+using IniParser;
+using Prism.Ioc;
+using Unity;
+
+namespace DI_Electrical
+{
+ public class GlobalObject
+ {
+ public static loginRes userInfo;
+ public static HttpClient client;
+ public static bool isConfigIniCreateBySys = true;
+ public static List Users;
+ public static ec_project curProject;
+ public static string ConfigPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, @"Config.ini");
+ public static IUnityContainer container;
+ #region 本地文件目录
+ static string _LocalFileDirectory;
+ ///
+ /// 获取本地目录文件夹
+ ///
+ ///
+ public static string GetLocalFileDirectory()
+ {
+ if (string.IsNullOrEmpty(_LocalFileDirectory))
+ {
+ FileIniDataParser parser = new FileIniDataParser();
+ var data = parser.ReadFile(ConfigPath);
+ _LocalFileDirectory = data["Profile"]["Directory"];
+ return _LocalFileDirectory;
+ }
+ else
+ { return _LocalFileDirectory; }
+ }
+ ///
+ /// 设置本地目录文件夹
+ ///
+ /// 文件夹目录
+ public static void SetLocalFileDirectory(string dir)
+ { _LocalFileDirectory = dir; }
+ #endregion
+ public enum dialogPar
+ {
+ id,
+ title,
+ info,
+ para1,
+ para2
+ }
+ }
+}
diff --git a/newFront/c#前端/SWS.CAD.Base/.vs/SWS.CAD.Base.csproj.dtbcache.json b/newFront/c#前端/SWS.CAD.Base/.vs/SWS.CAD.Base.csproj.dtbcache.json
deleted file mode 100644
index c377ca0d..00000000
--- a/newFront/c#前端/SWS.CAD.Base/.vs/SWS.CAD.Base.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.CAD.Base","ProjectFileName":"SWS.CAD.Base.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"BlockDragJig.cs"},{"SourceFile":"General.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Commons\\bin\\Debug\\SWS.Commons.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Commons\\bin\\Debug\\SWS.Commons.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.CAD.Base\\bin\\Debug\\SWS.CAD.Base.dll","OutputItemRelativePath":"SWS.CAD.Base.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.CAD.Base/General.cs b/newFront/c#前端/SWS.CAD.Base/General.cs
index aea84025..c8ee2e9f 100644
--- a/newFront/c#前端/SWS.CAD.Base/General.cs
+++ b/newFront/c#前端/SWS.CAD.Base/General.cs
@@ -11,8 +11,9 @@ using Teigha.DatabaseServices;
using Teigha.Geometry;
using Database = Teigha.DatabaseServices.Database;
using Entity = Teigha.DatabaseServices.Entity;
-using Path = System.IO.Path;
+using Path = System.IO.Path;
using Color = Teigha.Colors.Color;
+using System.Security.Cryptography;
namespace SWS.CAD.Base
{
public static class General
@@ -570,11 +571,14 @@ namespace SWS.CAD.Base
SymbolUtilityServices.GetBlockModelSpaceId(destDb),
OpenMode.ForWrite
);
+
// 处理插入结果
if (dragResult.Status == PromptStatus.OK)
{
btr.AppendEntity(br);
tr.AddNewlyCreatedDBObject(br, true);
+
+ //AddValueToAcdbDictionary(tr, br, "1410523e-d594-4527-9f04-130bb89c1cf0", "");
tr.Commit();
oid = br.Id;
ed.WriteMessage($"\n 成功插入图元: {filePath} \n");
@@ -591,10 +595,12 @@ namespace SWS.CAD.Base
{
Entity ent01 = transaction.GetObject(oid, OpenMode.ForWrite) as Entity;
ResultBuffer rb = new ResultBuffer();
- rb.Add(new TypedValue((int)DxfCode.ExtendedDataRegAppName, tagNumber));
- rb.Add(new TypedValue((int)DxfCode.ExtendedDataAsciiString, "TEST"));
+ rb.Add(new TypedValue((int)DxfCode.ExtendedDataRegAppName, "HKSK_NODES"));
+ rb.Add(new TypedValue((int)DxfCode.ExtendedDataAsciiString, "HKSK_END"));
+ rb.Add(new TypedValue((int)DxfCode.ExtendedDataHandle, oid.Handle.ToString()));
ent01.XData = rb;
transaction.Commit();
+
}
}
catch (Exception ex)
@@ -657,6 +663,182 @@ namespace SWS.CAD.Base
}
}
#endregion
+ #region 创建块字典
+ private static void AddValueToAcdbDictionary(Transaction tr, BlockReference blockRef, string key, string value)
+ {
+ // 1. 确保块参照有扩展字典
+ DBDictionary extDict = GetOrCreateExtensionDictionary(tr, blockRef);
+
+ // 2. 获取或创建acdbdictionary
+ DBDictionary acdbDict = GetOrCreateAcdbDictionary(tr, extDict);
+
+ // 3. 创建XRecord存储值
+ Xrecord valueXrec = new Xrecord();
+ tr.AddNewlyCreatedDBObject(valueXrec, true);
+
+ // 4. 设置XRecord数据
+ //ResultBuffer rb = new ResultBuffer(
+ // new TypedValue(1000, "块自定义数据"),
+ // new TypedValue(1000, key),
+ // new TypedValue(1000, value)
+ //);
+ //valueXrec.Data = rb;
+
+ // 5. 添加到acdbdictionary
+ acdbDict.SetAt(key, valueXrec);
+ }
+
+ private static DBDictionary GetOrCreateExtensionDictionary(Transaction tr, DBObject obj)
+ {
+ if (obj.ExtensionDictionary.IsNull)
+ {
+ // 创建新扩展字典
+ obj.UpgradeOpen();
+ obj.CreateExtensionDictionary();
+ }
+
+ return (DBDictionary)tr.GetObject(
+ obj.ExtensionDictionary, OpenMode.ForWrite);
+ }
+
+ private static DBDictionary GetOrCreateAcdbDictionary(Transaction tr, DBDictionary extDict)
+ {
+ const string acdbDictName = "StLegend";
+
+ if (extDict.Contains(acdbDictName))
+ {
+ return (DBDictionary)tr.GetObject(
+ extDict.GetAt(acdbDictName), OpenMode.ForWrite);
+ }
+ else
+ {
+ // 创建新acdbdictionary
+ DBDictionary acdbDict = new DBDictionary();
+ extDict.SetAt(acdbDictName, acdbDict);
+ tr.AddNewlyCreatedDBObject(acdbDict, true);
+ return acdbDict;
+ }
+ }
+
+ #endregion
+ #region 读取元件块，插入图纸
+ ///
+ /// 读取元件块，插入图纸
+ ///
+ /// 图元文件路径
+ /// 传入的位号
+ /// 位号值
+ /// 元件类型ID
+ /// 比例大小
+ /// 坐标位置
+ ///
+ public static ObjectId AddTagDWG(string filePath, string tagName, string tag, string objTypeId, double scale, Point3d tagPoint)
+ {
+ if (scale == 0)
+ { scale = 1; }
+ Document doc = Application.DocumentManager.MdiActiveDocument;
+ var ed = doc.Editor;
+ ObjectId oid = ObjectId.Null;
+ if (!File.Exists(filePath))
+ {
+ ed.WriteMessage("\n 错误：图元文件不存在！\n");
+ return oid;
+ }
+ // 获取当前数据库
+ Database destDb = HostApplicationServices.WorkingDatabase;
+ using (Transaction tr = destDb.TransactionManager.StartTransaction())
+ {
+ try
+ {
+ // 创建临时数据库读取外部DWG
+ using (Database sourceDb = new Database(false, true))
+ {
+ sourceDb.ReadDwgFile(filePath, FileOpenMode.OpenForReadAndAllShare, false, null);
+
+ // 生成唯一块名（避免重名）
+ string blockName = GetUniqueBlockName(destDb, tagName);
+ // 将外部DWG转换为块定义
+ ObjectId blockId = destDb.Insert(blockName, sourceDb, true);
+ // 创建块参照
+ BlockReference br = new BlockReference(
+ Point3d.Origin, // 插入点（可修改）
+ blockId// bt[blockName]
+ );
+ br.Position = tagPoint;
+ // 设置比例和旋转
+ br.ScaleFactors = new Scale3d(scale); //比例因子
+ br.Rotation = 0.0; // 旋转角度（弧度）
+ // 获取实时鼠标位置
+ // 添加到当前模型空间
+ BlockTableRecord btr = (BlockTableRecord)tr.GetObject(
+ SymbolUtilityServices.GetBlockModelSpaceId(destDb),
+ OpenMode.ForWrite
+ );
+
+ // 处理插入结果
+ btr.AppendEntity(br);
+ tr.AddNewlyCreatedDBObject(br, true);
+ //创建位号属性
+ var attDef = AddAttributeDefinition(btr, "HKSK_TAG", tag);
+ AttributeReference attRef = new AttributeReference();
+ attRef.SetAttributeFromBlock(attDef, br.BlockTransform);
+ br.AttributeCollection.AppendAttribute(attRef);
+ tr.AddNewlyCreatedDBObject(attRef, true);
+ //添加字典
+ AddValueToAcdbDictionary(tr, br, objTypeId, "");
+ tr.Commit();
+ oid = br.Id;
+ ed.WriteMessage($"\n 成功插入图元: {filePath} \n");
+
+ }
+ // 设置XData
+ CreateRegApp(doc, tag);
+ using (Transaction transaction = destDb.TransactionManager.StartTransaction())
+ {
+ Entity ent01 = transaction.GetObject(oid, OpenMode.ForWrite) as Entity;
+ ResultBuffer rb = new ResultBuffer();
+ rb.Add(new TypedValue((int)DxfCode.ExtendedDataRegAppName, "HKSK_NODES"));
+ rb.Add(new TypedValue((int)DxfCode.ExtendedDataAsciiString, "HKSK_END"));
+ rb.Add(new TypedValue((int)DxfCode.ExtendedDataHandle, oid.Handle.ToString()));
+ ent01.XData = rb;
+ transaction.Commit();
+ }
+ }
+ catch (Exception ex)
+ {
+ tr.Abort();
+ ed.WriteMessage($"\n错误: {ex.Message}\n");
+ }
+ }
+ return oid;
+
+
+ }
+
+ private static AttributeDefinition AddAttributeDefinition(BlockTableRecord btr, string tag, string value)
+ {
+ // 创建属性定义
+ AttributeDefinition attDef = new AttributeDefinition()
+ {
+ // 属性位置（在圆形下方）
+ Position = new Point3d(0, 100, 0),
+ // 属性文字设置
+ Height = 2, // 文字高度
+ Justify = AttachmentPoint.BaseMid, // 对齐
+ // 属性定义参数
+ Tag = tag,// 属性标签（唯一标识）
+ Prompt = "", // 提示信息
+ TextString = value, // 默认值
+ Layer = "0", // 图层
+ // 设置属性可见性
+ Invisible = false,
+ Visible = false // 可见
+ // 将属性定义添加到块
+ };
+ btr.AppendEntity(attDef);
+ return attDef;
+ }
+ #endregion
#region 获取当前图纸选择集数量
///
@@ -883,6 +1065,74 @@ namespace SWS.CAD.Base
}
#endregion
+ #region 获取当前图纸所有实体
+ ///
+ /// 获取当前图纸XData不为空的所有实体
+ ///
+ ///
+ public static List GetAllEntity()
+ {
+ doc = Application.DocumentManager.MdiActiveDocument;
+ ed = doc.Editor;
+ db = doc.Database;
+
+ List handles = new List();
+ try
+ {
+ // 开启事务
+ using (Transaction tr = db.TransactionManager.StartTransaction())
+ {
+ // 获取模型空间块表记录
+ BlockTable bt = tr.GetObject(db.BlockTableId, OpenMode.ForRead) as BlockTable;
+ BlockTableRecord modelSpace = tr.GetObject(bt[BlockTableRecord.ModelSpace], OpenMode.ForRead) as BlockTableRecord;
+
+ // 遍历模型空间中的所有实体
+ foreach (ObjectId objId in modelSpace)
+ {
+ Entity entity = tr.GetObject(objId, OpenMode.ForRead) as Entity;
+ if (entity != null && entity.XData != null)
+ {
+ // 提取句柄（十六进制格式）
+ var blockRef = entity as BlockReference;
+ if (blockRef != null)
+ {
+ var dto = new DtoBasePoint()
+ {
+ Handle = entity.Handle.ToString(),
+ X = blockRef.Position.X,
+ Y = blockRef.Position.Y,
+ Z = blockRef.Position.Z
+ };
+ // 检查属性
+ // 检查属性集合
+ foreach (ObjectId attId in blockRef.AttributeCollection)
+ {
+ AttributeReference attRef = (AttributeReference)tr.GetObject(
+ attId, OpenMode.ForRead);
+
+ if (attRef.Tag == "HKSK_TAG")
+ {
+ dto.TagNumber = attRef.TextString;
+ break;
+ }
+ }
+
+ handles.Add(dto);
+ }
+ }
+ }
+ tr.Commit();
+ }
+
+ }
+ catch (System.Exception ex)
+ {
+ ed.WriteMessage($"\n错误: {ex.Message}");
+ }
+ return handles;
+ }
+ #endregion
+
#region 关联云线
public static List SelectHandles = new List();
@@ -1093,7 +1343,7 @@ namespace SWS.CAD.Base
{
//ed.WriteMessage("\n未找到匹配的图元");
return;
- }
+ }
Entity entity = (Entity)tr.GetObject(objId, OpenMode.ForWrite);
if (entity.XData != null)
{ continue; }
@@ -1465,7 +1715,287 @@ namespace SWS.CAD.Base
}
}
#endregion
+
+ #region 获取所有顶级字典名称
+
+ ///
+ /// 获取所有顶级字典名称
+ ///
+ public static List GetTopLevelDictionaryNames()
+ {
+ var doc = Application.DocumentManager.MdiActiveDocument;
+ var ed = doc.Editor;
+ var db = doc.Database;
+ using (Transaction tr = db.TransactionManager.StartTransaction())
+ {
+ DBDictionary nod = (DBDictionary)tr.GetObject(
+ db.NamedObjectsDictionaryId, OpenMode.ForRead);
+
+ return nod.Cast()
+ .Select(entry => entry.Key)
+ .ToList();
+ }
+ }
+ #endregion
+
+ #region 获取字典内容
+ ///
+ /// 获取字典内容
+ ///
+ public static Dictionary GetDictionaryContents(string dictionaryName)
+ {
+ var doc = Application.DocumentManager.MdiActiveDocument;
+ var ed = doc.Editor;
+ var db = doc.Database;
+ var result = new Dictionary();
+
+ using (Transaction tr = db.TransactionManager.StartTransaction())
+ {
+ DBDictionary nod = (DBDictionary)tr.GetObject(
+ db.NamedObjectsDictionaryId, OpenMode.ForRead);
+
+ if (nod.Contains(dictionaryName))
+ {
+ DBDictionary dict = (DBDictionary)tr.GetObject(
+ nod.GetAt(dictionaryName), OpenMode.ForRead);
+
+ foreach (DBDictionaryEntry entry in dict)
+ {
+ // result[entry.Key] = GetDbObjectValue(tr, entry.Value);
+ }
+ }
+
+ tr.Commit();
+ }
+
+ return result;
+ }
+ private static string GetDxfCodeDescription(int dxfCode)
+ {
+ string res = string.Empty;
+ switch (dxfCode)
+ {
+ case 0:
+ res = "实体类型";
+ break;
+ case 1:
+ res = "主文本值";
+ break;
+ case 2:
+ res = "名称";
+ break;
+ case 3:
+ res = "其他文本值";
+ break;
+ case 4:
+ res = "附加文本";
+ break;
+ case 5:
+ res = "实体句柄";
+ break;
+ case 6:
+ res = "线型名称";
+ break;
+ case 7:
+ res = "文字样式名称";
+ break;
+ case 8:
+ res = "图层名称";
+ break;
+ case 10:
+ res = "X坐标";
+ break;
+ case 20:
+ res = "Y坐标";
+ break;
+ case 30:
+ res = "Z坐标";
+ break;
+ case 40:
+ res = "数值";
+ break;
+ case 50:
+ res = "角度";
+ break;
+ case 60:
+ res = "实体可见性";
+ break;
+ case 62:
+ res = "颜色编号";
+ break;
+ case 70:
+ res = "标志值";
+ break;
+ case 90:
+ res = "32位整数";
+ break;
+ case 100:
+ res = "子类标记";
+ break;
+ case 1000:
+ res = "扩展数据字符串";
+ break;
+ case 1001:
+ res = "扩展数据应用名称";
+ break;
+ case 1002:
+ res = "扩展数据控制字符串";
+ break;
+ case 1003:
+ res = "图层名称";
+ break;
+ case 1004:
+ res = "二进制数据";
+ break;
+ case 1005:
+ res = "数据库句柄";
+ break;
+ case 1010:
+ res = "X值";
+ break;
+ case 1020:
+ res = "Y值";
+ break;
+ case 1030:
+ res = "Z值";
+ break;
+ case 1040:
+ res = "双精度浮点值";
+ break;
+ case 1070:
+ res = "16位整数";
+ break;
+ case 1071:
+ res = "32位整数";
+ break;
+ }
+ return res;
+ }
+
+
+ private static Dictionary ProcessXRecord(Xrecord xrec)
+ {
+ var result = new Dictionary();
+
+ if (xrec.Data != null)
+ {
+ foreach (TypedValue tv in xrec.Data)
+ {
+ result[tv.TypeCode] = tv.Value;
+ }
+ }
+ return result;
+ }
+ #endregion
+
+ #region 保存当前图纸
+ ///
+ /// 保存当前图纸的命令
+ ///
+ public static void SaveCurrentDrawing()
+ {
+ // 获取当前活动文档
+ Document doc = Application.DocumentManager.MdiActiveDocument;
+ // 获取编辑器，用于输出信息
+ Editor ed = doc.Editor;
+ try
+ {
+ doc.Database.Save();
+ ed.WriteMessage("\n文档保存成功！");
+ }
+ catch (System.Exception ex)
+ {
+ // 捕获并显示错误信息
+ ed.WriteMessage("\n保存失败: " + ex.Message);
+ }
+ }
+ #endregion
+
+ #region 打开元件图纸，改变位号的属性值
+ ///
+ /// 打开元件图纸，改变位号的属性值
+ ///
+ /// 元件图纸路径
+ /// 位号属性名
+ /// 位号值
+ /// true:默认块，false：异性块
+ ///
+ public static bool UpdateCableNo(string dwgName, List listTagName, string tagNumber, bool IsNotDefaultSymbol, string tag, string system)
+ {
+
+ try
+ {
+ OpenDwg(dwgName);
+ doc = Application.DocumentManager.MdiActiveDocument;
+ ed = doc.Editor;
+ db = doc.Database;
+ // 开启事务
+ using (Transaction tr = db.TransactionManager.StartTransaction())
+ {
+ // 获取模型空间块表记录
+ BlockTable bt = tr.GetObject(db.BlockTableId, OpenMode.ForRead) as BlockTable;
+ BlockTableRecord modelSpace = tr.GetObject(bt[BlockTableRecord.ModelSpace], OpenMode.ForRead) as BlockTableRecord;
+
+ // 遍历模型空间中的所有实体
+ foreach (ObjectId objId in modelSpace)
+ {
+ Entity entity = tr.GetObject(objId, OpenMode.ForRead) as Entity;
+ if (entity != null)
+ {
+ // 提取句柄（十六进制格式）
+ var blockRef = entity as BlockReference;
+ if (blockRef != null)
+ {
+ // 检查属性
+ // 检查属性集合
+ foreach (ObjectId attId in blockRef.AttributeCollection)
+ {
+ AttributeReference attRef = (AttributeReference)tr.GetObject(
+ attId, OpenMode.ForWrite);
+
+ if (listTagName.Contains(attRef.Tag) && !IsNotDefaultSymbol)
+ {
+ attRef.TextString = tagNumber;
+ break;
+ }
+ if (IsNotDefaultSymbol)
+ {
+ if (attRef.Tag.ToLower() == "system")
+ {
+ attRef.TextString = system;
+ //if (tagNumber.Contains("-"))
+ //{
+ // attRef.TextString = tagNumber.Substring(0, tagNumber.LastIndexOf("-"));
+ //}
+ //else { attRef.TextString = tagNumber; }
+ }
+ else if (attRef.Tag.ToLower() == "tag")
+ {
+ attRef.TextString = tag;
+ //if (tagNumber.Contains("-"))
+ //{
+ // attRef.TextString = tagNumber.Substring(tagNumber.LastIndexOf("-") + 1);
+ //}
+ }
+ }
+ }
+
+ }
+ }
+ }
+ tr.Commit();
+ }
+ doc.CloseAndSave(dwgName);
+ return true;
+ }
+ catch (Exception ex)
+ {
+ SendMessage(ex.Message);
+ return false;
+ }
+
+ }
+ #endregion
}
-
}
diff --git a/newFront/c#前端/SWS.CAD.Base/Model/DtoBasePoint.cs b/newFront/c#前端/SWS.CAD.Base/Model/DtoBasePoint.cs
new file mode 100644
index 00000000..4f908040
--- /dev/null
+++ b/newFront/c#前端/SWS.CAD.Base/Model/DtoBasePoint.cs
@@ -0,0 +1,30 @@
+namespace SWS.CAD.Base
+{
+ ///
+ /// 基点信息
+ ///
+ public class DtoBasePoint
+ {
+ ///
+ /// 句柄
+ ///
+ public string Handle { get; set; }
+ ///
+ /// 位号
+ ///
+ public string TagNumber { get; set; } = "";
+ ///
+ /// x坐标
+ ///
+ public double X { get; set; }
+ ///
+ /// y坐标
+ ///
+ public double Y { get; set; }
+ ///
+ /// z坐标
+ ///
+ public double Z { get; set; }
+
+ }
+}
diff --git a/newFront/c#前端/SWS.CAD.Base/SWS.CAD.Base.csproj b/newFront/c#前端/SWS.CAD.Base/SWS.CAD.Base.csproj
index 68a9aa44..ee676d80 100644
--- a/newFront/c#前端/SWS.CAD.Base/SWS.CAD.Base.csproj
+++ b/newFront/c#前端/SWS.CAD.Base/SWS.CAD.Base.csproj
@@ -51,6 +51,7 @@
+
diff --git a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.dll b/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.dll
deleted file mode 100644
index e4fe7d21..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.pdb b/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.pdb
deleted file mode 100644
index 7fa23c9e..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.CAD.Base.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.dll b/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.dll
deleted file mode 100644
index d3f37f5f..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.pdb b/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.pdb
deleted file mode 100644
index e80075fb..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Commons.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.dll b/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/bin/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.AssemblyReference.cache
deleted file mode 100644
index e65c3173..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.CoreCompileInputs.cache
deleted file mode 100644
index a542c33f..00000000
--- a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-4f85237df660210fe19c58c53fd550ea403e4888b4467219163e08b143cb1ab0
diff --git a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.FileListAbsolute.txt
deleted file mode 100644
index 75c24958..00000000
--- a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\log4net.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.CAD.Base.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.CAD.Base.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.CAD.Base.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\BrxMgd.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.Commons.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Mgd.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Prism.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Unity.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\INIFileParser.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\log4net.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Telerik.Windows.Controls.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Prism.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\System.Threading.Tasks.Extensions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Microsoft.Xaml.Behaviors.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.Commons.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.Commons.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SWS.Model.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Prism.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Prism.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Unity.Abstractions.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\INIFileParser.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\log4net.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\log4net.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Telerik.Windows.Controls.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Prism.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Prism.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\System.Threading.Tasks.Extensions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Microsoft.Xaml.Behaviors.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\Microsoft.Xaml.Behaviors.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\de\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\es\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\fr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\it\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\nl\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\tr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Alloc_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Db_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_DbRoot_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Gi_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Ge_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Gs_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Root_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_DynBlocks_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_SpatialIndex_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_DbEntities_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_DbCore_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_DbIO_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\DbConstraints_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Sm_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\TD_Ave_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\SCENEOE_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\ACCAMERA_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\ISM_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\WipeOut_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\AcMPolygonObj15_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\ATEXT_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\RText_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\bin\Debug\RecomputeDimBlock_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\obj\Debug\SWS.CAD.Base.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\obj\Debug\SWS.CAD.Base.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\obj\Debug\SWS.CAD..F8766F21.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\obj\Debug\SWS.CAD.Base.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CAD.Base\obj\Debug\SWS.CAD.Base.pdb
diff --git a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.dll b/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.dll
deleted file mode 100644
index e4fe7d21..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.pdb b/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.pdb
deleted file mode 100644
index 7fa23c9e..00000000
Binary files a/newFront/c#前端/SWS.CAD.Base/obj/Debug/SWS.CAD.Base.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CAD/.vs/SWS.CAD.csproj.dtbcache.json b/newFront/c#前端/SWS.CAD/.vs/SWS.CAD.csproj.dtbcache.json
deleted file mode 100644
index bca8a84d..00000000
--- a/newFront/c#前端/SWS.CAD/.vs/SWS.CAD.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.CAD","ProjectFileName":"SWS.CAD.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"CADFunc\\BlockDragJig.cs"},{"SourceFile":"CADFunc\\Editor\\EditorHelper.cs"},{"SourceFile":"CADFunc\\General.cs"},{"SourceFile":"Commands.cs"},{"SourceFile":"Event\\checkInResultEvent.cs"},{"SourceFile":"Event\\drawingChangeEvent.cs"},{"SourceFile":"Event\\checkInEvent.cs"},{"SourceFile":"Event\\getPropertyEvent.cs"},{"SourceFile":"Event\\selectPixelsEvent.cs"},{"SourceFile":"Event\\propertyChangeEvent.cs"},{"SourceFile":"Event\\IORelationEvent.cs"},{"SourceFile":"Event\\tagChangeEvent.cs"},{"SourceFile":"Event\\treeNodeChangeEvent.cs"},{"SourceFile":"Event\\SelectProjectEvent.cs"},{"SourceFile":"Helper\\Converter\\CollectionToStringConverter.cs"},{"SourceFile":"Helper\\Converter\\ExpandConverter.cs"},{"SourceFile":"Helper\\Converter\\ImageSourceConverter.cs"},{"SourceFile":"Helper\\Converter\\SelectedItemToBoolConverter.cs"},{"SourceFile":"Helper\\Converter\\YesNotConverter.cs"},{"SourceFile":"Helper\\Converter\\NotificationCheckFLGConverter.cs"},{"SourceFile":"Event\\loginEvent.cs"},{"SourceFile":"Helper\\Converter\\RadGridViewRowToBoolConverter.cs"},{"SourceFile":"Helper\\Converter\\StatusToColourConverter.cs"},{"SourceFile":"Helper\\FileHelper.cs"},{"SourceFile":"Helper\\Behavior\\PasswordHelper.cs"},{"SourceFile":"Helper\\TreeHelper.cs"},{"SourceFile":"Models\\ec_Cable.cs"},{"SourceFile":"Models\\ec_CableSet.cs"},{"SourceFile":"Models\\ec_CableSetWire.cs"},{"SourceFile":"Models\\ec_CircuitBreaker.cs"},{"SourceFile":"Models\\ec_drawing_catalogue.cs"},{"SourceFile":"Models\\ec_PanelChannel.cs"},{"SourceFile":"Models\\ec_Panel.cs"},{"SourceFile":"Models\\ec_PanelStrip.cs"},{"SourceFile":"Models\\ec_PanelStripTerm.cs"},{"SourceFile":"Models\\ec_projectSettings.cs"},{"SourceFile":"Models\\ec_WireTerminal.cs"},{"SourceFile":"Models\\ec_wire_group_notice.cs"},{"SourceFile":"Models\\ec_enginedata_propertyhis.cs"},{"SourceFile":"Models\\ec_operate_log.cs"},{"SourceFile":"Models\\NoEntity\\CheckInLogNeedApproveModel.cs"},{"SourceFile":"Models\\NoEntity\\CheckInModel.cs"},{"SourceFile":"Models\\NoEntity\\DrawingOpened.cs"},{"SourceFile":"Models\\annexesfile.cs"},{"SourceFile":"Models\\ec_dataitem.cs"},{"SourceFile":"Models\\ec_dataitemdetail.cs"},{"SourceFile":"Models\\ec_drawing_file.cs"},{"SourceFile":"Models\\ec_drawing_publish.cs"},{"SourceFile":"Models\\ec_drawing_syn.cs"},{"SourceFile":"Models\\ec_enginedata.cs"},{"SourceFile":"Models\\ec_enginedata_pixel.cs"},{"SourceFile":"Models\\ec_enginedata_property.cs"},{"SourceFile":"Models\\ec_library_file.cs"},{"SourceFile":"Models\\ec_measuring_unit.cs"},{"SourceFile":"Models\\ec_notification.cs"},{"SourceFile":"Models\\ec_objecttype.cs"},{"SourceFile":"Models\\ec_objecttypeP.cs"},{"SourceFile":"Models\\ec_parallel_Cable.cs"},{"SourceFile":"Models\\ec_property.cs"},{"SourceFile":"Models\\ec_template_file.cs"},{"SourceFile":"Models\\NoEntity\\ConfigIni.cs"},{"SourceFile":"Models\\NoEntity\\ContextOperationModel.cs"},{"SourceFile":"Models\\ec_Wire_Group.cs"},{"SourceFile":"Models\\ec_wire_group_log.cs"},{"SourceFile":"Models\\ec_wire_group_propertyhis.cs"},{"SourceFile":"Models\\NoEntity\\GroupAttribute.cs"},{"SourceFile":"Models\\NoEntity\\PropertyObjectModel.cs"},{"SourceFile":"Models\\NoEntity\\Unit.cs"},{"SourceFile":"Models\\user.cs"},{"SourceFile":"Services\\DataItemService.cs"},{"SourceFile":"Services\\AnnexesService.cs"},{"SourceFile":"Services\\SettingsService.cs"},{"SourceFile":"Services\\NotificationService.cs"},{"SourceFile":"Services\\EnginedataService.cs"},{"SourceFile":"Services\\ObjectTypeService.cs"},{"SourceFile":"Services\\IOModuleService.cs"},{"SourceFile":"Services\\WireGroupService.cs"},{"SourceFile":"Services\\ResourceService.cs"},{"SourceFile":"Services\\TemplateFileService.cs"},{"SourceFile":"Services\\DrawingCatalogueService.cs"},{"SourceFile":"Services\\UserService.cs"},{"SourceFile":"Start.cs"},{"SourceFile":"GlobalObject.cs"},{"SourceFile":"Helper\\LoggerHelper.cs"},{"SourceFile":"Models\\NoEntity\\loginRes.cs"},{"SourceFile":"Models\\NoEntity\\PageModel.cs"},{"SourceFile":"Models\\ec_project.cs"},{"SourceFile":"Models\\NoEntity\\learunHttpRes.cs"},{"SourceFile":"Models\\NoEntity\\TreeModel.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Helper\\ConfigService.cs"},{"SourceFile":"Services\\DrawingServce.cs"},{"SourceFile":"Services\\HttpService.cs"},{"SourceFile":"Services\\ProjectService.cs"},{"SourceFile":"Services\\LoginService.cs"},{"SourceFile":"ViewModels\\CheckInApproveViewModel.cs"},{"SourceFile":"ViewModels\\DialogIODistributionVM\\DialogNewComponentViewModel.cs"},{"SourceFile":"ViewModels\\DialogIODistributionVM\\DialogCablePreAssignResultViewModel.cs"},{"SourceFile":"ViewModels\\DialogIODistributionVM\\DialogIODistributionViewModel.cs"},{"SourceFile":"ViewModels\\DialogIODistributionVM\\DialogCablePreAssignPreviewViewModel.cs"},{"SourceFile":"ViewModels\\DialogIODistributionVM\\DialogCableConfigViewModel.cs"},{"SourceFile":"ViewModels\\DialogIODistributionVM\\DialogNewStripViewModel.cs"},{"SourceFile":"ViewModels\\DialogIODistributionVM\\DialogNewPositionalViewModel.cs"},{"SourceFile":"ViewModels\\DialogPropertyHistoryViewModel.cs"},{"SourceFile":"ViewModels\\DialogOperateRecordViewModel.cs"},{"SourceFile":"ViewModels\\DialogPublishRecordViewModel.cs"},{"SourceFile":"ViewModels\\DialogCheckInRecordViewModel.cs"},{"SourceFile":"ViewModels\\DialogDrawingCatalogueViewModel.cs"},{"SourceFile":"ViewModels\\DialogSignalPropertyhisAndLogsViewModel.cs"},{"SourceFile":"ViewModels\\DialogSignalNoticeViewModel.cs"},{"SourceFile":"ViewModels\\DialogPreCheckInViewModel.cs"},{"SourceFile":"ViewModels\\DialogParallelCableViewModel.cs"},{"SourceFile":"ViewModels\\DialogInputViewModel.cs"},{"SourceFile":"ViewModels\\DialogNewTagNumberViewModel.cs"},{"SourceFile":"ViewModels\\DialogSignalManagementViewModel.cs"},{"SourceFile":"ViewModels\\DialogTagSelectViewModel.cs"},{"SourceFile":"ViewModels\\DialogSignalSelectViewModel.cs"},{"SourceFile":"ViewModels\\DialogUnitSelectViewModel.cs"},{"SourceFile":"ViewModels\\Dialog2SelectViewModel.cs"},{"SourceFile":"ViewModels\\LeftPanelViewModel.cs"},{"SourceFile":"ViewModels\\RightPanelViewModel.cs"},{"SourceFile":"ViewModels\\UserNotificationViewModel.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectSearchComboBox\\GeometryHelper.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectSearchComboBox\\CollectionToStringConverter.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectSearchComboBox\\MultiSelectListBox.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectSearchComboBox\\MultiSelectSearchComboBox.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectSearchComboBox\\WDBorder.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectSearchComboBox\\Win32.cs"},{"SourceFile":"Views\\CustomControl\\RowNumberColumn.cs"},{"SourceFile":"Views\\Dialog\\DialogIODistributions\\DialogCableConfig.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogIODistributions\\DialogCablePreAssignResult.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogIODistributions\\DialogCablePreAssignPreview.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogIODistributions\\DialogIODistribution.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogIODistributions\\DialogNewStrip.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogIODistributions\\DialogNewComponent.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogPropertyHistory.xaml.cs"},{"SourceFile":"Views\\CustomControl\\IconButton\\IconButton.cs"},{"SourceFile":"Views\\CustomControl\\StyleSelectors\\ConditionalStyleSelector.cs"},{"SourceFile":"Views\\CustomControl\\StyleSelectors\\SignalNoticeStyleSelector.cs"},{"SourceFile":"Views\\Dialog\\DialogCheckInRecord.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogOperateRecord.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogPublishRecord.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogDrawingCatalogue.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogPreCheckIn.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogParallelCable.xaml.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectComboBox\\ElementHelper.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectComboBox\\MultiSelectComboBox.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectComboBox\\MultiSelectComboBoxItem.cs"},{"SourceFile":"Views\\CustomControl\\MultiSelectComboBox\\SmallPanel.cs"},{"SourceFile":"Views\\CustomControl\\NumericBox\\DoubleUtil.cs"},{"SourceFile":"Views\\CustomControl\\NumericBox\\NumericBox.cs"},{"SourceFile":"Views\\CustomControl\\NumericBox\\PackIconKind.cs"},{"SourceFile":"Views\\CustomControl\\NumericBox\\PathIcon.cs"},{"SourceFile":"Views\\CustomControl\\NumericBox\\TextBoxHelper.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\KeyValueModel.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\LsPropertyGridAttribute.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\PropertyGrid.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\propertyModel.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\PROPERTYType.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\RelationAttribute.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\RelationMethodAttribute.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\VisibilityBoolConverter.cs"},{"SourceFile":"Views\\CustomControl\\PropertyGrid\\VisibilityValueConverter.cs"},{"SourceFile":"Views\\CustomControl\\TreeComboBox.xaml.cs"},{"SourceFile":"Views\\Dialog\\CustomDialogWindow.xaml.cs"},{"SourceFile":"ViewModels\\myViewModelBase\\DialogBase.cs"},{"SourceFile":"ViewModels\\NewDrawingViewModel.cs"},{"SourceFile":"ViewModels\\ProjectViewModel.cs"},{"SourceFile":"ViewModels\\LoginViewModel.cs"},{"SourceFile":"ViewModels\\ConfigViewModel.cs"},{"SourceFile":"Views\\CustomControl\\customWindowTitleBar.xaml.cs"},{"SourceFile":"Views\\CustomControl\\test.cs"},{"SourceFile":"Views\\Dialog\\DialogNewTagNumber.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogTagSelect.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogInput.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogUnitSelect.xaml.cs"},{"SourceFile":"Views\\Dialog\\DialogIODistributions\\DialogNewPositional.xaml.cs"},{"SourceFile":"Views\\LeftPanel.xaml.cs"},{"SourceFile":"Views\\Loading.xaml.cs"},{"SourceFile":"Views\\NewDrawing.xaml.cs"},{"SourceFile":"Views\\Dialog\\Dialog2Select.xaml.cs"},{"SourceFile":"Views\\RightPanel.xaml.cs"},{"SourceFile":"Views\\SignalManagementViews\\DialogSignalManagement.xaml.cs"},{"SourceFile":"Views\\CheckInApprove.xaml.cs"},{"SourceFile":"Views\\SignalManagementViews\\DialogSignalNotice.xaml.cs"},{"SourceFile":"Views\\SignalManagementViews\\DialogSignalPropertyhisAndLogs.xaml.cs"},{"SourceFile":"Views\\SignalManagementViews\\DialogSignalSelect.xaml.cs"},{"SourceFile":"Views\\UserNotification.xaml.cs"},{"SourceFile":"Views\\Project.xaml.cs"},{"SourceFile":"Views\\Login.xaml.cs"},{"SourceFile":"Views\\Config.xaml.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogIODistributions\\DialogCableConfig.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogIODistributions\\DialogCablePreAssignResult.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogIODistributions\\DialogCablePreAssignPreview.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogIODistributions\\DialogNewStrip.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogIODistributions\\DialogNewComponent.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogPropertyHistory.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogOperateRecord.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogPublishRecord.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogDrawingCatalogue.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogCheckInRecord.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogPreCheckIn.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogParallelCable.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\CustomControl\\TreeComboBox.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\CustomDialogWindow.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\CustomControl\\customWindowTitleBar.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogNewTagNumber.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogTagSelect.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogInput.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogUnitSelect.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\DialogIODistributions\\DialogNewPositional.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\LeftPanel.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Loading.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\NewDrawing.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Dialog\\Dialog2Select.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\RightPanel.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\SignalManagementViews\\DialogSignalManagement.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\CheckInApprove.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\SignalManagementViews\\DialogSignalNotice.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\SignalManagementViews\\DialogSignalPropertyhisAndLogs.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\SignalManagementViews\\DialogSignalSelect.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\UserNotification.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Project.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Login.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\Views\\Config.g.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\obj\\Debug\\GeneratedInternalTypeHelper.g.cs"}],"References":[{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Aspose.Cells.25.3.0\\lib\\net40\\Aspose.Cells.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\bin\\Debug\\BrxMgd.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\DryIoc.dll.5.4.3\\lib\\net45\\DryIoc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\EasyEncryption.1.0.2\\lib\\EasyEncryption.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\EPPlus.4.5.3.3\\lib\\net40\\EPPlus.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\ini-parser.2.5.2\\lib\\net20\\INIFileParser.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\log4net.3.0.4\\lib\\net462\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\\lib\\net462\\Microsoft.Extensions.DependencyInjection.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.135\\lib\\net462\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\NLog.5.3.4\\lib\\net46\\NLog.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Container.Abstractions.9.0.106\\lib\\net47\\Prism.Container.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Container.DryIoc.9.0.106\\lib\\net47\\Prism.Container.DryIoc.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Container.Unity.9.0.106\\lib\\net462\\Prism.Container.Unity.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Core.9.0.537\\lib\\net47\\Prism.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.DryIoc.9.0.537\\lib\\net47\\Prism.DryIoc.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Events.9.0.537\\lib\\net47\\Prism.Events.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Unity.9.0.537\\lib\\net47\\Prism.Unity.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Wpf.9.0.537\\lib\\net47\\Prism.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.IO.Compression.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Security.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\bin\\Debug\\TD_Mgd.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.FileDialogs.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.GridView.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Input.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Navigation.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.5.11.10\\lib\\net48\\Unity.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.5.11.10\\lib\\net48\\Unity.Container.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\bin\\Debug\\SWS.CAD.dll","OutputItemRelativePath":"SWS.CAD.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.CAD/SWS.CAD.csproj b/newFront/c#前端/SWS.CAD/SWS.CAD.csproj
index cc3a2f2e..01d6bec7 100644
--- a/newFront/c#前端/SWS.CAD/SWS.CAD.csproj
+++ b/newFront/c#前端/SWS.CAD/SWS.CAD.csproj
@@ -36,7 +36,7 @@
..\packages\Aspose.Cells.25.3.0\lib\net40\Aspose.Cells.dll
- ..\..\..\..\..\Program Files\KunHeng\KunHengCAD V21 zh_CN\BrxMgd.dll
+ ..\..\..\..\..\..\Program Files\KunHeng\KunHengCAD V21 zh_CN\BrxMgd.dll
..\packages\DryIoc.dll.5.4.3\lib\net45\DryIoc.dll
@@ -119,7 +119,7 @@
- ..\..\..\..\..\Program Files\KunHeng\KunHengCAD V21 zh_CN\TD_Mgd.dll
+ ..\..\..\..\..\..\Program Files\KunHeng\KunHengCAD V21 zh_CN\TD_Mgd.dll
False
diff --git a/newFront/c#前端/SWS.Commons/.vs/SWS.Commons.csproj.dtbcache.json b/newFront/c#前端/SWS.Commons/.vs/SWS.Commons.csproj.dtbcache.json
deleted file mode 100644
index c5de3fc4..00000000
--- a/newFront/c#前端/SWS.Commons/.vs/SWS.Commons.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.Commons","ProjectFileName":"SWS.Commons.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"GlobalObject.cs"},{"SourceFile":"Helper\\Converter\\CollectionToStringConverter.cs"},{"SourceFile":"Helper\\Converter\\RadGridViewRowToBoolConverter.cs"},{"SourceFile":"Helper\\Converter\\StatusToColourConverter.cs"},{"SourceFile":"Helper\\FileHelper.cs"},{"SourceFile":"Helper\\LoggerHelper.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\ini-parser.2.5.2\\lib\\net20\\INIFileParser.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\log4net.3.1.0\\lib\\net462\\log4net.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\\lib\\net462\\Microsoft.Extensions.DependencyInjection.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.122\\lib\\net462\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Core.8.1.97\\lib\\net47\\Prism.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Unity.8.1.97\\lib\\net47\\Prism.Unity.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Wpf.8.1.97\\lib\\net47\\Prism.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Presentation.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.Abstractions.5.11.7\\lib\\net48\\Unity.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.Container.5.11.11\\lib\\net48\\Unity.Container.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.Commons\\bin\\Debug\\SWS.Commons.dll","OutputItemRelativePath":"SWS.Commons.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.Commons/GlobalObject.cs b/newFront/c#前端/SWS.Commons/GlobalObject.cs
index d2faab09..75c2706a 100644
--- a/newFront/c#前端/SWS.Commons/GlobalObject.cs
+++ b/newFront/c#前端/SWS.Commons/GlobalObject.cs
@@ -232,6 +232,19 @@ namespace SWS.Commons
}
#endregion
+ #region 系统缓存文件夹
+ ///
+ /// 系统缓存文件夹
+ ///
+ ///
+ public static string GetCacheFolder()
+ {
+ string path = Path.Combine(GetLocalFileDirectory(), "Temp");
+ if (!Directory.Exists(path))
+ Directory.CreateDirectory(path);
+ return path;
+ }
+ #endregion
///
///
diff --git a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.dll b/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.dll
deleted file mode 100644
index d3f37f5f..00000000
Binary files a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.pdb b/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.pdb
deleted file mode 100644
index e80075fb..00000000
Binary files a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Commons.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.dll b/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.Commons/bin/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.AssemblyReference.cache
deleted file mode 100644
index 65596fcb..00000000
Binary files a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.CoreCompileInputs.cache
deleted file mode 100644
index da34550b..00000000
--- a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-d4a5ddec0a0d0ff575b24c2cd99df3a4b6f2c15478a92ca0d628517b9b14094c
diff --git a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.FileListAbsolute.txt
deleted file mode 100644
index 86b352ba..00000000
--- a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,57 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\log4net.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\SWS.Commons.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\SWS.Commons.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\SWS.Commons.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\DryIoc.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\INIFileParser.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\log4net.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Microsoft.Xaml.Behaviors.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.DryIoc.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.Unity.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\System.Threading.Tasks.Extensions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\System.ValueTuple.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Telerik.Windows.Controls.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Unity.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Unity.Container.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\SWS.Model.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\DryIoc.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\INIFileParser.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\log4net.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\log4net.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Microsoft.Xaml.Behaviors.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Microsoft.Xaml.Behaviors.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.DryIoc.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.DryIoc.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.Unity.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.Unity.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Prism.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\System.Threading.Tasks.Extensions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\System.ValueTuple.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Telerik.Windows.Controls.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Unity.Abstractions.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\Unity.Container.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\de\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\es\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\fr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\it\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\nl\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\bin\Debug\tr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\obj\Debug\SWS.Commons.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\obj\Debug\SWS.Commons.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\obj\Debug\SWS.Comm.9AB1BE43.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\obj\Debug\SWS.Commons.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Commons\obj\Debug\SWS.Commons.pdb
diff --git a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.dll b/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.dll
deleted file mode 100644
index d3f37f5f..00000000
Binary files a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.pdb b/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.pdb
deleted file mode 100644
index e80075fb..00000000
Binary files a/newFront/c#前端/SWS.Commons/obj/Debug/SWS.Commons.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/.vs/SWS.CustomControl.csproj.dtbcache.json b/newFront/c#前端/SWS.CustomControl/.vs/SWS.CustomControl.csproj.dtbcache.json
deleted file mode 100644
index ac535a91..00000000
--- a/newFront/c#前端/SWS.CustomControl/.vs/SWS.CustomControl.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.CustomControl","ProjectFileName":"SWS.CustomControl.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"customWindowTitleBar.xaml.cs"},{"SourceFile":"IconButton\\IconButton.cs"},{"SourceFile":"MultiSelectSearchComboBox\\CollectionToStringConverter.cs"},{"SourceFile":"MultiSelectSearchComboBox\\DoubleUtil.cs"},{"SourceFile":"MultiSelectSearchComboBox\\ElementHelper.cs"},{"SourceFile":"MultiSelectSearchComboBox\\GeometryHelper.cs"},{"SourceFile":"MultiSelectSearchComboBox\\MultiSelectComboBoxItem.cs"},{"SourceFile":"MultiSelectSearchComboBox\\MultiSelectListBox.cs"},{"SourceFile":"MultiSelectSearchComboBox\\MultiSelectSearchComboBox.cs"},{"SourceFile":"MultiSelectSearchComboBox\\SmallPanel.cs"},{"SourceFile":"MultiSelectSearchComboBox\\WDBorder.cs"},{"SourceFile":"MultiSelectSearchComboBox\\Win32.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Selector\\ConditionalStyleSelector.cs"},{"SourceFile":"Selector\\SignalNoticeStyleSelector.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.CustomControl\\obj\\Debug\\customWindowTitleBar.g.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.CustomControl\\bin\\Debug\\SWS.CustomControl.dll","OutputItemRelativePath":"SWS.CustomControl.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.dll b/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.dll
deleted file mode 100644
index 454036d0..00000000
Binary files a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.pdb b/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.pdb
deleted file mode 100644
index db8a63bd..00000000
Binary files a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.CustomControl.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.dll b/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.CustomControl/bin/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.AssemblyReference.cache
deleted file mode 100644
index 17f4de00..00000000
Binary files a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 18493a3d..00000000
--- a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-50f5800c1a8cc558c9dc001f8125491cc65b464b1cce2ac471022c30ec5c0acf
diff --git a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.FileListAbsolute.txt
deleted file mode 100644
index c262cd86..00000000
--- a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\SWS.CustomControl.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\SWS.CustomControl.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Telerik.Windows.Controls.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Prism.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Prism.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Microsoft.Xaml.Behaviors.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\SWS.Model.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Telerik.Windows.Controls.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Prism.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Prism.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Prism.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Prism.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Microsoft.Xaml.Behaviors.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\Microsoft.Xaml.Behaviors.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\de\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\es\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\fr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\it\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\nl\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\bin\Debug\tr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.CustomControl.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\customWindowTitleBar.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.CustomControl_MarkupCompile.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.CustomControl_MarkupCompile.lref
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\customWindowTitleBar.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.CustomControl.g.resources
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.CustomControl.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.Cust.711DCEBD.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.CustomControl.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\SWS.CustomControl.pdb
diff --git a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.dll b/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.dll
deleted file mode 100644
index 454036d0..00000000
Binary files a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.pdb b/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.pdb
deleted file mode 100644
index db8a63bd..00000000
Binary files a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.cache b/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.cache
deleted file mode 100644
index 52b4fdef..00000000
--- a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.cache
+++ /dev/null
@@ -1,20 +0,0 @@
-SWS.CustomControl
-
-
-library
-C#
-.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\obj\Debug\
-SWS.CustomControl
-none
-false
-DEBUG;TRACE
-
-1-1993648534
-
-151252604432
-14-1792214720
-customWindowTitleBar.xaml;
-
-False
-
diff --git a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.lref b/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.lref
deleted file mode 100644
index 8b567b62..00000000
--- a/newFront/c#前端/SWS.CustomControl/obj/Debug/SWS.CustomControl_MarkupCompile.lref
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.CustomControl\customWindowTitleBar.xaml;;
-
diff --git a/newFront/c#前端/SWS.Electrical/.vs/SWS.Electrical.csproj.dtbcache.json b/newFront/c#前端/SWS.Electrical/.vs/SWS.Electrical.csproj.dtbcache.json
deleted file mode 100644
index 45f2cecc..00000000
--- a/newFront/c#前端/SWS.Electrical/.vs/SWS.Electrical.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.Electrical","ProjectFileName":"SWS.Electrical.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"Commands.cs"},{"SourceFile":"GlobalObj.cs"},{"SourceFile":"Models\\DtoDrawing.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"Start.cs"},{"SourceFile":"ViewModels\\DialogAutoArrangeLayoutViewModel.cs"},{"SourceFile":"ViewModels\\DialogTest2ViewModel.cs"},{"SourceFile":"Views\\DialogAutoArrangeLayout.xaml.cs"},{"SourceFile":"Views\\DialogTest2.xaml.cs"},{"SourceFile":"Views\\SWSDialogWindow.xaml.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"},{"SourceFile":"E:\\Di-Electrical\\c#前端\\SWS.Electrical\\obj\\Debug\\Views\\SWSDialogWindow.g.cs"}],"References":[{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\ini-parser.2.5.2\\lib\\net20\\INIFileParser.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\\lib\\net462\\Microsoft.Extensions.DependencyInjection.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.122\\lib\\net462\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Core.8.1.97\\lib\\net47\\Prism.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Unity.8.1.97\\lib\\net47\\Prism.Unity.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Wpf.8.1.97\\lib\\net47\\Prism.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD.Base\\bin\\Debug\\SWS.CAD.Base.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.CAD.Base\\bin\\Debug\\SWS.CAD.Base.dll"},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Commons\\bin\\Debug\\SWS.Commons.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Commons\\bin\\Debug\\SWS.Commons.dll"},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CustomControl\\bin\\Debug\\SWS.CustomControl.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.CustomControl\\bin\\Debug\\SWS.CustomControl.dll"},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll"},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Service\\bin\\Debug\\SWS.Service.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Service\\bin\\Debug\\SWS.Service.dll"},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.WPF\\bin\\Debug\\SWS.WPF.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.WPF\\bin\\Debug\\SWS.WPF.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.ValueTuple.4.5.0\\lib\\net47\\System.ValueTuple.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Web.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Windows.Forms.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xaml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.FileDialogs.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.GridView.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Input.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.Navigation.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.Abstractions.5.11.7\\lib\\net48\\Unity.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Unity.Container.5.11.11\\lib\\net48\\Unity.Container.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.Electrical\\bin\\Debug\\SWS.Electrical.dll","OutputItemRelativePath":"SWS.Electrical.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.Electrical/Commands.cs b/newFront/c#前端/SWS.Electrical/Commands.cs
index ce35cd5e..845ea3be 100644
--- a/newFront/c#前端/SWS.Electrical/Commands.cs
+++ b/newFront/c#前端/SWS.Electrical/Commands.cs
@@ -34,7 +34,7 @@ namespace SWS.Electrical
RibbonServices.CreateRibbonPaletteSet();
Start.RegisterTypes();
-
+ Start.AutoLogin();
AddTab();
}
catch (System.Exception e)
diff --git a/newFront/c#前端/SWS.Electrical/Control/ListBoxScrollToBottomBehavior.cs b/newFront/c#前端/SWS.Electrical/Control/ListBoxScrollToBottomBehavior.cs
new file mode 100644
index 00000000..7db6db55
--- /dev/null
+++ b/newFront/c#前端/SWS.Electrical/Control/ListBoxScrollToBottomBehavior.cs
@@ -0,0 +1,28 @@
+using System.Collections.Specialized;
+using System.Windows.Controls;
+using Microsoft.Xaml.Behaviors;
+namespace SWS.Electrical
+{
+ public class ListBoxScrollToBottomBehavior : Behavior
+ {
+ protected override void OnAttached()
+ {
+ base.OnAttached();
+ ((INotifyCollectionChanged)AssociatedObject.Items).CollectionChanged += OnCollectionChanged;
+ }
+
+ protected override void OnDetaching()
+ {
+ base.OnDetaching();
+ ((INotifyCollectionChanged)AssociatedObject.Items).CollectionChanged -= OnCollectionChanged;
+ }
+
+ private void OnCollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
+ {
+ if (AssociatedObject.HasItems)
+ {
+ AssociatedObject.ScrollIntoView(AssociatedObject.Items[AssociatedObject.Items.Count - 1]);
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.Electrical/Models/DtoAutoPlotLayout.cs b/newFront/c#前端/SWS.Electrical/Models/DtoAutoPlotLayout.cs
new file mode 100644
index 00000000..383e614c
--- /dev/null
+++ b/newFront/c#前端/SWS.Electrical/Models/DtoAutoPlotLayout.cs
@@ -0,0 +1,87 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using SWS.Model;
+using Telerik.Windows.Controls;
+
+namespace SWS.Electrical.Models
+{
+ public class DtoAutoPlotLayout : DtoDrawing
+ {
+ private string _AutoDrawing;
+ ///
+ /// 已绘制 未绘制
+ ///
+ ///
+ public string AutoDrawing
+ {
+ get { return _AutoDrawing; }
+ set { _AutoDrawing = value; RaisePropertyChanged(nameof(AutoDrawing)); }
+ }
+
+ ///
+ /// 工程数据ID
+ ///
+ public string EngineDataID { get; set; }
+ ///
+ /// 基点位号
+ ///
+ public string BasePointTagNumber { get; set; } = "";
+ ///
+ /// 比例
+ ///
+ public double Scale { get; set; }
+ ///
+ /// true:默认块，false：异性块
+ ///
+ public bool IsNotDefaultSymbol { get; set; }
+
+ ///
+ /// 元件位号
+ ///
+ public string TagNumber { get; set; } = "";
+ ///
+ /// tag
+ ///
+ public string TagNumber_Upper { get; set; } = "";
+ ///
+ /// system
+ ///
+ public string TagNumber_Lower { get; set; } = "";
+ ///
+ /// 图元文件Id
+ ///
+ public string FileId { get; set; }
+ ///
+ /// 基点在布置图上的句柄
+ ///
+ public string PixelOnDwg { get; set; }
+ private string _TagPixelOnDwg;
+ ///
+ /// 元件在布置图上的句柄
+ ///
+ ///
+ public string TagPixelOnDwg
+ {
+ get { return _TagPixelOnDwg; }
+ set { _TagPixelOnDwg = value; RaisePropertyChanged(nameof(TagPixelOnDwg)); }
+ }
+ ///
+ /// 肋位号 和 偏移量
+ ///
+ public double X { get; set; }
+ public string XOff { get; set; }
+ ///
+ /// 纵骨号 偏移量
+ ///
+ public string YOff { get; set; }
+
+ public string deck { get; set; }
+ public string area { get; set; }
+
+ public LayoutTagInfoBrief Tag { get; set; }
+ }
+}
diff --git a/newFront/c#前端/SWS.Electrical/Models/DtoDrawing.cs b/newFront/c#前端/SWS.Electrical/Models/DtoDrawing.cs
index e5ff319b..2f3e51ed 100644
--- a/newFront/c#前端/SWS.Electrical/Models/DtoDrawing.cs
+++ b/newFront/c#前端/SWS.Electrical/Models/DtoDrawing.cs
@@ -27,22 +27,26 @@ namespace SWS.Electrical.Models
/// 图纸文件名称
///
///
- [Description("图纸名称")]
+ [Description("图纸名称")]
public string DrawingFileName
{
get { return _DrawingFileName; }
set { _DrawingFileName = value; RaisePropertyChanged(nameof(DrawingFileName)); }
}
- private bool _isChecked=false;
+ private bool _IsSelected = false;
///
/// 是否选中
///
///
[Description("选中")]
- public bool isChecked
+ public bool IsSelected
{
- get { return _isChecked; }
- set { _isChecked = value; RaisePropertyChanged(nameof(isChecked)); }
+ get { return _IsSelected; }
+ set
+ {
+ _IsSelected = value;
+ RaisePropertyChanged(nameof(IsSelected));
+ }
}
}
}
diff --git a/newFront/c#前端/SWS.Electrical/SWS.Electrical.csproj b/newFront/c#前端/SWS.Electrical/SWS.Electrical.csproj
index 8ea93dbd..088f77c2 100644
--- a/newFront/c#前端/SWS.Electrical/SWS.Electrical.csproj
+++ b/newFront/c#前端/SWS.Electrical/SWS.Electrical.csproj
@@ -132,7 +132,9 @@
+
+
diff --git a/newFront/c#前端/SWS.Electrical/Start.cs b/newFront/c#前端/SWS.Electrical/Start.cs
index d657e6ba..dea6f84d 100644
--- a/newFront/c#前端/SWS.Electrical/Start.cs
+++ b/newFront/c#前端/SWS.Electrical/Start.cs
@@ -11,6 +11,14 @@ using Unity;
using Prism.Ioc;
using Prism.DryIoc;
using DryIoc;
+using System.Threading.Tasks;
+using IniParser;
+using System.Net.Http;
+using System;
+using System.Linq;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using SWS.Model;
namespace SWS.Electrical
{
public class Start
@@ -56,5 +64,59 @@ namespace SWS.Electrical
GlobalObject._prismContainer.RegisterDialog();
GlobalObject._prismContainer.RegisterDialog();
}
+
+ public static void AutoLogin()
+ {
+ Task.Run(async () =>
+ {
+ try
+ {
+ FileIniDataParser configIni = new FileIniDataParser();
+ var data = configIni.ReadFile(GlobalObject.configPath);
+ string token = data["LoginInfo"]["LoginToken"];
+ string loginkey = data["LoginInfo"]["LoginMark"];
+ string curProjId = data["LoginInfo"]["CurProjId"];
+ string address = data["Profile"]["strIPAddress"];
+ string port = data["Profile"]["nPort"];
+ string dbType = data["Profile"]["nConType"];
+ if (dbType == "1")
+ {
+ string strDomain = data["Profile"]["strDomainName"];
+ GlobalObject.client = new HttpClient()
+ {
+ BaseAddress = new Uri($"{strDomain}/api/"),
+ Timeout = TimeSpan.FromSeconds(120)
+ };
+ }
+ else if (dbType == "0")
+ {
+ GlobalObject.client = new HttpClient()
+ {
+ BaseAddress = new Uri($"http://{address}:{port}/api/"),
+ Timeout = TimeSpan.FromSeconds(120)
+ };
+ }
+ GlobalObject.client.DefaultRequestHeaders.Add("logintoken", token);
+ GlobalObject.client.DefaultRequestHeaders.Add("loginkey", loginkey);
+ var loginService = GlobalObject.container.Resolve();
+ var flag = await loginService.ValidateLogin(token, loginkey);
+ if (flag && GlobalObject.curProject == null)
+ {
+ //第一次要在后台初始化一些数据
+ var projectService = GlobalObject.container.Resolve();
+ 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"];
+ GlobalObj.treeDrawings = JsonConvert.DeserializeObject>(treeData.ToString());
+ }
+ }
+ catch
+ {
+
+ }
+ });
+ }
}
}
diff --git a/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs b/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs
index e4dd9059..1a86e4f3 100644
--- a/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs
+++ b/newFront/c#前端/SWS.Electrical/ViewModels/DialogAutoArrangeLayoutViewModel.cs
@@ -5,8 +5,14 @@ using System.IO;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
+using System.Windows.Controls;
using System.Windows.Forms;
using System.Windows.Input;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Media3D;
+using Bricscad.EditorInput;
+using Newtonsoft.Json;
using Prism.Services.Dialogs;
using SWS.CAD.Base;
using SWS.Commons;
@@ -15,6 +21,8 @@ using SWS.Model;
using SWS.Service;
using SWS.WPF.ViewModels;
using Teigha.DatabaseServices;
+using Teigha.Geometry;
+using Teigha.GraphicsSystem;
using Telerik.Windows.Controls;
using Unity;
using Visibility = System.Windows.Visibility;
@@ -39,6 +47,61 @@ namespace SWS.Electrical.ViewModels
}
}
}
+ private ObservableCollection _listBasePoint;
+ ///
+ /// 基点元件列表
+ ///
+ public ObservableCollection listBasePoint
+ {
+ get { return this._listBasePoint; }
+ set
+ {
+ if (value != this._listBasePoint)
+ {
+ this._listBasePoint = value;
+ RaisePropertyChanged(nameof(listBasePoint));
+ }
+ }
+ }
+ private DtoAutoPlotLayout _SelectedTag;
+ ///
+ /// 基点元件
+ ///
+ public DtoAutoPlotLayout SelectedTag
+ {
+ get { return this._SelectedTag; }
+ set
+ {
+ this._SelectedTag = value;
+ RaisePropertyChanged(nameof(SelectedTag));
+ }
+ }
+ private bool _IsSelectAll = false;
+ public bool IsSelectAll
+ {
+ get { return _IsSelectAll; }
+ set
+ {
+ _IsSelectAll = value;
+ RaisePropertyChanged(nameof(IsSelectAll));
+ }
+ }
+ private ObservableCollection _listMsg;
+ ///
+ /// 信息列表
+ ///
+ public ObservableCollection listMsg
+ {
+ get { return this._listMsg; }
+ set
+ {
+ if (value != this._listMsg)
+ {
+ this._listMsg = value;
+ RaisePropertyChanged(nameof(listMsg));
+ }
+ }
+ }
private ObservableCollection _listRange;
///
/// 范围
@@ -118,40 +181,51 @@ namespace SWS.Electrical.ViewModels
/// 命令事件
///
public ICommand Command_StartDrawing { get; set; }
+ public ICommand Command_GetBasePoint { get; set; }
+
+ public ICommand Command_SelectedTag { get; set; }
+
+ public ICommand Command_SelectedAll { get; set; }
PlotLayoutService _ServicePlotLayout;
DrawingServce _ServiceDrawing;
+ AnnexesService _ServiceAnnexes;
+ LibraryFileService _ServiceLibraryFile;
+ DrawingCatalogueService _ServiceDrawingCatalogue;
+ EnginedataService _ServiceEnginedata;
+ ObjectTypeService _ServiceObjectType;
+ ProjectSettingsService _ServiceProjectSettings;
+ List listTagNumberSucc = new List();
+ private bool isSearch = false;//是否正在查询
+ private bool isDrawing = false;//是否正在画图
+ private string dwgName = string.Empty;
+ private List listLibraryTagName = new List();//元件图纸上的位号属性名称,
public DialogAutoArrangeLayoutViewModel()
{
Command_StartDrawing = new DelegateCommand(onStartDrawing);
+ Command_GetBasePoint = new DelegateCommand(onGetBasePoint);
+ Command_SelectedTag = new DelegateCommand(onSelectedTag);
+ Command_SelectedAll = new DelegateCommand(onSelectedAll);
title = "布置图自动绘制";
_ServicePlotLayout = GlobalObject.container.Resolve();
_ServiceDrawing = GlobalObject.container.Resolve();
+ _ServiceAnnexes = GlobalObject.container.Resolve();
+ _ServiceLibraryFile = GlobalObject.container.Resolve();
+ _ServiceDrawingCatalogue = GlobalObject.container.Resolve();
+ _ServiceEnginedata = GlobalObject.container.Resolve();
+ _ServiceObjectType = GlobalObject.container.Resolve();
+ _ServiceProjectSettings = GlobalObject.container.Resolve();
listDrawings = new ObservableCollection();
- if (GlobalObj.treeDrawings.Any())
- {
- foreach (var model in GlobalObj.treeDrawings)
- {
- if (model.Text == "布置图")
- {
- foreach (var item in model.ChildNodes)
- {
- if (item.NodeType == "1")
- {
- listDrawings.Add(new DtoDrawing() { DrawingFileID = item.ID, DrawingFileName = item.Text });
- }
- }
- }
- }
- }
+ listBasePoint = new ObservableCollection();
+ listMsg = new ObservableCollection();
var list = new ObservableCollection();
list.Add(new KeyValueModel { Key = "甲板号", Value = "甲板号" });
list.Add(new KeyValueModel { Key = "区域", Value = "区域" });
- list.Add(new KeyValueModel { Key = "系统", Value = "系统" });
+ list.Add(new KeyValueModel { Key = "所属系统", Value = "所属系统" });
listRange = new ObservableCollection(list);
selectRange = listRange[0];
listOperator = new ObservableCollection()
- { new KeyValueModel { Key = "等于", Value = "等于" }
+ { new KeyValueModel { Key = "等于", Value = "=" }
};
selectOperator = listOperator[0];
}
@@ -170,14 +244,12 @@ namespace SWS.Electrical.ViewModels
}
- public void OnDialogOpened(IDialogParameters parameters)
+ public async void OnDialogOpened(IDialogParameters parameters)
{
- Task.Factory.StartNew(() =>
+ try
{
- int i = 0;
- while (!listDrawings.Any())
- {
- Thread.Sleep(100);
+ if (GlobalObj.treeDrawings.Any())
+ {
foreach (var model in GlobalObj.treeDrawings)
{
if (model.Text == "布置图")
@@ -187,28 +259,431 @@ namespace SWS.Electrical.ViewModels
if (item.NodeType == "1")
{
listDrawings.Add(new DtoDrawing() { DrawingFileID = item.ID, DrawingFileName = item.Text });
+ ec_drawing_file dwgFile = JsonConvert.DeserializeObject(model.NodeExtData.ToString());
+
}
}
}
}
- i++;
- if(i>500)
- { break; }
}
- });
+ if (!listDrawings.Any())
+ {
+ AddMsg($"布置图列表加载中...");
+ var listDwg = await _ServiceDrawing.GetDrawingCatalogue();
+ if (listDwg == null)
+ {
+ AddMsg($"布置图列表没有数据！");
+ return;
+ }
+ foreach (var model in listDwg)
+ {
+ if (model.Text == "布置图")
+ {
+ if (model.ChildNodes == null)
+ {
+ AddMsg($"布置图列表没有数据！");
+ continue;
+ }
+ foreach (var item in model.ChildNodes)
+ {
+ if (item.NodeType == "1")
+ {
+ listDrawings.Add(new DtoDrawing() { DrawingFileID = item.ID, DrawingFileName = item.Text });
+ ec_drawing_file dwgFile = JsonConvert.DeserializeObject(model.NodeExtData.ToString());
+
+ }
+ }
+ }
+ }
+ AddMsg($"布置图列表加载完成！");
+
+ }
+ var settingModel = await _ServiceProjectSettings.GetEntity("布置图图例显示位号名称");
+ if (settingModel == null)
+ {
+ listLibraryTagName.Add("位号");//默认
+ }
+ else { listLibraryTagName = settingModel.SettingValue.Split(',').ToList(); }
+
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("DialogOpened异常：" + ex.Message);
+ }
+ //selectRange = listRange[2];
+ //inputValue = "声力电话";
+ }
+
+ ///
+ /// 获取基点信息
+ ///
+ ///
+ public async void onGetBasePoint(object o)
+ {
+ if (isSearch)
+ {
+ MessageBox.Show("正在查询基点元件信息中...");
+ return;
+ }
+ var listSelDwg = listDrawings.Where(a => a.IsSelected == true).ToList();
+ if (!listSelDwg.Any())
+ {
+ AddMsg("请先选择布置图！");
+ MessageBox.Show("请先选择布置图！");
+ return;
+ }
+
+ try
+ {
+ isSearch = true;
+ AddMsg("开始查询布置图基点元件信息...");
+ List listDto = new List();
+ foreach (var dwg in listSelDwg)
+ {
+ var list = await _ServicePlotLayout.GetBasePointByDwg(selectRange.Value, selectOperator.Value, inputValue, dwg.DrawingFileID);
+ if (list == null)
+ { continue; }
+ foreach (var basePoint in list)
+ {
+ if (basePoint.Tags.Any())
+ {
+ foreach (var tag in basePoint.Tags)
+ {
+ 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(listDto);
+ IsSelectAll = listBasePoint.Any() ? true : false;
+ isSearch = false;
+ AddMsg("布置图基点元件信息查询完成！");
+ }
+ catch (Exception ex)
+ {
+ AddMsg("基点元件信息查询异常：" + ex.Message);
+ isSearch = false;
+ }
}
public async void onStartDrawing(object o)
{
- var listSelDwg = listDrawings.Where(a => a.isChecked == true).ToList();
- if (!listSelDwg.Any())
+ if (isDrawing)
{
- MessageBox.Show("请先选择布置图！");
+ MessageBox.Show("正在自动绘制元件中，请勿操作...");
+ return;
}
- foreach (var item in listSelDwg)
+
+ var msg = string.Empty;
+ var filePath = string.Empty;
+ var listDto = listBasePoint.Where(a => a.IsSelected == true).ToList();
+ if (!listDto.Any())
{
- var list = await _ServicePlotLayout.GetBasePointByDwg(selectRange.Value, selectOperator.Value, inputValue, item.DrawingFileID);
+ MessageBox.Show("请先勾选基点元件信息！");
+ return;
+ }
+ try
+ {
+ isDrawing = true;
+ listMsg.Clear();
+ foreach (var basePoint in listDto)
+ {
+ if (basePoint.AutoDrawing == "已绘制")
+ {
+ AddMsg($"当前基点[{basePoint.BasePointTagNumber}]和元件[{basePoint.TagNumber}]已绘制,跳至下一个元件");
+ continue;
+ }
+ if (basePoint.AutoDrawing == "已存在")
+ {
+ AddMsg($"当前基点[{basePoint.BasePointTagNumber}]和元件[{basePoint.TagNumber}]已存在,跳至下一个元件");
+ continue;
+ }
+
+ msg = await OpenDwg(basePoint.DrawingFileID);
+ if (!string.IsNullOrEmpty(msg))
+ {
+ AddMsg($"图纸打开失败：{msg}", false);
+ continue;
+ }
+
+ AddMsg($"打开图纸：{basePoint.DrawingFileName} ");
+ var listEntitys = General.GetAllEntity();//获取图纸所有实体
+ var entity = listEntitys.FirstOrDefault(a => a.Handle.ToString() == basePoint.PixelOnDwg);
+ if (entity == null)
+ {
+ AddMsg($"当前基点：{basePoint.BasePointTagNumber} 在图上找不到，不添加此元件，跳至下一个元件", false);
+ continue;
+ }
+
+ var tag = basePoint.Tag;
+ if (string.IsNullOrEmpty(tag.FileId))
+ {
+ AddMsg($"当前元件：{tag.TagNumber} 的元件ID为空，不添加此元件，跳至下一个", false);
+ continue;
+ }
+ var tagDto = listEntitys.FirstOrDefault(a => a.TagNumber == basePoint.TagNumber);
+ if (tagDto != null)
+ {
+ AddMsg($"当前元件：{basePoint.TagNumber} 在图上已存在，句柄:{tagDto.Handle}，不添加此元件，跳至下一个元件", false);
+ basePoint.AutoDrawing = "已存在";
+ basePoint.TagPixelOnDwg = tagDto.Handle;
+ continue;
+ }
+ var flag = basePoint.deck == tag.deck && basePoint.area == tag.area;
+ if (!flag)
+ {
+ AddMsg($"当前基点[{basePoint.BasePointTagNumber}]和元件[{tag.TagNumber}] 的deck和area不一致，不添加此元件，跳至下一个元件", false);
+ continue;
+ }
+ //下载元件图纸文件
+ filePath = Path.Combine(GlobalObject.GetCacheFolder(), $"{tag.TagNumber}.dwg");
+ var obj = await _ServiceLibraryFile.GetEntity(tag.FileId);
+ AddMsg($"元件图纸：{tag.TagNumber}， 开始下载...");
+ msg = await _ServiceAnnexes.DownloadFile(filePath, obj.FolderId);
+ if (!string.IsNullOrEmpty(msg))
+ {
+ AddMsg($"元件图纸下载失败，信息:" + msg, false);
+ continue;
+ }
+ AddMsg($"元件图纸：{tag.TagNumber}， 下载成功");
+ //filePath = "D:\\BricsCAD\\Temp\\测试11.dwg";
+ //把元件的位号属性改成要绘制的位号值
+ flag = General.UpdateCableNo(filePath, listLibraryTagName, tag.TagNumber, tag.IsNotDefaultSymbol, tag.TagNumber_Lower, tag.TagNumber_Upper);
+
+ //X轴：图上基点的坐标X +(接口数据元件的X + 接口数据元件的XOFF -接口数据基点的X-接口数据基点的Xoff）*比例系数
+ //Y轴：图上基点的坐标Y +(接口数据元件的Yoff-接口数据基点的Yoff）*比例系数
+ double scale = 1;//比例系数
+ double x = entity.X + (tag.X + double.Parse(tag.XOff) - basePoint.X - double.Parse(basePoint.XOff)) * scale;
+ double y = entity.Y + (double.Parse(tag.YOff) - double.Parse(basePoint.XOff)) * scale;
+ double z = entity.Z;
+ Point3d tagPoint = new Point3d(x, y, z);
+ AddMsg($"元件图纸：{tag.TagNumber}， 开始添加进布置图中...");
+ msg = await AddBlock(basePoint, obj.LibraryFileName, filePath, tagPoint);
+ if (string.IsNullOrEmpty(msg))
+ {
+ AddMsg($"布置图：{basePoint.DrawingFileName}，成功插入元件:" + tag.TagNumber);
+ basePoint.AutoDrawing = "已绘制";
+ General.SetDrawingReadOnly(dwgName, false);
+ }
+ else { AddMsg($"元件：{tag.TagNumber}，绘制异常：{msg}"); }
+
+ }
+ AddMsg("操作已完成！");
+ isDrawing = false;
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("绘图异常：" + ex.Message);
+ isDrawing = false;
+ }
+ }
+ ///
+ /// 打开图纸
+ ///
+ ///
+ private async Task OpenDwg(string dwgId)
+ {
+ try
+ {
+
+ string res = string.Empty;
+ string fullpath = string.Empty;
+ var dwgObj = await _ServiceDrawing.GetDrawingFile(dwgId);
+ var cate = await _ServiceDrawingCatalogue.GetEntity(dwgObj.DrawingCatalogueID);
+ if (cate.FullPath != cate.DrawingCatalogueID)
+ {
+ foreach (var id in cate.FullPath.Split(',').ToList())
+ {
+ cate = await _ServiceDrawingCatalogue.GetEntity(id);
+ fullpath += $"{cate.DrawingCatalogueName}\\";
+ }
+ }
+ else { fullpath = $"{cate.DrawingCatalogueName}\\"; }
+ fullpath += dwgObj.DrawingFileName;
+ fullpath = Path.Combine(GlobalObj.LocalWorkDir, GlobalObject.curProject.ProjectName, fullpath);
+ if (!File.Exists(fullpath))
+ {
+ return dwgObj.DrawingFileName + ",图纸文件不存在,请先检出到本地！";
+ }
+ var listName = General.GetAllOpenDrawingNames();
+ if (!listName.Contains(fullpath))
+ {
+ General.OpenDwg(fullpath);
+ dwgName = fullpath;
+ return res;
+ }
+ else
+ {
+ General.SwitchToDocument(fullpath);
+ dwgName = fullpath;
+ return res;
+ }
+
+ }
+ catch (Exception ex)
+ {
+ return ex.Message;
}
}
+ private async Task AddBlock(DtoAutoPlotLayout basePoint, string tagName, string blockDwg, Point3d tagPoint)
+ {
+ try
+ {
+ string dwgId = basePoint.DrawingFileID;
+ string enginedataId = basePoint.Tag.EngineDataID;
+ string blockDwgId = basePoint.Tag.FileId;
+ string tagNumber = basePoint.Tag.TagNumber;
+ double scale = basePoint.Scale;
+ string msg = string.Empty;
+ string tagNum = string.Empty;
+ var lsitEnginedata = await _ServiceObjectType.GetEngineDataListByTags(tagNumber);
+ if (!lsitEnginedata.Any())
+ {
+ msg = $"元件位号：{tagNumber},属性未绑定,ServiceEnginedata.GetTagPixelsById({enginedataId})接口无数据";
+ AddMsg(msg, false);
+ return msg;
+ }
+ string objTypeId = lsitEnginedata[0].ObjectTypeID;
+ string objTypeName = lsitEnginedata[0].ObjectTypeName;
+ var objId = General.AddTagDWG(blockDwg, tagName, tagNumber, objTypeId, scale, tagPoint);
+ #region 图纸上保存图元属性
+ if (!objId.IsNull)
+ {
+ AddMsg($"元件已添加至图纸，句柄:{objId.Handle.ToString()}");
+ AddMsg("开始关联元件属性至图纸...");
+ var dwgLibrary = await _ServiceLibraryFile.GetEntity(blockDwgId);
+ List listPro = new List();
+ var handlid = objId.Handle.ToString();//添加图元返回的句柄
+ ec_enginedata item = new ec_enginedata();
+ item.TagNumber = tagNumber;
+ item.ObjectTypeID = objTypeId;
+ item.Layout_Block_File = dwgLibrary;
+ //var result = await _ServiceObjectType.GetObjectTypePById(objTypeId);//添加属性
+ var res = await _ServiceObjectType.GetTagInfosByTags(tagNumber);
+ if (res.Any())
+ {
+ foreach (var dto in res[0].tags[0].EngineDataProperty)
+ {
+ listPro.Add(new ec_enginedata_property()
+ {
+ EngineDataPropertyID = dto.PropertyID,
+ PropertyName = dto.PropertyName,
+ PropertyNameEN = dto.PropertyNameEN,
+ PropertyValue = dto.PropertyValue,
+ MeasuringUnit = dto.MeasuringUnit,
+ PropertyGID = dto.PropertyGID,
+ PropertyGroupName = dto.PropertyGroupName
+ });
+ }
+ }
+ item.EngineDataProperty = listPro;
+ List listPixel = new List();
+ var pixelDto = new ec_enginedata_pixel()
+ {
+ TagNumber = tagNumber,
+ DrawingFileID = dwgId,
+ LibraryFileID = dwgLibrary.LibraryFileID,
+ PixelCode = handlid,
+ ObjectTypeID = objTypeId,
+ ObjectTypeName = objTypeName,
+ EngineDataProperty = listPro
+ };
+ listPixel.Add(pixelDto);
+ item.EngineDataPixel = listPixel;
+
+ msg = await _ServiceObjectType.UpdatePixelAndProp(item);
+ if (msg != string.Empty)
+ {
+ msg = "保存元件属性至图纸异常：" + msg;
+ AddMsg(msg, false);
+ return msg;
+ }
+ else
+ {
+ basePoint.TagPixelOnDwg = handlid;
+ AddMsg("添加元件属性至图纸成功！");
+ return "";
+ }
+ }
+ else
+ {
+ msg = $"元件：{blockDwg} ，添加失败";
+ AddMsg(msg, false);
+ return msg;
+ }
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ return ex.Message;
+ }
+ }
+ public void onSelectedTag(object o)
+ {
+ var dto = listBasePoint.Where(p => p.TagNumber == o.ToString()).FirstOrDefault();
+ if (dto != null)
+ {
+ if (!dto.IsSelected && IsSelectAll)
+ {
+ IsSelectAll = false;
+ }
+ else if (dto.IsSelected && !IsSelectAll)
+ {
+ foreach (var item in listBasePoint)
+ {
+ if (!item.IsSelected) return;
+ }
+ IsSelectAll = true;
+ }
+ }
+ }
+ public void onSelectedAll(object o)
+ {
+ foreach (var item in listBasePoint)
+ {
+ item.IsSelected = IsSelectAll;
+ }
+
+ }
+ ///
+ /// 添加提示信息
+ ///
+ /// 信息
+ /// 是否成功
+ private void AddMsg(string msg, bool isSucc = true)
+ {
+ try
+ {
+ TextBlock tb = new TextBlock();
+ tb.Text = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff") + "==>> " + msg;
+ tb.Foreground = isSucc ? Brushes.LightSeaGreen : Brushes.Red;
+ listMsg.Add(tb);
+ }
+ catch (Exception ex)
+ {
+ MessageBox.Show("添加提示信息异常：" + ex.Message);
+ }
+ }
}
}
diff --git a/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml b/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml
index b1c88d82..31ec28f3 100644
--- a/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml
+++ b/newFront/c#前端/SWS.Electrical/Views/DialogAutoArrangeLayout.xaml
@@ -2,15 +2,16 @@
x:Class="SWS.Electrical.Views.DialogAutoArrangeLayout"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+ xmlns:Custom="http://www.galasoft.ch/mvvmlight"
xmlns:CustomControl="clr-namespace:SWS.CustomControl;assembly=SWS.CustomControl"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
- xmlns:local="clr-namespace:SWS.Electrical.Views"
+ xmlns:local="clr-namespace:SWS.Electrical"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:prism="http://prismlibrary.com/"
xmlns:telerik="http://schemas.telerik.com/2008/xaml/presentation"
- Width="500"
- Height="400"
+ Width="750"
+ Height="590"
mc:Ignorable="d">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
+
+
-
-
-
+
+
-
+
-
-
+ IsReadOnly="True" />
+
+
-
-
+
-
-
-
-
-
-
-
-
+
+
+
+ FontSize="16" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.dll
deleted file mode 100644
index e4fe7d21..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.pdb
deleted file mode 100644
index 7fa23c9e..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CAD.Base.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.dll
deleted file mode 100644
index d3f37f5f..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.pdb
deleted file mode 100644
index e80075fb..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Commons.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.dll
deleted file mode 100644
index 454036d0..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.pdb
deleted file mode 100644
index db8a63bd..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.CustomControl.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.dll
deleted file mode 100644
index 60f0f307..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.pdb
deleted file mode 100644
index 27cc2505..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Electrical.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.dll
deleted file mode 100644
index 7b10fd8d..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.pdb
deleted file mode 100644
index fa62c7c9..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Event.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.dll
deleted file mode 100644
index bbf04484..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.pdb
deleted file mode 100644
index e43f4f87..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.Service.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.dll b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.dll
deleted file mode 100644
index 95282e47..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.pdb b/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.pdb
deleted file mode 100644
index 14bcca61..00000000
Binary files a/newFront/c#前端/SWS.Electrical/bin/Debug/SWS.WPF.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.AssemblyReference.cache
deleted file mode 100644
index 9012262f..00000000
Binary files a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 7aab94d3..00000000
--- a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-a93d55162b9420538a56046e77124467f8d3b718fabad9d452b94b73f1de117c
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.FileListAbsolute.txt
deleted file mode 100644
index aabf67cf..00000000
--- a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,120 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\log4net.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Electrical.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Electrical.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Electrical.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\BrxMgd.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\DryIoc.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\INIFileParser.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Microsoft.Xaml.Behaviors.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.DryIoc.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.Unity.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.CAD.Base.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Commons.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.CustomControl.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Service.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.WPF.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\System.Threading.Tasks.Extensions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\System.ValueTuple.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Mgd.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.Data.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.FileDialogs.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.GridView.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.Input.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.Navigation.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Data.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Unity.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Unity.Container.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\log4net.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\EasyEncryption.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Event.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.CAD.Base.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.CAD.Base.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Commons.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Commons.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.CustomControl.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Model.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Service.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Service.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.WPF.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.WPF.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\DryIoc.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\INIFileParser.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Microsoft.Xaml.Behaviors.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Microsoft.Xaml.Behaviors.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.DryIoc.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.DryIoc.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.Unity.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.Unity.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Prism.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\System.Threading.Tasks.Extensions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\System.ValueTuple.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.Data.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.FileDialogs.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.GridView.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.Input.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Controls.Navigation.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Telerik.Windows.Data.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Unity.Abstractions.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\Unity.Container.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\log4net.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\log4net.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SWS.Event.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\de\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\es\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\fr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\it\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\nl\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\tr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Alloc_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Db_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_DbRoot_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Gi_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Ge_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Gs_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Root_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_DynBlocks_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_SpatialIndex_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_DbEntities_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_DbCore_21.4_15.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_DbIO_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\DbConstraints_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Sm_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\TD_Ave_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\SCENEOE_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\ACCAMERA_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\ISM_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\WipeOut_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\AcMPolygonObj15_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\ATEXT_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\RText_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\bin\Debug\RecomputeDimBlock_21.4_15.tx
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Electrical.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\Views\SWSDialogWindow.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\Views\DialogAutoArrangeLayout.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\Views\DialogTest2.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\Views\SWSDialogWindow.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Electrical_MarkupCompile.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Electrical_MarkupCompile.lref
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\Views\DialogAutoArrangeLayout.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\Views\DialogTest2.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Electrical.g.resources
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Electrical.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Elec.DB6BCB21.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Electrical.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\SWS.Electrical.pdb
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.dll b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.dll
deleted file mode 100644
index 60f0f307..00000000
Binary files a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.g.resources b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.g.resources
deleted file mode 100644
index 3466fb83..00000000
Binary files a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.g.resources and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.pdb b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.pdb
deleted file mode 100644
index 27cc2505..00000000
Binary files a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.cache b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.cache
deleted file mode 100644
index df6ab3c2..00000000
--- a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.cache
+++ /dev/null
@@ -1,20 +0,0 @@
-SWS.Electrical
-
-
-library
-C#
-.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\obj\Debug\
-SWS.Electrical
-none
-false
-DEBUG;TRACE
-
-3238828970
-
-101359012623
-47-1546929915
-Views\DialogAutoArrangeLayout.xaml;Views\DialogTest2.xaml;Views\SWSDialogWindow.xaml;
-
-False
-
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.lref b/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.lref
deleted file mode 100644
index 739a3d27..00000000
--- a/newFront/c#前端/SWS.Electrical/obj/Debug/SWS.Electrical_MarkupCompile.lref
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\Views\DialogAutoArrangeLayout.xaml;;
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Electrical\Views\DialogTest2.xaml;;
-
diff --git a/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.baml b/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.baml
index 65a2e53d..69be5051 100644
Binary files a/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.baml and b/newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogAutoArrangeLayout.baml differ
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 2c5640c1..48c6c684 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}" "7F38C9A2389C976AE983ACB22E5576B9CD55BCF4552B5A04C39704286EDC915E"
+#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8006F31A06196293D0E58F4239B97FC4F768BCF414C1B4C2472A1C22D26CF0B1"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -23,7 +23,7 @@ using Prism.Regions.Behaviors;
using Prism.Services.Dialogs;
using Prism.Unity;
using SWS.CustomControl;
-using SWS.Electrical.Views;
+using SWS.Electrical;
using System;
using System.Diagnostics;
using System.Windows;
@@ -77,13 +77,21 @@ namespace SWS.Electrical.Views {
public partial class DialogAutoArrangeLayout : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 36 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+ #line 119 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
#line default
#line hidden
+
+ #line 211 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.DataGrid dgTag;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
///
@@ -117,6 +125,9 @@ namespace SWS.Electrical.Views {
case 1:
this.titleBar = ((SWS.CustomControl.customWindowTitleBar)(target));
return;
+ case 2:
+ this.dgTag = ((System.Windows.Controls.DataGrid)(target));
+ return;
}
this._contentLoaded = true;
}
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 2c5640c1..48c6c684 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}" "7F38C9A2389C976AE983ACB22E5576B9CD55BCF4552B5A04C39704286EDC915E"
+#pragma checksum "..\..\..\Views\DialogAutoArrangeLayout.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "8006F31A06196293D0E58F4239B97FC4F768BCF414C1B4C2472A1C22D26CF0B1"
//------------------------------------------------------------------------------
//
// 此代码由工具生成。
@@ -23,7 +23,7 @@ using Prism.Regions.Behaviors;
using Prism.Services.Dialogs;
using Prism.Unity;
using SWS.CustomControl;
-using SWS.Electrical.Views;
+using SWS.Electrical;
using System;
using System.Diagnostics;
using System.Windows;
@@ -77,13 +77,21 @@ namespace SWS.Electrical.Views {
public partial class DialogAutoArrangeLayout : System.Windows.Controls.UserControl, System.Windows.Markup.IComponentConnector {
- #line 36 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+ #line 119 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
[System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
internal SWS.CustomControl.customWindowTitleBar titleBar;
#line default
#line hidden
+
+ #line 211 "..\..\..\Views\DialogAutoArrangeLayout.xaml"
+ [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+ internal System.Windows.Controls.DataGrid dgTag;
+
+ #line default
+ #line hidden
+
private bool _contentLoaded;
///
@@ -117,6 +125,9 @@ namespace SWS.Electrical.Views {
case 1:
this.titleBar = ((SWS.CustomControl.customWindowTitleBar)(target));
return;
+ case 2:
+ this.dgTag = ((System.Windows.Controls.DataGrid)(target));
+ return;
}
this._contentLoaded = true;
}
diff --git a/newFront/c#前端/SWS.Event/.vs/SWS.Event.csproj.dtbcache.json b/newFront/c#前端/SWS.Event/.vs/SWS.Event.csproj.dtbcache.json
deleted file mode 100644
index 3fc1c750..00000000
--- a/newFront/c#前端/SWS.Event/.vs/SWS.Event.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.Event","ProjectFileName":"SWS.Event.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"loginEvent.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Core.8.1.97\\lib\\net47\\Prism.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.Event\\bin\\Debug\\SWS.Event.dll","OutputItemRelativePath":"SWS.Event.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.dll b/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.dll
deleted file mode 100644
index 7b10fd8d..00000000
Binary files a/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.pdb b/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.pdb
deleted file mode 100644
index fa62c7c9..00000000
Binary files a/newFront/c#前端/SWS.Event/bin/Debug/SWS.Event.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.AssemblyReference.cache
deleted file mode 100644
index 037f38b0..00000000
Binary files a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 03ec5e91..00000000
--- a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-5c5f19b86aeded955097c9f5d0484552d8caf5270e80f9e2f7cd82b121dd6ccb
diff --git a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.FileListAbsolute.txt
deleted file mode 100644
index 8b19a2df..00000000
--- a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\bin\Debug\SWS.Event.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\bin\Debug\SWS.Event.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\bin\Debug\Prism.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\bin\Debug\Prism.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\bin\Debug\Prism.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\obj\Debug\SWS.Event.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\obj\Debug\SWS.Event.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\obj\Debug\SWS.Event.csproj.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\obj\Debug\SWS.Event.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Event\obj\Debug\SWS.Event.pdb
diff --git a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.dll b/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.dll
deleted file mode 100644
index 7b10fd8d..00000000
Binary files a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.pdb b/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.pdb
deleted file mode 100644
index fa62c7c9..00000000
Binary files a/newFront/c#前端/SWS.Event/obj/Debug/SWS.Event.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Model/.vs/SWS.Model.csproj.dtbcache.json b/newFront/c#前端/SWS.Model/.vs/SWS.Model.csproj.dtbcache.json
deleted file mode 100644
index c65b9dc4..00000000
--- a/newFront/c#前端/SWS.Model/.vs/SWS.Model.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.Model","ProjectFileName":"SWS.Model.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"annexesfile.cs"},{"SourceFile":"ec_dataitem.cs"},{"SourceFile":"ec_dataitemdetail.cs"},{"SourceFile":"ec_drawing_catalogue.cs"},{"SourceFile":"ec_drawing_file.cs"},{"SourceFile":"ec_drawing_publish.cs"},{"SourceFile":"ec_drawing_syn.cs"},{"SourceFile":"ec_enginedata.cs"},{"SourceFile":"ec_enginedata_pixel.cs"},{"SourceFile":"ec_enginedata_property.cs"},{"SourceFile":"ec_enginedata_propertyhis.cs"},{"SourceFile":"ec_library_file.cs"},{"SourceFile":"ec_measuring_unit.cs"},{"SourceFile":"ec_notification.cs"},{"SourceFile":"ec_objecttype.cs"},{"SourceFile":"ec_objectTypeP.cs"},{"SourceFile":"ec_operate_log.cs"},{"SourceFile":"ec_parallel_Cable.cs"},{"SourceFile":"ec_project.cs"},{"SourceFile":"ec_property.cs"},{"SourceFile":"ec_template_file.cs"},{"SourceFile":"ec_Wire_Group.cs"},{"SourceFile":"ec_wire_group_log.cs"},{"SourceFile":"ec_wire_group_notice.cs"},{"SourceFile":"ec_wire_group_propertyhis.cs"},{"SourceFile":"KeyValueModel.cs"},{"SourceFile":"LayoutTagInfoBrief.cs"},{"SourceFile":"NoEntity\\CheckInLogNeedApproveModel.cs"},{"SourceFile":"NoEntity\\CheckInModel.cs"},{"SourceFile":"NoEntity\\ConfigIni.cs"},{"SourceFile":"NoEntity\\DrawingOpened.cs"},{"SourceFile":"NoEntity\\GroupAttribute.cs"},{"SourceFile":"NoEntity\\learunHttpRes.cs"},{"SourceFile":"NoEntity\\loginCheckRes.cs"},{"SourceFile":"NoEntity\\loginRes.cs"},{"SourceFile":"NoEntity\\PageModel.cs"},{"SourceFile":"NoEntity\\propertyModel.cs"},{"SourceFile":"NoEntity\\PropertyObjectModel.cs"},{"SourceFile":"NoEntity\\PROPERTYType.cs"},{"SourceFile":"Signal\\SignalManagementInfo.cs"},{"SourceFile":"Signal\\SignalNotice.cs"},{"SourceFile":"NoEntity\\TreeModel.cs"},{"SourceFile":"NoEntity\\Unit.cs"},{"SourceFile":"NoEntity\\WireGroups.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"user.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Bcl.AsyncInterfaces.8.0.0\\lib\\net462\\Microsoft.Bcl.AsyncInterfaces.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Extensions.DependencyInjection.Abstractions.8.0.1\\lib\\net462\\Microsoft.Extensions.DependencyInjection.Abstractions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Microsoft.Xaml.Behaviors.Wpf.1.1.122\\lib\\net462\\Microsoft.Xaml.Behaviors.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationCore.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\PresentationFramework.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Core.8.1.97\\lib\\net47\\Prism.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Prism.Wpf.8.1.97\\lib\\net47\\Prism.Wpf.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Configuration.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Drawing.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Net.Http.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Runtime.CompilerServices.Unsafe.4.5.3\\lib\\net461\\System.Runtime.CompilerServices.Unsafe.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\System.Threading.Tasks.Extensions.4.5.4\\lib\\net461\\System.Threading.Tasks.Extensions.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.CAD\\RefDLL\\WPF45\\Telerik.Windows.Controls.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\WindowsBase.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll","OutputItemRelativePath":"SWS.Model.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.Model/LayoutTagInfoBrief.cs b/newFront/c#前端/SWS.Model/LayoutTagInfoBrief.cs
index fd5a2d62..233367e1 100644
--- a/newFront/c#前端/SWS.Model/LayoutTagInfoBrief.cs
+++ b/newFront/c#前端/SWS.Model/LayoutTagInfoBrief.cs
@@ -19,7 +19,16 @@ namespace SWS.Model
///
/// 位号
///
- public string TagNumber { get; set; } = "";
+ public string TagNumber { get; set; } = "";
+ ///
+ /// tag
+ ///
+ public string TagNumber_Upper { get; set; } = "";
+ ///
+ /// system
+ ///
+ public string TagNumber_Lower { get; set; } = "";
+
///
/// 图元文件Id
///
@@ -29,6 +38,14 @@ namespace SWS.Model
///
public string PixelOnDwg { get; set; }
///
+ /// 比例
+ ///
+ public double Scale { get; set; }
+ ///
+ /// true:默认块，false：异性块
+ ///
+ public bool IsNotDefaultSymbol { get; set; }
+ ///
/// 肋位号 和 偏移量
///
public double X { get; set; }
diff --git a/newFront/c#前端/SWS.Model/SWS.Model.csproj b/newFront/c#前端/SWS.Model/SWS.Model.csproj
index 83481288..53b64786 100644
--- a/newFront/c#前端/SWS.Model/SWS.Model.csproj
+++ b/newFront/c#前端/SWS.Model/SWS.Model.csproj
@@ -95,6 +95,7 @@
+
diff --git a/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.dll b/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.Model/bin/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Model/ec_projectSettings.cs b/newFront/c#前端/SWS.Model/ec_projectSettings.cs
new file mode 100644
index 00000000..7b60571e
--- /dev/null
+++ b/newFront/c#前端/SWS.Model/ec_projectSettings.cs
@@ -0,0 +1,30 @@
+namespace SWS.Model
+{
+ public class ec_projectSettings
+ {
+ #region 实体成员
+ ///
+ /// ID
+ ///
+ public string SettingID { get; set; }
+ ///
+ /// 描述
+ ///
+ public string Description { get; set; } = "";
+ ///
+ /// 选项名字
+ ///
+ public string SettingName { get; set; } = "";
+ ///
+ /// 选项值
+ ///
+ public string SettingValue { get; set; } = "";
+ ///
+ /// 选项组
+ ///
+ public string SettingGroup { get; set; } = "";
+
+ #endregion
+
+ }
+}
diff --git a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.AssemblyReference.cache
deleted file mode 100644
index cf2c10b0..00000000
Binary files a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.CoreCompileInputs.cache
deleted file mode 100644
index e4878659..00000000
--- a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-f6461b58ccd0b7437847560604f1b095a61838c2461076aa46ec51c5106c2fb8
diff --git a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.FileListAbsolute.txt
deleted file mode 100644
index 3bdf987a..00000000
--- a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\SWS.Model.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Microsoft.Xaml.Behaviors.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Prism.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Prism.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\System.Threading.Tasks.Extensions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Telerik.Windows.Controls.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Microsoft.Xaml.Behaviors.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Microsoft.Xaml.Behaviors.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Prism.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Prism.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Prism.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Prism.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\System.Threading.Tasks.Extensions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\Telerik.Windows.Controls.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\de\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\es\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\fr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\it\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\nl\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\bin\Debug\tr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\obj\Debug\SWS.Model.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\obj\Debug\SWS.Model.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\obj\Debug\SWS.Model.csproj.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\obj\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Model\obj\Debug\SWS.Model.pdb
diff --git a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.dll b/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.Model/obj/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/.vs/SWS.Service.csproj.dtbcache.json b/newFront/c#前端/SWS.Service/.vs/SWS.Service.csproj.dtbcache.json
deleted file mode 100644
index 88d6de67..00000000
--- a/newFront/c#前端/SWS.Service/.vs/SWS.Service.csproj.dtbcache.json
+++ /dev/null
@@ -1 +0,0 @@
-{"RootPath":"E:\\Di-Electrical\\c#前端\\SWS.Service","ProjectFileName":"SWS.Service.csproj","Configuration":"Debug|AnyCPU","FrameworkPath":"","Sources":[{"SourceFile":"AnnexesService.cs"},{"SourceFile":"ConfigService.cs"},{"SourceFile":"DataItemService.cs"},{"SourceFile":"DrawingCatalogueService.cs"},{"SourceFile":"DrawingServce.cs"},{"SourceFile":"EnginedataService.cs"},{"SourceFile":"HttpService.cs"},{"SourceFile":"LoginService.cs"},{"SourceFile":"NotificationService.cs"},{"SourceFile":"ObjectTypeService.cs"},{"SourceFile":"LibraryFileService.cs"},{"SourceFile":"PlotLayoutService.cs"},{"SourceFile":"ProjectService.cs"},{"SourceFile":"Properties\\AssemblyInfo.cs"},{"SourceFile":"TemplateFileService.cs"},{"SourceFile":"UserService.cs"},{"SourceFile":"WireGroupService.cs"},{"SourceFile":"obj\\Debug\\.NETFramework,Version=v4.8.AssemblyAttributes.cs"}],"References":[{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\EasyEncryption.1.0.2\\lib\\EasyEncryption.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\ini-parser.2.5.2\\lib\\net20\\INIFileParser.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\Microsoft.CSharp.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\mscorlib.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\packages\\Newtonsoft.Json.13.0.3\\lib\\net45\\Newtonsoft.Json.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Commons\\bin\\Debug\\SWS.Commons.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Commons\\bin\\Debug\\SWS.Commons.dll"},{"Reference":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":true,"ProjectPath":"E:\\Di-Electrical\\c#前端\\SWS.Model\\bin\\Debug\\SWS.Model.dll"},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Core.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Data.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\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.8\\System.Xml.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""},{"Reference":"C:\\Program Files (x86)\\Reference Assemblies\\Microsoft\\Framework\\.NETFramework\\v4.8\\System.Xml.Linq.dll","ResolvedFrom":"","OriginalItemSpec":"","Name":"","EmbedInteropTypes":false,"CopyLocal":false,"IsProjectReference":false,"ProjectPath":""}],"Analyzers":[],"Outputs":[{"OutputItemFullPath":"E:\\Di-Electrical\\c#前端\\SWS.Service\\bin\\Debug\\SWS.Service.dll","OutputItemRelativePath":"SWS.Service.dll"},{"OutputItemFullPath":"","OutputItemRelativePath":""}],"CopyToOutputEntries":[]}
\ No newline at end of file
diff --git a/newFront/c#前端/SWS.Service/ObjectTypeService.cs b/newFront/c#前端/SWS.Service/ObjectTypeService.cs
index b6a45423..fb18cfbe 100644
--- a/newFront/c#前端/SWS.Service/ObjectTypeService.cs
+++ b/newFront/c#前端/SWS.Service/ObjectTypeService.cs
@@ -205,5 +205,22 @@ namespace SWS.Service
return null;
}
}
+ ///
+ /// 获取位号的工程属性（根据一堆位号）
+ ///
+ /// 位号集合（用,连接）
+ public async Task> GetEngineDataListByTags(string tagNumber)
+ {
+
+ var res = await this.GetAsync>($"ObjectTypeApi/GetEngineDataListByTags?projectId={GlobalObject.curProject.ProjectId}&tagNumber={tagNumber}");
+ if (res.code == 200)
+ {
+ return res.data;
+ }
+ else
+ {
+ return null;
+ }
+ }
}
}
diff --git a/newFront/c#前端/SWS.Service/ProjectSettingsService.cs b/newFront/c#前端/SWS.Service/ProjectSettingsService.cs
new file mode 100644
index 00000000..66675d83
--- /dev/null
+++ b/newFront/c#前端/SWS.Service/ProjectSettingsService.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Newtonsoft.Json.Linq;
+using SWS.Commons;
+using SWS.Model;
+
+namespace SWS.Service
+{
+ public class ProjectSettingsService : HttpService
+ {
+ public ProjectSettingsService() : base()
+ {
+
+ }
+
+ public async Task> GetList()
+ {
+
+ var res = await this.GetAsync>($"SettingsApi/GetList?projId={GlobalObject.curProject.ProjectId}");
+ if (res.code == 200)
+ {
+ return res.data;
+ }
+ else
+ {
+ }
+ return null;
+ }
+ public async Task GetEntity(string settingName)
+ {
+
+ var res = await this.GetAsync($"SettingsApi/GetEntity?settingName={settingName}&projId={GlobalObject.curProject.ProjectId}");
+ if (res.code == 200)
+ {
+ return res.data;
+ }
+ else
+ {
+ }
+ return null;
+ }
+ }
+}
diff --git a/newFront/c#前端/SWS.Service/SWS.Service.csproj b/newFront/c#前端/SWS.Service/SWS.Service.csproj
index d5b46b1b..dffb021a 100644
--- a/newFront/c#前端/SWS.Service/SWS.Service.csproj
+++ b/newFront/c#前端/SWS.Service/SWS.Service.csproj
@@ -65,6 +65,7 @@
+
diff --git a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.dll b/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.dll
deleted file mode 100644
index d3f37f5f..00000000
Binary files a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.pdb b/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.pdb
deleted file mode 100644
index e80075fb..00000000
Binary files a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Commons.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.dll b/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.dll b/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.dll
deleted file mode 100644
index bbf04484..00000000
Binary files a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.pdb b/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.pdb
deleted file mode 100644
index e43f4f87..00000000
Binary files a/newFront/c#前端/SWS.Service/bin/Debug/SWS.Service.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.AssemblyReference.cache
deleted file mode 100644
index 35a9dfea..00000000
Binary files a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.CoreCompileInputs.cache
deleted file mode 100644
index 225e41b3..00000000
--- a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-a6306199b3ceb562c804862fec204993e88913b3bd3a927c3632ade230ce60a3
diff --git a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.FileListAbsolute.txt
deleted file mode 100644
index 2be0759f..00000000
--- a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\log4net.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Service.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Service.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Service.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\EasyEncryption.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\INIFileParser.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Commons.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\Unity.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\log4net.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\Telerik.Windows.Controls.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\System.Threading.Tasks.Extensions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Commons.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Commons.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\SWS.Model.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\INIFileParser.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\Unity.Abstractions.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\log4net.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\log4net.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\Telerik.Windows.Controls.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\System.Threading.Tasks.Extensions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\de\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\es\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\fr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\it\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\nl\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\bin\Debug\tr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\obj\Debug\SWS.Service.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\obj\Debug\SWS.Service.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\obj\Debug\SWS.Serv.3982FEB7.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\obj\Debug\SWS.Service.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.Service\obj\Debug\SWS.Service.pdb
diff --git a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.dll b/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.dll
deleted file mode 100644
index bbf04484..00000000
Binary files a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.pdb b/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.pdb
deleted file mode 100644
index e43f4f87..00000000
Binary files a/newFront/c#前端/SWS.Service/obj/Debug/SWS.Service.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.dll b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.dll
deleted file mode 100644
index d3f37f5f..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.pdb b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.pdb
deleted file mode 100644
index e80075fb..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Commons.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.dll b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.dll
deleted file mode 100644
index 454036d0..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.pdb b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.pdb
deleted file mode 100644
index db8a63bd..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.CustomControl.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.dll b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.dll
deleted file mode 100644
index 7b10fd8d..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.pdb b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.pdb
deleted file mode 100644
index fa62c7c9..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Event.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.dll b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.dll
deleted file mode 100644
index 05992cd9..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.pdb b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.pdb
deleted file mode 100644
index 9203125b..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Model.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.dll b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.dll
deleted file mode 100644
index bbf04484..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.pdb b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.pdb
deleted file mode 100644
index e43f4f87..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.Service.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.dll b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.dll
deleted file mode 100644
index 95282e47..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.pdb b/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.pdb
deleted file mode 100644
index 14bcca61..00000000
Binary files a/newFront/c#前端/SWS.WPF/bin/Debug/SWS.WPF.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.AssemblyReference.cache b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.AssemblyReference.cache
deleted file mode 100644
index f14ae4a4..00000000
Binary files a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.AssemblyReference.cache and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.CoreCompileInputs.cache b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.CoreCompileInputs.cache
deleted file mode 100644
index eb50ebef..00000000
--- a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.CoreCompileInputs.cache
+++ /dev/null
@@ -1 +0,0 @@
-66a32a0f159882573f0b618f3afcd0f4b7e29542610556a0dc7df40311f0e92e
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.FileListAbsolute.txt b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.FileListAbsolute.txt
deleted file mode 100644
index 5a742ce6..00000000
--- a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.csproj.FileListAbsolute.txt
+++ /dev/null
@@ -1,100 +0,0 @@
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\log4net.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.WPF.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.WPF.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.WPF.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\DryIoc.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Microsoft.Bcl.AsyncInterfaces.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Microsoft.Xaml.Behaviors.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Newtonsoft.Json.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.DryIoc.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.Unity.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.Wpf.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Commons.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.CustomControl.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Event.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Model.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Service.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\System.Runtime.CompilerServices.Unsafe.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\System.Threading.Tasks.Extensions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\System.ValueTuple.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.Data.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.FileDialogs.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.GridView.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.Input.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.Navigation.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Data.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Unity.Abstractions.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Unity.Container.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\INIFileParser.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\log4net.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\EasyEncryption.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Commons.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Commons.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.CustomControl.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Event.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Model.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Service.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\SWS.Service.dll.config
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\DryIoc.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Microsoft.Bcl.AsyncInterfaces.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Microsoft.Xaml.Behaviors.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Microsoft.Xaml.Behaviors.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Newtonsoft.Json.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.DryIoc.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.DryIoc.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.Unity.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.Unity.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.Wpf.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Prism.Wpf.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\System.Runtime.CompilerServices.Unsafe.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\System.Threading.Tasks.Extensions.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\System.ValueTuple.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.Data.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.FileDialogs.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.GridView.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.Input.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Controls.Navigation.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Telerik.Windows.Data.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Unity.Abstractions.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\Unity.Container.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\INIFileParser.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\log4net.pdb
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\log4net.xml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\de\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\es\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\fr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\it\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\nl\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\bin\Debug\tr\Telerik.Windows.Controls.resources.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF.csproj.AssemblyReference.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Style\CustomStyles.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\CustomDialogWindow.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\Project.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\CustomDialogWindow.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogInput.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalNotice.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalSelect.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalManagement.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogTest.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\Project.g.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF_MarkupCompile.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF_MarkupCompile.lref
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogInput.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalNotice.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalSelect.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogSignalManagements\DialogSignalManagement.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\Views\DialogTest.baml
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF.g.resources
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF.csproj.CoreCompileInputs.cache
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF.csproj.Up2Date
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF.dll
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\SWS.WPF.pdb
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.dll b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.dll
deleted file mode 100644
index 95282e47..00000000
Binary files a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.dll and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.pdb b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.pdb
deleted file mode 100644
index 14bcca61..00000000
Binary files a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF.pdb and /dev/null differ
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.cache b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.cache
deleted file mode 100644
index 1d589880..00000000
--- a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.cache
+++ /dev/null
@@ -1,20 +0,0 @@
-SWS.WPF
-
-
-library
-C#
-.cs
-E:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\obj\Debug\
-SWS.WPF
-none
-false
-DEBUG;TRACE
-
-9-1575243948
-
-17-2025202104
-451256151327
-Style\CustomStyles.xaml;Views\CustomDialogWindow.xaml;Views\DialogInput.xaml;Views\DialogSignalManagements\DialogSignalNotice.xaml;Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.xaml;Views\DialogSignalManagements\DialogSignalSelect.xaml;Views\DialogSignalManagements\DialogSignalManagement.xaml;Views\DialogTest.xaml;Views\Project.xaml;
-
-False
-
diff --git a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.lref b/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.lref
deleted file mode 100644
index 5d3e4e50..00000000
--- a/newFront/c#前端/SWS.WPF/obj/Debug/SWS.WPF_MarkupCompile.lref
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\Views\DialogInput.xaml;;
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\Views\DialogSignalManagements\DialogSignalNotice.xaml;;
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\Views\DialogSignalManagements\DialogSignalPropertyhisAndLogs.xaml;;
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\Views\DialogSignalManagements\DialogSignalSelect.xaml;;
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\Views\DialogSignalManagements\DialogSignalManagement.xaml;;
-FE:\Di-Elec\009_DI-Elec\newFront\c#前端\SWS.WPF\Views\DialogTest.xaml;;
-