更新
This commit is contained in:
GukSang.Jin
@@ -2,7 +2,7 @@
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:local="clr-namespace:自救器呼吸器综合检验仪"
|
||||
Title="自救器呼吸器综合检验仪" Height="900" Width="1280"
|
||||
Title="自救器呼吸器综合检验仪" Height="600" Width="1024" WindowState="Maximized"
|
||||
WindowStartupLocation="CenterScreen"
|
||||
Background="Transparent"
|
||||
FontFamily="Microsoft YaHeui" Loaded="Window_Loaded" Closed="Window_Closed" Closing="Window_Closing">
|
||||
@@ -11,7 +11,7 @@
|
||||
<local:MainViewModel />
|
||||
</Window.DataContext>
|
||||
|
||||
|
||||
|
||||
<Window.Resources>
|
||||
|
||||
<Style x:Key="LabelStyle" TargetType="TextBlock">
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
|
||||
</Window.Resources>
|
||||
|
||||
|
||||
<!-- 背景层 -->
|
||||
<Grid>
|
||||
<!-- 背景图片 -->
|
||||
@@ -69,9 +69,9 @@
|
||||
<TextBlock Text="定量供应检验系统"
|
||||
FontSize="26" FontWeight="Bold" Foreground="White"/>
|
||||
<!--<TextBlock Text="定量供应检验系统"
|
||||
FontSize="14" Foreground="#CCFFFFFF" Margin="0,5,0,0"/>-->
|
||||
FontSize="14" Foreground="#CCFFFFFF" Margin="0,5,0,0"/>-->
|
||||
</StackPanel>
|
||||
<StackPanel Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
|
||||
<StackPanel Grid.Column="3" Orientation="Horizontal" Margin="2" HorizontalAlignment="Center">
|
||||
<TextBlock Text="样品编号：" FontSize="26" FontWeight="Bold" Foreground="White" Style="{StaticResource LabelStyle}"/>
|
||||
<TextBox x:Name="pressureDiff2" Text="" Width="180" Style="{StaticResource TextBoxStyle}" LostFocus="pressureDiff2_GotFocus"/>
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
<!-- 主内容区域 -->
|
||||
<Grid Grid.Row="1" Margin="0,0,0,20">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="2*"/>
|
||||
<ColumnDefinition Width="3*"/>
|
||||
<ColumnDefinition Width="1*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
|
||||
@@ -113,45 +113,57 @@
|
||||
<Border Grid.Row="0" Background="White" Margin="0,0,0,20"
|
||||
BorderBrush="#E1E8ED" BorderThickness="1">
|
||||
<StackPanel Margin="30,25">
|
||||
|
||||
|
||||
<TextBlock Text="⚙️ 参数配置" FontSize="20" FontWeight="Bold"
|
||||
Foreground="#2C3E50" Margin="0,0,0,20"/>
|
||||
|
||||
|
||||
|
||||
<!-- 检验时间配置 -->
|
||||
<StackPanel Orientation="Horizontal" Margin="0,0,0,15">
|
||||
<TextBlock Text="检验时间：" Width="100" VerticalAlignment="Center"
|
||||
<Grid Margin="0,0,0,15">
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="100"/>
|
||||
<ColumnDefinition Width="100"/>
|
||||
<ColumnDefinition Width="Auto"/>
|
||||
<ColumnDefinition Width="120"/>
|
||||
<ColumnDefinition Width="120"/>
|
||||
<ColumnDefinition Width="*"/>
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="Auto"/>
|
||||
<RowDefinition Height="Auto"/>
|
||||
</Grid.RowDefinitions>
|
||||
<TextBlock Grid.Column="0" Text="检验时间：" VerticalAlignment="Center"
|
||||
FontSize="14" FontWeight="SemiBold" Foreground="#2C3E50"/>
|
||||
<TextBox x:Name="settingtime" Text="0" Width="100" Height="35"
|
||||
<TextBox Grid.Column="1" x:Name="settingtime" Text="0" Width="100" Height="35"
|
||||
VerticalContentAlignment="Center" TextAlignment="Center"
|
||||
BorderBrush="#DCDFE6" BorderThickness="1" Background="#FAFBFC"
|
||||
FontSize="14" TextChanged="settingtime_TextChanged"/>
|
||||
<TextBlock Text="秒" Margin="15,0,40,0" VerticalAlignment="Center"
|
||||
<TextBlock Grid.Column="2" Text="秒" Margin="15,0,20,0" VerticalAlignment="Center"
|
||||
FontSize="14" Foreground="#7F8C8D"/>
|
||||
|
||||
<Button Content="🔧 设置参数" Click="BtnWrite401_Click"
|
||||
Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
|
||||
Width="120" Height="38" BorderThickness="0" Margin="0,0,25,0"
|
||||
Cursor="Hand"/>
|
||||
Grid.Row="1" Grid.Column="0"
|
||||
Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold" Height="38" BorderThickness="0" Margin="0,12,53,0"
|
||||
Cursor="Hand" Grid.ColumnSpan="2"/>
|
||||
|
||||
<Button x:Name="btn_flow2" Content="定量供氧L/min" Click="BtnWrite400_Click"
|
||||
Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
|
||||
Width="120" Height="38" BorderThickness="0" Margin="0,0,25,0"
|
||||
Cursor="Hand"/>
|
||||
Grid.Row="1" Grid.Column="1"
|
||||
Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold" Height="38" BorderThickness="0" Margin="91,12,8,0"
|
||||
Cursor="Hand" Grid.ColumnSpan="3"/>
|
||||
|
||||
<Button x:Name="btn_flow3" Content="自动/手动补给供氧(L/min)" Click="BtnWrite400_Click1"
|
||||
Background="#3498DB" Foreground="White" FontSize="13" FontWeight="Bold"
|
||||
Width="174" Height="38" BorderThickness="0" Margin="0,0,25,0"
|
||||
Cursor="Hand"/>
|
||||
Grid.Row="1" Grid.Column="4" Grid.ColumnSpan="2"
|
||||
Background="#3498DB" Foreground="White" FontSize="12" FontWeight="Bold"
|
||||
Height="38" BorderThickness="0" Padding="12,0" Margin="44,12,24,0" Cursor="Hand"/>
|
||||
|
||||
|
||||
|
||||
<!--<Border Background="#F8F9FA" Padding="10,6" BorderBrush="#E1E8ED" BorderThickness="1">-->
|
||||
<!--<TextBlock x:Name="label_flow" Text="0-100L/min" VerticalAlignment="Center"
|
||||
<!--<TextBlock x:Name="label_flow" Text="0-100L/min" VerticalAlignment="Center"
|
||||
FontSize="12" FontWeight="Bold" Foreground="#3498DB"/>-->
|
||||
|
||||
|
||||
<!--</Border>-->
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
|
||||
<!-- 试验时间显示 -->
|
||||
<!--<StackPanel Orientation="Horizontal">
|
||||
@@ -228,7 +240,7 @@
|
||||
</StackPanel>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
|
||||
|
||||
</Grid>
|
||||
</StackPanel>
|
||||
</Border>
|
||||
@@ -306,4 +318,4 @@
|
||||
</Border>
|
||||
</Grid>
|
||||
</Grid>
|
||||
</Window>
|
||||
</Window>
|
||||
|
||||
Reference in New Issue
Block a user