Txgy.CSharp
/
Txgy.EWS.Client
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

报表页增加能量统计显示

Browse Source
master
tayttt 5 days ago
parent 123a676cc8
commit 6ad2e7e227
2 changed files with 180 additions and 109 deletions
Show Stats Download Patch File Download Diff File

46
Txgy.EWS.Client.PageModule/ViewModels/ReportViewModel.cs
Unescape Escape View File

@ -230,6 +230,36 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
SetProperty(ref _searchCount, value); 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; private string _likeCondition;
public string LikeCondition public string LikeCondition
@ -656,9 +686,25 @@ namespace Txgy.EWS.Client.PageModule.ViewModels
} }
} }
SearchCount = results.Count; SearchCount = results.Count;
UpdateEnergyStats(results);
return 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) public void ExportEventListReport(ReportView rView)
{ {
string fileNmae = "微震事件列表_" + DateTime.Now.ToString("yyyyMMdd"); string fileNmae = "微震事件列表_" + DateTime.Now.ToString("yyyyMMdd");

241
Txgy.EWS.Client.PageModule/Views/ReportView.xaml
Unescape Escape View File

@ -38,100 +38,100 @@
<!-- 数据导出 --> <!-- 数据导出 -->
<!--#region 数据导出--> <!--#region 数据导出-->
<!--<md:Card Margin="5,0,5,5" <!--<md:Card Margin="5,0,5,5"
UniformCornerRadius="5" UniformCornerRadius="5"
Background="White"> Background="White">
<StackPanel Margin="10" VerticalAlignment="Center"> <StackPanel Margin="10" VerticalAlignment="Center">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Margin="10" <TextBlock Margin="10"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="起始日期" Text="起始日期"
FontSize="16" /> FontSize="16" />
--> -->
<!--<DatePicker Width="120" SelectedDate="{Binding ReportStartTime}"> <!--<DatePicker Width="120" SelectedDate="{Binding ReportStartTime}">
<DatePicker.Resources> <DatePicker.Resources>
<Style TargetType="DatePicker"> <Style TargetType="DatePicker">
<Setter Property="BorderThickness" Value="0" /> <Setter Property="BorderThickness" Value="0" />
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate> <ControlTemplate>
<TextBox x:Name="PART_TextBox" Text="{Binding Path=SelectedDate, StringFormat={}{0:yyyy年MM月dd日}, RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" /> <TextBox x:Name="PART_TextBox" Text="{Binding Path=SelectedDate, StringFormat={}{0:yyyy年MM月dd日}, RelativeSource={RelativeSource AncestorType={x:Type DatePicker}}}" />
</ControlTemplate> </ControlTemplate>
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
</DatePicker.Resources> </DatePicker.Resources>
</DatePicker>--> </DatePicker>-->
<!-- <!--
<hc:DatePicker Width="140" <hc:DatePicker Width="140"
Height="36" Height="36"
Margin="10,0" Margin="10,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
DisplayDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}" DisplayDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}"
SelectedDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}" /> SelectedDate="{Binding ReportStartTime, StringFormat={}{0:yyyy-MM-dd}}" />
<TextBlock Margin="10" <TextBlock Margin="10"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="结束日期" Text="结束日期"
FontSize="16" /> FontSize="16" />
<hc:DatePicker Width="140" <hc:DatePicker Width="140"
Height="36" Height="36"
Margin="10,0" Margin="10,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
DisplayDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}" DisplayDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}"
SelectedDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}"> SelectedDate="{Binding ReportEndTime, StringFormat={}{0:yyyy-MM-dd}}">
</hc:DatePicker> </hc:DatePicker>
</StackPanel> </StackPanel>
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<TextBlock Margin="10" <TextBlock Margin="10"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="最小震级" Text="最小震级"
FontSize="16" /> FontSize="16" />
<hc:NumericUpDown Width="78" <hc:NumericUpDown Width="78"
Margin="10" Margin="10"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
Foreground="#FF673Ab7" Foreground="#FF673Ab7"
DecimalPlaces="2" DecimalPlaces="2"
Increment="0.1" Increment="0.1"
Maximum="0" Maximum="0"
Minimum="-3.0" Minimum="-3.0"
Value="{Binding ReportMinML}" /> Value="{Binding ReportMinML}" />
<TextBlock Margin="10,0,10,0" <TextBlock Margin="10,0,10,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="最大震级" Text="最大震级"
FontSize="16" /> FontSize="16" />
<hc:NumericUpDown Width="78" <hc:NumericUpDown Width="78"
Margin="10" Margin="10"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
Foreground="#FF673Ab7" Foreground="#FF673Ab7"
DecimalPlaces="2" DecimalPlaces="2"
Increment="0.1" Increment="0.1"
Maximum="0" Maximum="0"
Minimum="-3.0" Minimum="-3.0"
Value="{Binding ReportMaxML}" /> Value="{Binding ReportMaxML}" />
<TextBlock Margin="10,0,10,0" <TextBlock Margin="10,0,10,0"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" VerticalAlignment="Center"
Text="中等能量" Text="中等能量"
FontSize="16" /> FontSize="16" />
<TextBox Width="60" <TextBox Width="60"
Margin="10,0,0,0" Margin="10,0,0,0"
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
Foreground="#FF673Ab7" Foreground="#FF673Ab7"
Text="{Binding MiddleEnergy}" Text="{Binding MiddleEnergy}"
TextAlignment="Right" /> TextAlignment="Right" />
<TextBlock VerticalAlignment="Center" Text="J" /> <TextBlock VerticalAlignment="Center" Text="J" />
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</md:Card>--> </md:Card>-->
<!--#endregion--> <!--#endregion-->
<!-- 数据筛选 --> <!-- 数据筛选 -->
@ -484,23 +484,7 @@
Content="月报" Content="月报"
FontSize="16" FontSize="16"
Style="{StaticResource MaterialDesignRaisedDarkButton}" /> 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" <Button Grid.Row="1"
Grid.Column="3" Grid.Column="3"
Width="70" Width="70"
@ -512,12 +496,53 @@
CommandParameter="{Binding ElementName=rView}" /> CommandParameter="{Binding ElementName=rView}" />
</Grid> </Grid>
</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>
</StackPanel> </StackPanel>
</md:Card> </md:Card>
<!--<md:Card Margin="5,0,5,5" <!--<md:Card Margin="5,0,5,5"
UniformCornerRadius="5" UniformCornerRadius="5"
Background="White"></md:Card>--> Background="White"></md:Card>-->
<!--#region 事件列表--> <!--#region 事件列表-->
<md:Card Grid.Row="2" <md:Card Grid.Row="2"
Margin="5" Margin="5"

Write Preview
Loading…
Cancel
Save