This commit is contained in:
wxt
2026-02-03 19:28:45 +08:00
parent ef8591bd68
commit bd2c744daa
6 changed files with 113 additions and 775 deletions

View File

@@ -286,51 +286,89 @@
<!-- 2. 试样称重 -->
<StackPanel Margin="0,0,0,15">
<TextBlock Text="试样重量 (g):"
FontSize="14"
FontWeight="SemiBold"
Foreground="#333333"
Margin="0,0,0,5"/>
FontSize="14"
FontWeight="SemiBold"
Foreground="#333333"
Margin="0,0,0,5"/>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto"/>
</Grid.RowDefinitions>
<Grid Grid.Row="0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<TextBox x:Name="txtInitialWeight"
Grid.Column="0"
Style="{StaticResource PlaceholderTextBoxStyle}"
Tag="请输入试验前重量(g)"
Text="" Margin="0,0,5,0"
TextChanged="txtInitialWeight_TextChanged"/>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
</Grid>
<Grid Grid.Row="1" Margin="0,0,0,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="*"/>
</Grid.ColumnDefinitions>
<!-- 左侧:前质量 -->
<StackPanel Grid.Column="0" Orientation="Horizontal" Margin="0,0,5,0">
<!-- 前质量标签 -->
<TextBlock Text="前质量(g):"
FontSize="13"
FontWeight="SemiBold"
Foreground="#333333"
VerticalAlignment="Center"
Width="60"
Margin="0,0,10,0"/>
<!-- 前质量输入框 -->
<TextBox x:Name="txtInitialWeight"
Style="{StaticResource PlaceholderTextBoxStyle}"
Tag="请输入试验前重量"
Text=""
TextChanged="txtInitialWeight_TextChanged" Width="157"/>
</StackPanel>
<!-- 右侧:后质量 -->
<StackPanel Grid.Column="1" Orientation="Horizontal">
<!-- 后质量标签 -->
<TextBlock Text="后质量(g):"
FontSize="13"
FontWeight="SemiBold"
Foreground="#333333"
VerticalAlignment="Center"
Width="60"
Margin="0,0,8,0"/>
<!-- 后质量输入框 -->
<TextBox x:Name="txtFinalWeight"
Grid.Column="1"
Style="{StaticResource PlaceholderTextBoxStyle}"
Tag="请输入试验后重量(g)"
Text=""
TextChanged="txtFinalWeight_TextChanged"/>
</Grid>
Style="{StaticResource PlaceholderTextBoxStyle}"
Tag="请输入试验后重量"
Text=""
TextChanged="txtFinalWeight_TextChanged" Width="159"/>
</StackPanel>
</Grid>
<StackPanel Orientation="Horizontal" Margin="0,5,0,0">
<TextBlock x:Name="txtWeightLoss"
FontSize="12"
Foreground="#E74C3C"
FontWeight="SemiBold"
Margin="0,0,10,0"/>
<TextBlock x:Name="txtWeightStatus"
FontSize="12"
Foreground="#666666"/>
</StackPanel>
<!-- 重量变化显示 -->
<!-- 重量变化显示和确认CheckBox -->
<Grid Margin="20,5,5,0">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<!-- 左侧:重量变化信息 -->
<StackPanel Grid.Column="0" Orientation="Horizontal">
<TextBlock x:Name="txtWeightLoss"
FontSize="12"
Foreground="#E74C3C"
FontWeight="SemiBold"
Margin="0,0,10,0"/>
<TextBlock x:Name="txtWeightStatus"
FontSize="12"
Foreground="#666666"/>
</StackPanel>
<!-- 右侧重量确认CheckBox -->
<CheckBox Grid.Column="1"
x:Name="chkWeightConfirm"
Content="重量确认"
FontSize="12"
Foreground="#333333"
IsChecked="False"
Checked="chkWeightConfirm_Checked"
VerticalAlignment="Center"/>
</Grid>
</StackPanel>
<!-- 4. 试验参数优化 -->
@@ -720,7 +758,7 @@
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="3" Margin="10,0,0,0">
<Button Content="数据报表"
<Button Name="Button" Content="数据报表"
Width="80"
Height="30"
FontSize="12"
@@ -1135,24 +1173,9 @@
<!-- 控制按钮 -->
<StackPanel Orientation="Horizontal"
HorizontalAlignment="Center"
Margin="0,5,0,0">
<!-- 暂停按钮 -->
<Button x:Name="btnPauseExperiment"
Style="{StaticResource IconButtonStyle}"
ToolTip="暂停实验"
Click="btnPauseExperiment_Click"
Margin="2,0,2,0"
IsEnabled="False">
<Viewbox Width="16" Height="16">
<Canvas Width="24" Height="24">
<Rectangle Width="4" Height="14" Fill="White" Canvas.Left="6" Canvas.Top="5"/>
<Rectangle Width="4" Height="14" Fill="White" Canvas.Left="14" Canvas.Top="5"/>
</Canvas>
</Viewbox>
</Button>
HorizontalAlignment="Center"
Margin="0,5,0,0">
<!-- 重置按钮 -->
<Button x:Name="btnResetExperiment"
Style="{StaticResource IconButtonStyle}"