From 6ad2e7e227d2357c8629c4211108d9bf9d42e0c2 Mon Sep 17 00:00:00 2001
From: tayttt <tayttt2018@hotmail.com>
Date: Thu, 28 May 2026 05:23:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E9=A1=B5=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=83=BD=E9=87=8F=E7=BB=9F=E8=AE=A1=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/ReportViewModel.cs             |  48 +++-
 .../Views/ReportView.xaml                     | 241 ++++++++++--------
 2 files changed, 180 insertions(+), 109 deletions(-)

diff --git a/Txgy.EWS.Client.PageModule/ViewModels/ReportViewModel.cs b/Txgy.EWS.Client.PageModule/ViewModels/ReportViewModel.cs
index e419bd9..625bffc 100644
--- a/Txgy.EWS.Client.PageModule/ViewModels/ReportViewModel.cs
+++ b/Txgy.EWS.Client.PageModule/ViewModels/ReportViewModel.cs
@@ -230,6 +230,36 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
                 SetProperty(ref _searchCount, value);
             }
         }
+        private double _totalEnergy = 0;
+
+        public double TotalEnergy
+        {
+            get { return _totalEnergy; }
+            set
+            {
+                SetProperty(ref _totalEnergy, value);
+            }
+        }
+        private double _averageEnergy = 0;
+
+        public double AverageEnergy
+        {
+            get { return _averageEnergy; }
+            set
+            {
+                SetProperty(ref _averageEnergy, value);
+            }
+        }
+        private double _maxEnergy = 0;
+
+        public double MaxEnergy
+        {
+            get { return _maxEnergy; }
+            set
+            {
+                SetProperty(ref _maxEnergy, value);
+            }
+        }
         private string _likeCondition;
 
         public string LikeCondition
@@ -332,7 +362,7 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
                 //日报起始时刻
                 DateTime drstarttime = GlobalConfig.DailyReportStartTime;
                 Console.WriteLine(GlobalConfig.DailyReportStartTime.ToString());
-                DateTime st = new DateTime(TimeFC.Cond1.Year, TimeFC.Cond1.Month, TimeFC.Cond1.Day, 
+                DateTime st = new DateTime(TimeFC.Cond1.Year, TimeFC.Cond1.Month, TimeFC.Cond1.Day,
                     drstarttime.Hour, drstarttime.Minute, drstarttime.Second);
 
                 var results = SearchEvents(st, st.AddSeconds(86399));
@@ -656,8 +686,24 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
                 }
             }
             SearchCount = results.Count;
+            UpdateEnergyStats(results);
             return results;
         }
+
+        private void UpdateEnergyStats(List<GridItemEventResult> results)
+        {
+            if (results == null || results.Count == 0)
+            {
+                TotalEnergy = 0;
+                AverageEnergy = 0;
+                MaxEnergy = 0;
+                return;
+            }
+
+            TotalEnergy = Math.Round(results.Sum(rs => rs.Energy), 2);
+            AverageEnergy = Math.Round(results.Average(rs => rs.Energy), 2);
+            MaxEnergy = Math.Round(results.Max(rs => rs.Energy), 2);
+        }
         
         public void ExportEventListReport(ReportView rView)
         {
diff --git a/Txgy.EWS.Client.PageModule/Views/ReportView.xaml b/Txgy.EWS.Client.PageModule/Views/ReportView.xaml
index 0d7a33d..7c7c29e 100644
--- a/Txgy.EWS.Client.PageModule/Views/ReportView.xaml
+++ b/Txgy.EWS.Client.PageModule/Views/ReportView.xaml
@@ -38,100 +38,100 @@
         <!-- 数据导出 -->
         <!--#region 数据导出-->
         <!--<md:Card Margin="5,0,5,5"
-                 UniformCornerRadius="5"
-                 Background="White">
-            <StackPanel Margin="10" VerticalAlignment="Center">
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Margin="10"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Text="起始日期"
-                               FontSize="16" />
+        UniformCornerRadius="5"
+        Background="White">
+        <StackPanel Margin="10" VerticalAlignment="Center">
+        <StackPanel Orientation="Horizontal">
+        <TextBlock Margin="10"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Text="起始日期"
+        FontSize="16" />
 
         -->
         <!--<DatePicker Width="120" SelectedDate="{Binding ReportStartTime}">
-                        <DatePicker.Resources>
-                            <Style TargetType="DatePicker">
-                                <Setter Property="BorderThickness" Value="0" />
-                                <Setter Property="Template">
-                                    <Setter.Value>
-                                        <ControlTemplate>
-                                            <TextBox x:Name="PART_TextBox" Text="{Binding Path=SelectedDate, StringFormat={}{0:yyyy年MM月dd日}, RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" />
-                                        </ControlTemplate>
-                                    </Setter.Value>
-                                </Setter>
-                            </Style>
-                        </DatePicker.Resources>
-                    </DatePicker>-->
+        <DatePicker.Resources>
+        <Style TargetType="DatePicker">
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="Template">
+        <Setter.Value>
+        <ControlTemplate>
+        <TextBox x:Name="PART_TextBox" Text="{Binding Path=SelectedDate, StringFormat={}{0:yyyy年MM月dd日}, RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" />
+        </ControlTemplate>
+        </Setter.Value>
+        </Setter>
+        </Style>
+        </DatePicker.Resources>
+        </DatePicker>-->
         <!--
-                    <hc:DatePicker Width="140"
-                                   Height="36"
-                                   Margin="10,0"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center"
-                                   DisplayDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}"
-                                   SelectedDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}" />
-                    <TextBlock Margin="10"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Text="结束日期"
-                               FontSize="16" />
-                    <hc:DatePicker Width="140"
-                                   Height="36"
-                                   Margin="10,0"
-                                   HorizontalAlignment="Center"
-                                   VerticalAlignment="Center"
-                                   DisplayDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}"
-                                   SelectedDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}">
+        <hc:DatePicker Width="140"
+        Height="36"
+        Margin="10,0"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        DisplayDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}"
+        SelectedDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}" />
+        <TextBlock Margin="10"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Text="结束日期"
+        FontSize="16" />
+        <hc:DatePicker Width="140"
+        Height="36"
+        Margin="10,0"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        DisplayDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}"
+        SelectedDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}">
 
-                    </hc:DatePicker>
-                </StackPanel>
-                <StackPanel Orientation="Horizontal">
-                    <TextBlock Margin="10"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Text="最小震级"
-                               FontSize="16" />
-                    <hc:NumericUpDown Width="78"
-                                      Margin="10"
-                                      VerticalAlignment="Center"
-                                      FontSize="12"
-                                      Foreground="#FF673Ab7"
-                                      DecimalPlaces="2"
-                                      Increment="0.1"
-                                      Maximum="0"
-                                      Minimum="-3.0"
-                                      Value="{Binding ReportMinML}" />
-                    <TextBlock Margin="10,0,10,0"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Text="最大震级"
-                               FontSize="16" />
-                    <hc:NumericUpDown Width="78"
-                                      Margin="10"
-                                      VerticalAlignment="Center"
-                                      FontSize="12"
-                                      Foreground="#FF673Ab7"
-                                      DecimalPlaces="2"
-                                      Increment="0.1"
-                                      Maximum="0"
-                                      Minimum="-3.0"
-                                      Value="{Binding ReportMaxML}" />
-                    <TextBlock Margin="10,0,10,0"
-                               HorizontalAlignment="Center"
-                               VerticalAlignment="Center"
-                               Text="中等能量"
-                               FontSize="16" />
-                    <TextBox Width="60"
-                             Margin="10,0,0,0"
-                             VerticalAlignment="Center"
-                             FontSize="12"
-                             Foreground="#FF673Ab7"
-                             Text="{Binding MiddleEnergy}"
-                             TextAlignment="Right" />
-                    <TextBlock VerticalAlignment="Center" Text="J" />
-                </StackPanel>
-            </StackPanel>
+        </hc:DatePicker>
+        </StackPanel>
+        <StackPanel Orientation="Horizontal">
+        <TextBlock Margin="10"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Text="最小震级"
+        FontSize="16" />
+        <hc:NumericUpDown Width="78"
+        Margin="10"
+        VerticalAlignment="Center"
+        FontSize="12"
+        Foreground="#FF673Ab7"
+        DecimalPlaces="2"
+        Increment="0.1"
+        Maximum="0"
+        Minimum="-3.0"
+        Value="{Binding ReportMinML}" />
+        <TextBlock Margin="10,0,10,0"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Text="最大震级"
+        FontSize="16" />
+        <hc:NumericUpDown Width="78"
+        Margin="10"
+        VerticalAlignment="Center"
+        FontSize="12"
+        Foreground="#FF673Ab7"
+        DecimalPlaces="2"
+        Increment="0.1"
+        Maximum="0"
+        Minimum="-3.0"
+        Value="{Binding ReportMaxML}" />
+        <TextBlock Margin="10,0,10,0"
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        Text="中等能量"
+        FontSize="16" />
+        <TextBox Width="60"
+        Margin="10,0,0,0"
+        VerticalAlignment="Center"
+        FontSize="12"
+        Foreground="#FF673Ab7"
+        Text="{Binding MiddleEnergy}"
+        TextAlignment="Right" />
+        <TextBlock VerticalAlignment="Center" Text="J" />
+        </StackPanel>
+        </StackPanel>
         </md:Card>-->
         <!--#endregion-->
         <!-- 数据筛选 -->
@@ -484,23 +484,7 @@
                                     Content="月报"
                                     FontSize="16"
                                     Style="{StaticResource MaterialDesignRaisedDarkButton}" />
-                            <StackPanel Grid.Row="1"
-                                        Grid.ColumnSpan="3"
-                                        VerticalAlignment="Center"
-                                        Orientation="Horizontal">
-                                <TextBlock VerticalAlignment="Center" Text="事件总数：" FontSize="16" />
-                                <TextBlock VerticalAlignment="Center"
-                                           d:Text="11142"
-                                           Foreground="Black"
-                                           Text="{Binding SearchCount}"
-                                           FontSize="16" />
-                                <TextBlock Margin="10,0,0,0" Text="中等能量事件：" FontSize="16" />
-                                <TextBlock d:Text="1000"
-                                           Foreground="Black"
-                                           FontSize="16"
-                                           Text="{Binding MiddleEventCount}"
-                                           Cursor="" />
-                            </StackPanel>
+
                             <Button Grid.Row="1"
                                     Grid.Column="3"
                                     Width="70"
@@ -512,12 +496,53 @@
                                     CommandParameter="{Binding ElementName=rView}" />
                         </Grid>
                     </Grid>
+                    <StackPanel Margin="20,0,20,10">
+                        <WrapPanel Margin="20,0,0,10"
+                                   VerticalAlignment="Center">
+                            <TextBlock VerticalAlignment="Center" Text="事件总数：" FontSize="16" />
+                            <TextBlock VerticalAlignment="Center"
+                                       d:Text="11142"
+                                       Width="60"
+                                       Foreground="Black"
+                                       FontWeight="SemiBold"
+                                       Text="{Binding SearchCount}"
+                                       FontSize="16" />
+                            <TextBlock Margin="10,0,0,0" Text="中等能量事件：" FontSize="16" />
+                            <TextBlock d:Text="1000"
+                                       Foreground="Black"
+                                       FontSize="16"
+                                       Width="60"
+                                       FontWeight="SemiBold"
+                                       Text="{Binding MiddleEventCount}"
+                                       Cursor="" />
+                            <TextBlock Text="总能量：" FontSize="16" />
+                            <TextBlock Foreground="Black"
+                                       FontSize="16"
+                                       Width="80"
+                                       FontWeight="SemiBold"
+                                       Text="{Binding TotalEnergy, StringFormat={}{0:F0}J}" />
+                            <TextBlock Margin="20,0,0,0" Text="平均能量：" FontSize="16" />
+                            <TextBlock Foreground="Black"
+                                       FontSize="16"
+                                       Width="60"
+                                       d:Text="11111J"
+                                       FontWeight="SemiBold"
+                                       Text="{Binding AverageEnergy, StringFormat={}{0:F0}J}" />
+                            <TextBlock Margin="20,0,0,0" Text="最大能量：" FontSize="16" />
+                            <TextBlock Foreground="Black"
+                                       FontSize="16"
+                                       FontWeight="SemiBold"
+                                       Width="60"
+                                       Text="{Binding MaxEnergy, StringFormat={}{0:F0}J}" />
+                        </WrapPanel>
+                    </StackPanel>
                 </StackPanel>
+
             </StackPanel>
         </md:Card>
         <!--<md:Card Margin="5,0,5,5"
-                 UniformCornerRadius="5"
-                 Background="White"></md:Card>-->
+        UniformCornerRadius="5"
+        Background="White"></md:Card>-->
         <!--#region 事件列表-->
         <md:Card Grid.Row="2"
                  Margin="5"