huangsucan/ADP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备编辑管理界面

Browse Source
This commit is contained in:
hsc
2026-06-12 10:00:13 +08:00
parent ffb22e1f20
commit cba9af2892
42 changed files with 4419 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ADP/ADP.csproj
View File

@@ -16,6 +16,7 @@
<ProjectReference Include="..\CAN驱动\CAN驱动.csproj" />
<ProjectReference Include="..\Command\Command.csproj" />
<ProjectReference Include="..\DeviceCommand\DeviceCommand.csproj" />
<ProjectReference Include="..\DeviceEditModule\DeviceEditModule.csproj" />
<ProjectReference Include="..\LoginModule\LoginModule.csproj" />
<ProjectReference Include="..\MainModule\MainModule.csproj" />
<ProjectReference Include="..\MonitorModule\MonitorModule.csproj" />

1
ADP/App.xaml
View File

@@ -9,6 +9,7 @@
<ResourceDictionary.MergedDictionaries>
<!--自定义style-->
<ResourceDictionary Source="/UIShare;component/Styles/CommonStyle.xaml"></ResourceDictionary>
<ResourceDictionary Source="/UIShare;component/Styles/WindowStyle.xaml"></ResourceDictionary>
</ResourceDictionary.MergedDictionaries>
</ResourceDictionary>
</Application.Resources>

9
ADP/ViewModels/ShellViewModel.cs
View File

@@ -144,6 +144,7 @@ namespace ADP.ViewModels
public ICommand OpenCommand { get; set; }
public ICommand NewCommand { get; set; }
public ICommand SetDefaultCommand { get; set; }
public ICommand ShowDialogManagerViewCommand { get; set; }
#endregion
public ShellViewModel(IContainerProvider containerProvider)
@@ -154,8 +155,8 @@ namespace ADP.ViewModels
_regionManager = containerProvider.Resolve<IRegionManager>();
_notificationManager = containerProvider.Resolve<INotificationManager>();
_moduleManager = containerProvider.Resolve<IModuleManager>();
LeftDrawerOpenCommand = new DelegateCommand(LeftDrawerOpen);
ShowDialogManagerViewCommand = new DelegateCommand(ShowDialogManagerView);
MinimizeCommand = new DelegateCommand<Window>(MinimizeWindow);
MaximizeCommand = new DelegateCommand<Window>(MaximizeWindow);
CloseCommand = new DelegateCommand<Window>(CloseWindow);
@@ -194,6 +195,8 @@ namespace ADP.ViewModels
_uiRefreshTimer.Start();
}
private void RefreshAllContextProperties()
{
RaisePropertyChanged(nameof(RunState));
@@ -204,6 +207,10 @@ namespace ADP.ViewModels
}
#region 命令处理与事件
private void ShowDialogManagerView()
{
_eventAggregator.GetEvent<CancelMinimizeEvent>().Publish();
}
private async void OnRunning()
{
string runningScope = _globalInfo.CurrentScope;

31
ADP/Views/ShellView.xaml
View File

@@ -49,7 +49,7 @@
Command="{Binding NavigateCommand}"
CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
Style="{StaticResource MaterialDesignFlatButton}"
Margin="8" />
Margin="8" />
<Button Content="记录界面"
Command="{Binding NavigateCommand}"
CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
@@ -59,7 +59,8 @@
Command="{Binding NavigateCommand}"
CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
Style="{StaticResource MaterialDesignFlatButton}"
Margin="8" />
Margin="8" />
<!--<Button Content="更新界面"
Command="{Binding NavigateCommand}"
CommandParameter="{Binding Content, RelativeSource={RelativeSource Self}}"
@@ -96,7 +97,7 @@
Foreground="White" />
</MenuItem.Icon>
</MenuItem>
<!-- 工具菜单 -->
<MenuItem Header="工具"
@@ -159,6 +160,16 @@
</MenuItem>
<!-- 蜂鸣器消音 -->
<MenuItem Header="弹窗管理器"
FontSize="14"
Height="50"
Foreground="Black"
Command="{Binding ShowDialogManagerViewCommand}">
<MenuItem.Icon>
<materialDesign:PackIcon Kind="DialogueOutline"
Foreground="Black" />
</MenuItem.Icon>
</MenuItem>
<MenuItem Header="蜂鸣器消音"
FontSize="14"
Height="50"
@@ -233,7 +244,7 @@
Foreground="White" />
</MenuItem.Icon>
</MenuItem>
<MenuItem FontSize="14"
Height="50"
Foreground="White">
@@ -303,21 +314,25 @@
Identifier="Root">
<!-- 主内容区 -->
<Grid>
<ContentControl prism:RegionManager.RegionName="ShellViewManager" />
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition Width="31*"/>
</Grid.ColumnDefinitions>
<ContentControl prism:RegionManager.RegionName="ShellViewManager" Grid.ColumnSpan="2" />
<Border x:Name="Overlay"
Background="#40000000"
Visibility="Collapsed"
Panel.ZIndex="1">
Panel.ZIndex="1" Grid.ColumnSpan="2">
<StackPanel Width="150"
VerticalAlignment="Center"
Margin="0 0 0 100">
</StackPanel>
</Border>
<Border x:Name="Waitinglay"
Background="#40000000"
Visibility="Collapsed"
Panel.ZIndex="1">
Panel.ZIndex="1" Grid.ColumnSpan="2">
<StackPanel Width="150"
VerticalAlignment="Center"
Margin="0 0 0 100">