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

@@ -693,7 +693,7 @@
                        Width="80" 
                        Height="30"
                        FontSize="12"
-                       Background="#95A5A6"/>
+                       Background="#95A5A6" Click="Button_Click"/>
                         </StackPanel>
                     </Grid>
 

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

@@ -1540,11 +1540,17 @@ namespace 建材不燃性试验炉
 
         #endregion
 
-        #region 系数按钮相关
+        #region 系数报表按钮相关
 
         private CofficientSetting _cofficientSetting;
+        private TestReportWindow _testReportWindow;
         private DispatcherTimer _longPressTimer;
 
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            SwitchWindow(ref _testReportWindow, () => new TestReportWindow());
+        }
+
         private void btnCoefficient_PreviewMouseLeftButtonDown(object sender, System.Windows.Input.MouseButtonEventArgs e)
         {
             // 启动长按计时器（1秒）
@@ -1596,6 +1602,7 @@ namespace 建材不燃性试验炉
 
 
 
+
         #endregion
 
         

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

@@ -89,10 +89,10 @@
                                             Width="100"/>
                         <DataGridTextColumn Header="试样名称" 
                                             Binding="{Binding SampleName}" 
-                                            Width="150"/>
+                                            Width="100"/>
                         <DataGridTextColumn Header="试样规格" 
                                             Binding="{Binding SampleSpec}" 
-                                            Width="150"/>
+                                            Width="100"/>
                         <DataGridTextColumn Header="炉内初始温度(℃)" 
                                             Binding="{Binding MaxTemp, StringFormat=\{0:0.0\}}" 
                                             Width="150"/>
@@ -105,12 +105,24 @@
                         <DataGridTextColumn Header="温升(℃)" 
                                             Binding="{Binding TempRise, StringFormat=\{0:0.0\}}" 
                                             Width="100"/>
+                        <DataGridTextColumn Header="试样中心最高温度(℃)" 
+                                            Binding="{Binding MaxTemp, StringFormat=\{0:0.0\}}" 
+                                            Width="160"/>
+                        <DataGridTextColumn Header="试样中心最终温度(℃)" 
+                                            Binding="{Binding FinalTemp, StringFormat=\{0:0.0\}}" 
+                                            Width="160"/>
+                        <DataGridTextColumn Header="试样表面最高温度(℃)" 
+                                            Binding="{Binding MaxTemp, StringFormat=\{0:0.0\}}" 
+                                            Width="160"/>
+                        <DataGridTextColumn Header="试样表面最终温度(℃)" 
+                                            Binding="{Binding FinalTemp, StringFormat=\{0:0.0\}}" 
+                                            Width="160"/>
                         <DataGridTextColumn Header="试样初始质量(g)" 
                                             Binding="{Binding InitialWeight, StringFormat=\{0:0.00\}}" 
                                             Width="150"/>
                         <DataGridTextColumn Header="试样结束质量(g)" 
                                             Binding="{Binding FinalWeight, StringFormat=\{0:0.00\}}" 
-                                            Width="120"/>
+                                            Width="150"/>
                         <DataGridTextColumn Header="质量损失(%)" 
                                             Binding="{Binding LossPercent, StringFormat=\{0:0.00\}%}" 
                                             Width="120"/>

建材不燃性试验炉/data/ReportData.cs

@@ -16,14 +16,22 @@ namespace jiancaiburanxing.data
 
         public string Specs { get; set; }//试验规格
 
-        public float Initialtemperature {  get; set; }//初始温度
+        public float InitialFurnaceTemperature {  get; set; }//炉内初始温度
 
-        public float HighTemperature { get; set; }//最高温度
+        public float HighFurnaceTemperature { get; set; }//炉内最高温度
 
-        public float FinalTemperature { get; set; }//最终温度
+        public float FinalFurnaceTemperature { get; set; }//炉内最终温度
 
         public float TemperatureRise { get; set; }//温升
 
+        public float HighSpecscenterTemperature { get; set; } //试样中心最高温度
+
+        public float FinalSpecscenterTemperature { get; set; }//试样中心最终温度
+
+        public float HighSpecssurfaceTemperature { get; set; }//试样表面最高温度
+
+        public float FinalSpecssurfaceTemperature { get; set; }//试样表面最终温度
+
         public float InitialMass { get; set; }//初始质量
 
         public float FinalMass { get; set; }//结束质量