This commit is contained in:
2026-05-12 10:29:53 +08:00
parent 14d55162ae
commit 38e2ac1efb
3 changed files with 9 additions and 9 deletions

View File

@@ -88,7 +88,7 @@
<Grid>
<StackPanel Margin="10">
<TextBlock FontSize="20" FontWeight="Bold" Text=" " HorizontalAlignment="Center" Margin="0,0,0,20"/>
<TextBlock FontSize="20" FontWeight="Bold" Text="{DynamicResource ReportTwo}" HorizontalAlignment="Center" Margin="0,0,0,20"/>
<StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,20">
<TextBlock Text="{DynamicResource testReport1}" VerticalAlignment="Center" Foreground="Black"/>
@@ -108,8 +108,8 @@
</DataGridCheckBoxColumn>
<DataGridTextColumn Header="{DynamicResource testReport8}" Binding="{Binding Id}" Width="*"/>
<DataGridTextColumn Header="{DynamicResource TestReport1}" Binding="{Binding Flow}" Width="*"/>
<DataGridTextColumn Header="{DynamicResource TestReport2}" Binding="{Binding Pressure}" Width="*"/>
<DataGridTextColumn Header="{DynamicResource ReportTwo1}" Binding="{Binding Flow}" Width="*"/>
<DataGridTextColumn Header="{DynamicResource ReportTwo2}" Binding="{Binding Pressure}" Width="*"/>
<DataGridTextColumn Header="{DynamicResource testReport11}" Binding="{Binding RecordTime}" Width="*"/>
<DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100">
<DataGridTemplateColumn.CellTemplate>

View File

@@ -128,9 +128,9 @@
<system:String x:Key="FlowReport2">Delete</system:String>
<!--报表2-->
<system:String x:Key="TestReport">Air resistance test report</system:String>
<system:String x:Key="TestReport1">Air resistance(hpa)</system:String>
<system:String x:Key="TestReport2">Traffic(L/min)</system:String>
<system:String x:Key="ReportTwo">Air resistance test report</system:String>
<system:String x:Key="ReportTwo1">Air resistance(hpa)</system:String>
<system:String x:Key="ReportTwo2">Traffic(L/min)</system:String>
<!--报表3-->
<system:String x:Key="FxReport">Asphyxiation Prevention Test Report</system:String>

View File

@@ -128,9 +128,9 @@
<system:String x:Key="FlowReport2">删除</system:String>
<!--报表2-->
<system:String x:Key="TestReport">气阻测试报表</system:String>
<system:String x:Key="TestReport1">气阻hpa</system:String>
<system:String x:Key="TestReport2">流量L/min</system:String>
<system:String x:Key="ReportTwo">气阻测试报表</system:String>
<system:String x:Key="ReportTwo1">气阻hpa</system:String>
<system:String x:Key="ReportTwo2">流量L/min</system:String>
<!--报表3-->
<system:String x:Key="FxReport">防窒息测试报表</system:String>