2024-02-27

调整部分界面
2 years ago · bd35d87b9c
parent 374d8267b4 8cbdf5290e
commit bd35d87b9c
3 changed files with 48 additions and 52 deletions
--- a/ReadMe.md
+++ b/ReadMe.md
@ -0,0 +1,26 @@
+Bug修复
+
+2024-02-27
+
+一、实时处理配置
+
+1.添加默认空工区模板，添加到\serverprogram\workarea\目录下，不可删除，以防止在没有工区时系统报错；
+
+2.生成工区配置后，自动生成DataPro.json到工区目录；
+
+3.添加通知到钉钉选项，暂时添加通知事件消息、系统运行监控消息；
+
+
+二、实时波形
+
+1.在剔除某些台站时，报错；
+
+三、波形回放
+
+1.读取波形数据前，清空控件数据；
+
+2.读取数据时，检查数据头的时间，按照数据时间进行对齐；
+
+四、系统
+
+退出系统时，需要确认两次；
--- a/StartServerWPF.Modules.Main/Views/DataProcessView.xaml
+++ b/StartServerWPF.Modules.Main/Views/DataProcessView.xaml
@ -124,25 +124,15 @@
                    <TextBlock Text="事件列表" FontSize="15" VerticalAlignment="Center" />
                    <DataGrid Grid.Row="1" ItemsSource="{Binding ApmsEventSource}"   Background="White"  IsReadOnly="True" AutoGenerateColumns="False">
                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="消息时间" Width="*" MinWidth="160" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
-                            <DataGridTextColumn Header="发震时刻"  Width="*" MinWidth="160" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
-                            <DataGridTextColumn Header="东坐标(m)"
-                                                Width="*"
-                                                MinWidth="160"
-                                                Binding="{Binding EastCoordinate,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="北坐标(m)"
-                                                Width="*"
-                                                MinWidth="160"
-                                                Binding="{Binding NorthCoordinate,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="深度(m)"
-                                                Width="*"
-                                                Binding="{Binding Depth,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="震级(ML)"
-                                                Width="*"
-                                                Binding="{Binding ML,StringFormat=f2}"/>
+                            <DataGridTextColumn Header="消息时间" Width="*"  Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="发震时刻"  Width="*" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/>
+                            <DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
+                            <DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/>
+                            <DataGridTextColumn Header="震级(ML)" Width="*" Binding="{Binding ML}"/>
                            <DataGridTextColumn Header="能量(m)" Width="*" Binding="{Binding Energy}"/>
-                            <DataGridTextColumn Header="震源性质(m)" Width="*" Binding="{Binding }"/>
-                            <!--<DataGridTextColumn Header="发送状态(m)" Width="*" Binding="{Binding IsSend}"/>-->
+                            <DataGridTextColumn Header="震源性质(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
+                            <DataGridTextColumn Header="发送状态(m)" Width="*" Binding="{Binding IsSend}"/>
                        </DataGrid.Columns>
                    </DataGrid>
                </Grid>
--- a/StartServerWPF.Modules.Main/Views/MainView.xaml
+++ b/StartServerWPF.Modules.Main/Views/MainView.xaml
@ -133,23 +133,14 @@
                    <TextBlock Text="实时处理事件" FontSize="15" VerticalAlignment="Center" />
                    <DataGrid Grid.Row="1" ItemsSource="{Binding ApmsEventSource}"   Background="White"  IsReadOnly="True" AutoGenerateColumns="False">
                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="消息时间" Width="*" MinWidth="160" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
-                            <DataGridTextColumn Header="发震时刻"  Width="*" MinWidth="160" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
-                            <DataGridTextColumn Header="东坐标(m)" MinWidth="160" Width="*" Binding="{Binding EastCoordinate,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="北坐标(m)"
-                                                MinWidth="160"
-                                                Width="*"
-                                                Binding="{Binding NorthCoordinate,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="深度(m)"
-                                                Width="*"
-                                                Binding="{Binding Depth,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="震级(ML)"
-                                                Width="*"
-                                                Binding="{Binding ML,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="能量(m)"
-                                                Width="*"
-                                                Binding="{Binding Energy}"/>
-                            <DataGridTextColumn Header="震源性质(m)" Width="*" Binding="{Binding }"/>
+                            <DataGridTextColumn Header="消息时间" Width="*"  Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="发震时刻"  Width="*" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/>
+                            <DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
+                            <DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/>
+                            <DataGridTextColumn Header="震级(ML)" Width="*" Binding="{Binding ML}"/>
+                            <DataGridTextColumn Header="能量(m)" Width="*" Binding="{Binding Energy}"/>
+                            <DataGridTextColumn Header="震源性质(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
                            <DataGridTextColumn Header="发送状态(m)" Width="*" Binding="{Binding IsSend}"/>
                        </DataGrid.Columns>
                    </DataGrid>
@ -164,23 +155,12 @@
                    <TextBlock Text="后处理事件" FontSize="15"/>
                    <DataGrid Grid.Row="1"  ItemsSource="{Binding ToolsEventSource}"  Background="White"  IsReadOnly="True" AutoGenerateColumns="False">
                        <DataGrid.Columns>
-                            <DataGridTextColumn Header="消息时间" Width="*" MinWidth="160" Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
-                            <DataGridTextColumn Header="发震时刻"  Width="*" MinWidth="160" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
-                            <DataGridTextColumn Header="东坐标(m)"
-                                                Width="*"
-                                                MinWidth="160"
-                                                Binding="{Binding EastCoordinate,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="北坐标(m)"
-                                                Width="*"
-                                                MinWidth="160"
-                                                Binding="{Binding NorthCoordinate,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="深度(m)"
-                                                Width="*"
-                                                
-                                                Binding="{Binding Depth,StringFormat=f2}"/>
-                            <DataGridTextColumn Header="震级(ML)"
-                                                Width="*"
-                                                Binding="{Binding ML,StringFormat=f2}"/>
+                            <DataGridTextColumn Header="消息时间" Width="*"  Binding="{Binding CurrentTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="发震时刻"  Width="*" Binding="{Binding OriginTime, StringFormat={}{0:yyyy-MM-dd HH:mm:ss}}"/>
+                            <DataGridTextColumn Header="东坐标(m)" Width="*" Binding="{Binding EastCoordinate}"/>
+                            <DataGridTextColumn Header="北坐标(m)" Width="*" Binding="{Binding NorthCoordinate}"/>
+                            <DataGridTextColumn Header="深度(m)" Width="*" Binding="{Binding Depth}"/>
+                            <DataGridTextColumn Header="震级(ML)" Width="*" Binding="{Binding ML}"/>
                            <DataGridTextColumn Header="能量(m)" Width="*" Binding="{Binding Energy}"/>
                            <DataGridTextColumn Header="震源性质(m)" Width="*" Binding="{Binding EarthquakeSource}"/>
                        </DataGrid.Columns>