交接柜添加紧急开锁功能

This commit is contained in:
maqiao 2025-03-04 15:39:35 +08:00
parent e917275436
commit af620ae141
2 changed files with 95 additions and 65 deletions

View File

@ -10,6 +10,7 @@ using Prism.Regions;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
@ -66,6 +67,15 @@ namespace DM_Weight.ViewModels
_regionManager.RequestNavigate("MainRegion", "LoginWindow"); _regionManager.RequestNavigate("MainRegion", "LoginWindow");
}); });
} }
private DelegateCommand? _exitCommand;
public DelegateCommand ExitCommand => _exitCommand ??= new DelegateCommand(Exit);
void Exit()
{
//_chkFunction.HIKLoginOut();
_socketHelper.SocketDisConnect();
Process.GetCurrentProcess().Kill();
Environment.Exit(0);
}
//间隔1分钟查询数据库连接状态 //间隔1分钟查询数据库连接状态
private void CheckDBConnect() private void CheckDBConnect()
{ {

View File

@ -12,13 +12,24 @@
xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"> xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
<UserControl.Resources> <UserControl.Resources>
</UserControl.Resources> </UserControl.Resources>
<Grid> <Grid>
<Grid.RowDefinitions>
<RowDefinition Height="80"></RowDefinition>
<RowDefinition></RowDefinition>
</Grid.RowDefinitions>
<Grid Background="#00bcd4">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" />
<ColumnDefinition />
</Grid.ColumnDefinitions>
<TextBlock Text="交接柜管理系统" Grid.Column="0" Margin="30 0 30 0" HorizontalAlignment="Left" Width="Auto" Height="26" Foreground="White" FontSize="20" FontWeight="Bold" />
</Grid>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid Margin="26" Grid.Column="0"> <Grid Margin="6" Grid.Column="0">
<Grid.Resources> <Grid.Resources>
<Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignPaperLightButton}"> <Style TargetType="{x:Type Button}" BasedOn="{StaticResource MaterialDesignPaperLightButton}">
<Setter Property="Foreground" Value="#00a0ea" /> <Setter Property="Foreground" Value="#00a0ea" />
@ -64,20 +75,28 @@
<Button Margin="0 0 3 0" Grid.Row="8" Grid.Column="1" Width="150" Content="18号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="18" /> <Button Margin="0 0 3 0" Grid.Row="8" Grid.Column="1" Width="150" Content="18号药箱" Command="{Binding UpdateDrawerNo}" CommandParameter="18" />
</Grid> </Grid>
</Grid> </Grid>
<Grid Grid.Column="1" Margin="0 60 0 0"> <Grid Grid.Column="1" Margin="0 6 0 0">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
<RowDefinition Height="Auto"/> <RowDefinition Height="Auto"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Right"> <StackPanel Orientation="Horizontal" HorizontalAlignment="Left">
<Button Margin="0 0 6 0" Content="返回登录" Command="{Binding ReturnLoginDelegate}" CommandParameter="0" <Button Margin="0 0 6 0" Content="返回登录" Command="{Binding ReturnLoginDelegate}" CommandParameter="0"
Visibility="{Binding DBConnectionStatus, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource MaterialDesignOutlinedLightButton}"/> Visibility="{Binding DBConnectionStatus, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{StaticResource MaterialDesignOutlinedLightButton}"/>
<Button
Style="{StaticResource MaterialDesignRaisedLightButton}"
Background="#7986cb"
BorderBrush="#7986cb"
materialDesign:ButtonAssist.CornerRadius="5" Cursor="Hand" IsCancel="true"
Command="{ Binding ExitCommand }" >
<TextBlock Foreground="{DynamicResource MaterialDesignPaper}" Text="退出" />
</Button>
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="1"> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal" Grid.Row="1">
<GroupBox Width="800px" <GroupBox Width="800px"
Header="重要提示" Header="重要提示"
Style="{StaticResource MaterialDesignGroupBox}" Style="{StaticResource MaterialDesignGroupBox}"
Margin="16" Margin="0 6 0 0"
materialDesign:ColorZoneAssist.Mode="SecondaryMid"> materialDesign:ColorZoneAssist.Mode="SecondaryMid">
<TextBlock Foreground="Red" FontWeight="Bold" FontSize="16" Text="数据库连接失败,此页面为紧急开锁页面!!!" /> <TextBlock Foreground="Red" FontWeight="Bold" FontSize="16" Text="数据库连接失败,此页面为紧急开锁页面!!!" />
</GroupBox> </GroupBox>
@ -87,4 +106,5 @@
MessageQueue="{Binding SnackbarMessageQueue}"/>--> MessageQueue="{Binding SnackbarMessageQueue}"/>-->
</Grid> </Grid>
</Grid> </Grid>
</Grid>
</UserControl> </UserControl>