From 0a40411962fde98c9cfe13d01f8d6b16720a82a1 Mon Sep 17 00:00:00 2001
From: rain <rain888899@outlook.com>
Date: Fri, 8 May 2026 20:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ReportWindow6.xaml           | 36 ++++++++++++++++++------------------
 Resources/Strings.en-US.xaml | 17 +++++++++++++++++
 Resources/Strings.zh-CN.xaml | 19 ++++++++++++++++---
 3 files changed, 51 insertions(+), 21 deletions(-)

diff --git a/ReportWindow6.xaml b/ReportWindow6.xaml
index 72b6ed0..97eca50 100644
--- a/ReportWindow6.xaml
+++ b/ReportWindow6.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="ShanghaiEnvironmentalTechnology.ReportWindow6"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="CO2重复呼吸测试报表" Height="768" Width="1024" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen">
+        Title="{DynamicResource testReport}" Height="768" Width="1024" Loaded="Window_Loaded" WindowStartupLocation="CenterScreen">
 
     <Window.Resources>
         <Style x:Key="MyButtonStyle" TargetType="Button">
@@ -88,36 +88,36 @@
 
     <Grid>
         <StackPanel Margin="10">
-            <TextBlock FontSize="20" FontWeight="Bold" Text="CO2重复呼吸测试报表" HorizontalAlignment="Center" Margin="0,0,0,20"/>
+            <TextBlock FontSize="20" FontWeight="Bold" Text="{DynamicResource testReport}" HorizontalAlignment="Center" Margin="0,0,0,20"/>
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Left" Margin="0,0,0,20">
-                <TextBlock Text="起始时间:" VerticalAlignment="Center" Foreground="Black"/>
+                <TextBlock Text="{DynamicResource testReport1}" VerticalAlignment="Center" Foreground="Black"/>
                 <DatePicker x:Name="StartDatePicker" Margin="5,0" Height="30" />
-                <TextBlock Text="终止时间:" VerticalAlignment="Center" Foreground="Black"/>
+                <TextBlock Text="{DynamicResource testReport111}" VerticalAlignment="Center" Foreground="Black"/>
                 <DatePicker x:Name="EndDatePicker" Margin="5,0"  Height="30"/>
-                <Button Content="查询" Click="QueryButton_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
-                <Button Content="全选" Click="SelectAllButton_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
-                <Button Content="批量删除" Click="BatchDeleteButton_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
-                <Button Content="导出" Click="Export_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
+                <Button Content="{DynamicResource testReport3}" Click="QueryButton_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
+                <Button Content="{DynamicResource testReport4}" Click="SelectAllButton_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
+                <Button Content="{DynamicResource testReport5}" Click="BatchDeleteButton_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
+                <Button Content="{DynamicResource testReport6}" Click="Export_Click" Margin="5,0" Style="{StaticResource MyButtonStyle}"/>
             </StackPanel>
 
             <DataGrid x:Name="DataGridReport" AutoGenerateColumns="False" Height="400" Margin="0,0,0,20" Style="{StaticResource CustomDataGridStyle}">
                 <DataGrid.Columns>
-                    <DataGridCheckBoxColumn Header="选择"   Binding="{Binding IsSelected}"   Width="50">
+                    <DataGridCheckBoxColumn Header="{DynamicResource testReport7}"   Binding="{Binding IsSelected}"   Width="50">
 
 
                     </DataGridCheckBoxColumn>
-                    <DataGridTextColumn Header="序号" Binding="{Binding Id}" Width="*"/>
-                    <DataGridTextColumn Header="二氧化碳浓度（%）" Binding="{Binding Flow}" Width="*"/>
-                    <DataGridTextColumn Header="压力（pa）" Binding="{Binding Pressure}" Width="*"/>
+                    <DataGridTextColumn Header="{DynamicResource testReport8}" Binding="{Binding Id}" Width="*"/>
+                    <DataGridTextColumn Header="{DynamicResource testReport9}" Binding="{Binding Flow}" Width="*"/>
+                    <DataGridTextColumn Header="{DynamicResource testReport10}" Binding="{Binding Pressure}" Width="*"/>
                     <!--<DataGridTextColumn Header="开始CO2浓度（%）" Binding="{Binding BeginCO2}" Width="*"/>
                     <DataGridTextColumn Header="终CO2浓度（%）" Binding="{Binding EndCO2}" Width="*"/>
                     <DataGridTextColumn Header="CO2浓度相对增加（%）" Binding="{Binding CO2Added}" Width="*"/>-->
-                    <DataGridTextColumn Header="时间" Binding="{Binding RecordTime}" Width="*"/>
-                    <DataGridTemplateColumn Header="操作" Width="100">
+                    <DataGridTextColumn Header="{DynamicResource testReport11}" Binding="{Binding RecordTime}" Width="*"/>
+                    <DataGridTemplateColumn Header="{DynamicResource testReport12}" Width="100">
                         <DataGridTemplateColumn.CellTemplate>
                             <DataTemplate>
-                                <Button Content="删除" 
+                                <Button Content="{DynamicResource testReport12}" 
                             Click="DeleteButton_Click" 
                             Background="#FF5252"
                             Foreground="White"
@@ -155,10 +155,10 @@
             </DataGrid>
 
             <StackPanel Orientation="Horizontal" HorizontalAlignment="Center">
-                <Button Content="主页" Click="HomePage_Click"  HorizontalAlignment="Left" Style="{StaticResource MyButtonStyle}"/>
-                <Button Content="上一页" Click="PreviousPage_Click" Margin="5" Style="{StaticResource MyButtonStyle}"/>
+                <Button Content="{DynamicResource test25}" Click="HomePage_Click"  HorizontalAlignment="Left" Style="{StaticResource MyButtonStyle}"/>
+                <Button Content="{DynamicResource testReport13}" Click="PreviousPage_Click" Margin="5" Style="{StaticResource MyButtonStyle}"/>
                 <TextBlock x:Name="PageInfo" VerticalAlignment="Center" Margin="5"/>
-                <Button Content="下一页" Click="NextPage_Click" Margin="5" Style="{StaticResource MyButtonStyle}"/>
+                <Button Content="{DynamicResource testReport14}" Click="NextPage_Click" Margin="5" Style="{StaticResource MyButtonStyle}"/>
             </StackPanel>
         </StackPanel>
     </Grid>
diff --git a/Resources/Strings.en-US.xaml b/Resources/Strings.en-US.xaml
index 98d18a3..bdbccde 100644
--- a/Resources/Strings.en-US.xaml
+++ b/Resources/Strings.en-US.xaml
@@ -123,6 +123,23 @@
     <system:String x:Key="test28">Recorded scene</system:String>
     <system:String x:Key="test29">Process Record</system:String>
 
+    <system:String x:Key="testReport">CO2 Rebreathing Test Report</system:String>
+    <system:String x:Key="testReport1">Start time</system:String>
+    <system:String x:Key="testReport111">Termination time</system:String>
+    <system:String x:Key="testReport2">Select a date</system:String>
+    <system:String x:Key="testReport3">Search/query</system:String>
+    <system:String x:Key="testReport4">select all</system:String>
+    <system:String x:Key="testReport5">Batch deletion</system:String>
+    <system:String x:Key="testReport6">Export</system:String>
+    <system:String x:Key="testReport7">Choice</system:String>
+    <system:String x:Key="testReport8">Serial Number</system:String>
+    <system:String x:Key="testReport9">Carbon dioxide concentration(%)</system:String>
+    <system:String x:Key="testReport10">Pressure(pa)</system:String>
+    <system:String x:Key="testReport11">Time</system:String>
+    <system:String x:Key="testReport12">Operation</system:String>
+    <system:String x:Key="testReport13">Previous page</system:String>
+    <system:String x:Key="testReport14">Next page</system:String>
+
 
     <system:String x:Key="Workstation curve description">Workstation curve description:</system:String>
     <system:String x:Key="Test Status">Test Status</system:String>
diff --git a/Resources/Strings.zh-CN.xaml b/Resources/Strings.zh-CN.xaml
index 5b7cdb9..562bbeb 100644
--- a/Resources/Strings.zh-CN.xaml
+++ b/Resources/Strings.zh-CN.xaml
@@ -111,7 +111,6 @@
     <system:String x:Key="test16">开始CO2浓度</system:String>
     <system:String x:Key="test17">结束CO2浓度</system:String>
     <system:String x:Key="test18">CO2浓度增加值</system:String>
-
     <system:String x:Key="test19">复位</system:String>
     <system:String x:Key="test20">测试启动</system:String>
     <system:String x:Key="test21">测试停止</system:String>
@@ -124,8 +123,22 @@
     <system:String x:Key="test28">记录画面</system:String>
     <system:String x:Key="test29">过程记录</system:String>
 
-
-
+    <system:String x:Key="testReport">CO2重复呼吸测试报表</system:String>
+    <system:String x:Key="testReport1">起始时间</system:String>
+    <system:String x:Key="testReport111">终止时间</system:String>
+    <system:String x:Key="testReport2">选择日期</system:String>
+    <system:String x:Key="testReport3">查询</system:String>
+    <system:String x:Key="testReport4">全选</system:String>
+    <system:String x:Key="testReport5">批量删除</system:String>
+    <system:String x:Key="testReport6">导出</system:String>
+    <system:String x:Key="testReport7">选择</system:String>
+    <system:String x:Key="testReport8">序号</system:String>
+    <system:String x:Key="testReport9">二氧化碳浓度(%)</system:String>
+    <system:String x:Key="testReport10">压力(pa)</system:String>
+    <system:String x:Key="testReport11">时间</system:String>
+    <system:String x:Key="testReport12">操作</system:String>
+    <system:String x:Key="testReport13">上一页</system:String>
+    <system:String x:Key="testReport14">下一页</system:String>