yuxingheng/009_DI-Elec
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: yuxingheng:f3f29f56d188248865bdb0863185651dc152ca54
Branches Tags
yuxingheng:main
yuxingheng:自动分配信号
...
compare: yuxingheng:d3813c8d567fbe7d69ff0cf68bbdf09e3afc67e6
Branches Tags
yuxingheng:main
yuxingheng:自动分配信号

2 Commits
f3f29f56d1 ... d3813c8d56

Author SHA1 Message Date
CHEN-ZW\acer
d3813c8d56 Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec 
# Conflicts:
#	newFront/c#前端/SWS.CAD/Start.cs
 2025-10-21 13:57:39 +08:00
CHEN-ZW\acer
b31eb505e4 1 2025-10-21 13:53:04 +08:00
4 changed files with 82 additions and 26 deletions
Show Stats Expand all files Collapse all files

2
newFront/c#前端/SWS.CAD.Base/SWS.CAD.Base.csproj
View File

@ -21,7 +21,7 @@
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>AnyCPU</PlatformTarget>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType> <DebugType>pdbonly</DebugType>

100
newFront/c#前端/SWS.CAD/Start.cs
View File

@ -1,4 +1,8 @@
using Prism.DryIoc; using System.Linq;
using System.Reflection;
using System;
using System.Windows;
using Prism.DryIoc;
using Prism.Events; using Prism.Events;
using Prism.Ioc; using Prism.Ioc;
using Prism.Services.Dialogs; using Prism.Services.Dialogs;
@ -9,6 +13,7 @@ using SWS.Commons;
using SWS.Service; using SWS.Service;
using SWS.WPF.ViewModels; using SWS.WPF.ViewModels;
using SWS.WPF.Views; using SWS.WPF.Views;
using Telerik.Windows.Controls;
using Unity; using Unity;
namespace SWS.CAD namespace SWS.CAD
{ {
@ -17,31 +22,80 @@ namespace SWS.CAD
public static void RegisterTypes() public static void RegisterTypes()
{ {
GlobalObject.container = new UnityContainer(); try
GlobalObject.container.RegisterSingleton<IEventAggregator, EventAggregator>(); {
GlobalObject.container = new UnityContainer();
// 启用诊断
GlobalObject.container.AddExtension(new Diagnostic());
GlobalObject.container.RegisterSingleton<IEventAggregator, EventAggregator>();
GlobalObject.container.RegisterSingleton<HttpService>(); GlobalObject.container.RegisterSingleton<HttpService>();
GlobalObject.container.RegisterSingleton<ConfigService>(); GlobalObject.container.RegisterSingleton<ConfigService>();
GlobalObject.container.RegisterSingleton<AnnexesService>(); GlobalObject.container.RegisterSingleton<AnnexesService>();
GlobalObject.container.RegisterSingleton<DataItemService>(); GlobalObject.container.RegisterSingleton<DataItemService>();
GlobalObject.container.RegisterSingleton<DrawingServce>(); GlobalObject.container.RegisterSingleton<DrawingServce>();
GlobalObject.container.RegisterSingleton<LoginService>(); GlobalObject.container.RegisterSingleton<LoginService>();
GlobalObject.container.RegisterSingleton<NotificationService>(); GlobalObject.container.RegisterSingleton<NotificationService>();
GlobalObject.container.RegisterSingleton<ObjectTypeService>(); GlobalObject.container.RegisterSingleton<ObjectTypeService>();
GlobalObject.container.RegisterSingleton<ProjectService>(); GlobalObject.container.RegisterSingleton<ProjectService>();
GlobalObject.container.RegisterSingleton<TemplateFileService>(); GlobalObject.container.RegisterSingleton<TemplateFileService>();
GlobalObject.container.RegisterSingleton<UserService>(); GlobalObject.container.RegisterSingleton<UserService>();
GlobalObject.container.RegisterSingleton<EnginedataService>(); GlobalObject.container.RegisterSingleton<EnginedataService>();
//GlobalObject.container.RegisterSingleton<ResourceService>(); //GlobalObject.container.RegisterSingleton<ResourceService>();
GlobalObject.container.RegisterSingleton<DrawingCatalogueService>(); GlobalObject.container.RegisterSingleton<DrawingCatalogueService>();
GlobalObject.container.RegisterSingleton<WireGroupService>(); GlobalObject.container.RegisterSingleton<WireGroupService>();
GlobalObject.container.RegisterSingleton<IOModuleService>(); GlobalObject.container.RegisterSingleton<IOModuleService>();
GlobalObject.container.RegisterSingleton<PDBService>(); GlobalObject.container.RegisterSingleton<PDBService>();
GlobalObject.container.RegisterSingleton<RelService>(); GlobalObject.container.RegisterSingleton<RelService>();
GlobalObject._prismContainer = new DryIocContainerExtension();
GlobalObject._prismContainer.Register<IDialogService, DialogService>();
GlobalObject._prismContainer.Register<IDialogWindow, Views.Dialog.CustomDialogWindow>();
//后者类似于一个容器。给所有需要的dialog所用
GlobalObject._prismContainer.RegisterDialog<NewDrawing, NewDrawingViewModel>();
GlobalObject._prismContainer.RegisterDialog<Dialog2Select, Dialog2SelectViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogUnitSelect, DialogUnitSelectViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogInput, DialogInputViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogTagSelect, DialogTagSelectViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogNewTagNumber, DialogNewTagNumberViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogParallelCable, DialogParallelCableViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogPreCheckIn, DialogPreCheckInViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogDrawingCatalogue, DialogDrawingCatalogueViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCheckInRecord, DialogCheckInRecordViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogPublishRecord, DialogPublishRecordViewModel>();
GlobalObject._prismContainer.RegisterDialog<SWS.WPF.Views.DialogSignalManagement, SWS.WPF.ViewModels.DialogSignalManagementViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogAllOutputSignal, DialogAllOutputSignalViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogAssociatedSignal, DialogAssociatedSignalViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogOperateRecord, DialogOperateRecordViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogPropertyHistory, DialogPropertyHistoryViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogSignalNotice, DialogSignalNoticeViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogSignalPropertyhisAndLogs, DialogSignalPropertyhisAndLogsViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogSignalSelect, DialogSignalSelectViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogIODistribution, DialogIODistributionViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogNewPositional, DialogNewPositionalViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogNewStrip, DialogNewStripViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCablePreAssignPreview, DialogCablePreAssignPreviewViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCablePreAssignResult, DialogCablePreAssignResultViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogNewComponent, DialogNewComponentViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCableConfig, DialogCableConfigViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogBusbarManagement, DialogBusbarManagementViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogChannelMigration, DialogChannelMigrationViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCableConnection, DialogCableConnectionViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogCableConnection_NewStrip, DialogCableConnection_NewStripViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogSignalPredistribution, DialogSignalPredistributionViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogSectionBox, DialogSectionBoxViewModel>();
}
catch (System.Exception ex)
{
// 记录异常详细信息
MessageBox.Show($"启动时发生错误: {ex.ToString()}", "错误", MessageBoxButton.OK, MessageBoxImage.Error);
}
GlobalObject._prismContainer = new DryIocContainerExtension(); GlobalObject._prismContainer = new DryIocContainerExtension();
GlobalObject._prismContainer.Register<IDialogService, DialogService>(); GlobalObject._prismContainer.Register<IDialogService, DialogService>();
GlobalObject._prismContainer.Register<IDialogWindow, Views.Dialog.CustomDialogWindow>(); GlobalObject._prismContainer.Register<IDialogWindow, Views.Dialog.CustomDialogWindow>();
@ -79,5 +133,7 @@ namespace SWS.CAD
GlobalObject._prismContainer.RegisterDialog<DialogSignalPredistribution, DialogSignalPredistributionViewModel>(); GlobalObject._prismContainer.RegisterDialog<DialogSignalPredistribution, DialogSignalPredistributionViewModel>();
GlobalObject._prismContainer.RegisterDialog<DialogSectionBox, DialogSectionBoxViewModel>(); GlobalObject._prismContainer.RegisterDialog<DialogSectionBox, DialogSectionBoxViewModel>();
} }
} }
} }

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

@ -1957,7 +1957,7 @@ namespace SWS.CAD.ViewModels
var historyDrawingsTree = await _dwgService.GetDrawingCatalogue(); var historyDrawingsTree = await _dwgService.GetDrawingCatalogue();
historyDrawingsTree = CheckInOutStatus(historyDrawingsTree); historyDrawingsTree = CheckInOutStatus(historyDrawingsTree);
var listHistory = await _dwgService.GetPublishedDwg(); var listHistory = await _dwgService.GetPublishedDwg();
if (listHistory.Any()) if (listHistory!=null&& listHistory.Any())
{ {
//历史树1 //历史树1
//historyDrawings = FilterHistoryTree(historyDrawingsTree, listHistory); //historyDrawings = FilterHistoryTree(historyDrawingsTree, listHistory);

4
newFront/c#前端/SWS.CAD/Views/LeftPanel.xaml
View File

@ -354,7 +354,7 @@
Foreground="{Binding FontColor}" Foreground="{Binding FontColor}"
Glyph="{Binding Glyph, Converter={StaticResource StringToGlyphConverter1}}" /> Glyph="{Binding Glyph, Converter={StaticResource StringToGlyphConverter1}}" />
<!-- 文本 --> <!-- 文本 -->
<TextBlock VerticalAlignment="Center" Text="{Binding Text}" /> <TextBlock VerticalAlignment="Center" Text="{Binding Text}" Foreground="{Binding FontColor}"/>
</StackPanel> </StackPanel>
</HierarchicalDataTemplate> </HierarchicalDataTemplate>
</TreeView.ItemTemplate> </TreeView.ItemTemplate>
@ -488,7 +488,7 @@
Foreground="{Binding FontColor}" Foreground="{Binding FontColor}"
Glyph="{Binding Glyph, Converter={StaticResource StringToGlyphConverter1}}" /> Glyph="{Binding Glyph, Converter={StaticResource StringToGlyphConverter1}}" />
<!-- 文本 --> <!-- 文本 -->
<TextBlock VerticalAlignment="Center" Text="{Binding Text}" /> <TextBlock VerticalAlignment="Center" Text="{Binding Text}" Foreground="{Binding FontColor}"/>
</StackPanel> </StackPanel>
</HierarchicalDataTemplate> </HierarchicalDataTemplate>
</TreeView.ItemTemplate> </TreeView.ItemTemplate>