csi_team/NoBuilding
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
wxt
2026-02-03 19:59:21 +08:00
parent 149cbd63b7
commit 8bc112a041
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
建材不燃性试验炉/MainWindow.xaml
View File

@@ -502,7 +502,7 @@
Padding="5,3"
Margin="0,0,0,5"/>
</StackPanel>
<TextBlock Text="平衡条件: 温度波动正常至少10分钟最大温差＜10°C 且 温度漂移＜2°C"
<TextBlock Text="平衡条件: 温度波动正常至少10分钟最大温差＜10°C 且 漂移＜2°C"
FontSize="12"
Foreground="#666666"
Margin="0,3,0,0"/>

10
建材不燃性试验炉/MainWindow.xaml.cs
View File

@@ -337,7 +337,7 @@ namespace 建材不燃性试验炉
{
txtFinalWeight.IsEnabled = false;
txtFinalWeight.Background = Brushes.LightGray;
txtFinalWeight.Text = "请输入试验后重量(g)";
txtFinalWeight.Text = "请输入试验后重量";
}
else
{
@@ -368,11 +368,11 @@ namespace 建材不燃性试验炉
{
if (Dispatcher.CheckAccess())
{
txtFinalWeight.Text = "请输入试验后重量(g)";
txtFinalWeight.Text = "请输入试验后重量";
}
else
{
Dispatcher.Invoke(() => txtFinalWeight.Text = "请输入试验后重量(g)");
Dispatcher.Invoke(() => txtFinalWeight.Text = "请输入试验后重量");
}
return;
}
@@ -408,7 +408,7 @@ namespace 建材不燃性试验炉
// 解析后称重
string finalText = txtFinalWeight.Text;
if (!string.IsNullOrEmpty(finalText) && finalText != "请输入试验后重量(g)")
if (!string.IsNullOrEmpty(finalText) && finalText != "请输入试验后重量")
{
if (double.TryParse(finalText, out finalWeight) && finalWeight >= 0.1)
{
@@ -2446,7 +2446,7 @@ namespace 建材不燃性试验炉
FinalWeight = finalWeight,
LossPercent = weightLossPercent,
FlameDuration = flameDuration,
TestDate = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss"),
TestDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"),
TestDuration = txtFinalBalanceTimer.Text,
BalanceStatus = GetBalanceStatus(),
Remarks = $"火焰:{(chkHasFlame.IsChecked == true ? "有" : "无")} 冒烟:{(chkHasSmoke.IsChecked == true ? "有" : "无")}"

2
建材不燃性试验炉/TestReportWindow.xaml
View File

@@ -99,7 +99,7 @@
<DataGridTextColumn Header="结束质量(g)" Binding="{Binding FinalWeight, StringFormat=\{0:F2\}}" Width="100"/>
<DataGridTextColumn Header="质量损失(%)" Binding="{Binding LossPercent, StringFormat=\{0:F2\}}" Width="100"/>
<DataGridTextColumn Header="火焰时间(s)" Binding="{Binding FlameDuration}" Width="100"/>
<DataGridTextColumn Header="试验日期" Binding="{Binding TestDate}" Width="100"/>
<DataGridTextColumn Header="试验日期" Binding="{Binding TestDate}" Width="170"/>
<DataGridTextColumn Header="持续时间" Binding="{Binding TestDuration}" Width="100"/>
<DataGridTextColumn Header="平衡状态" Binding="{Binding BalanceStatus}" Width="100"/>
<DataGridTextColumn Header="备注" Binding="{Binding Remarks}" Width="130"/>