每个页面增加Title；

数据显示时间倒序；

B20UVLog/MainWindow.xaml

@@ -20,7 +20,7 @@
         <Menu Grid.Row="0">
             <MenuItem Header="基础配置">
                 <MenuItem.Icon>
-                    <TextBlock Text="{DynamicResource Icon-cog}" Style="{DynamicResource IconStyle}"/>
+                    <My:MIcon Kind="CogOutline"/>
                 </MenuItem.Icon>
                 <MenuItem Header="数据库配置" Command="{Binding MenuItemClickCommand}" CommandParameter="db"/>
                 <MenuItem Header="PLC配置" Command="{Binding MenuItemClickCommand}" CommandParameter="plc"/>
@@ -28,8 +28,9 @@
             </MenuItem>
             <MenuItem Header="关于">
                 <MenuItem.Icon>
-                    <TextBlock Text="{DynamicResource Icon-question-circle}" Style="{DynamicResource IconStyle}"/>
-                </MenuItem.Icon></MenuItem>
+                    <My:MIcon Kind="HelpCircleOutline"/>
+                </MenuItem.Icon>
+            </MenuItem>
         </Menu>
         <Grid Grid.Row="1">
             <Grid.ColumnDefinitions>

B20UVLog/Pages/ANALogData.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="ANALog Data" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="ANALog Data" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/Alarm.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Axis Data" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Alarm And Warn" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/AxisData.xaml

@@ -18,7 +18,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Axis Data" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Axis Data" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <My:MComboBox SelectedIndex="{Binding DataGroupIndex}" Title="请选择数据组" SelectionChanged="MComboBox_SelectionChanged">
                 <ComboBoxItem>WSZ1,2,3,4</ComboBoxItem>

B20UVLog/Pages/EQPStatus.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="EQP Status" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="EQP Status" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/GlassInformation.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Glass Information" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Glass Information" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/IO.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="IO" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="IO" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <My:MTextBox Title="IO点名称" Text="{Binding IONameQuery}"/>
             <My:MTextBox Title="IO点类型" Text="{Binding IOTypeQuery}"/>

B20UVLog/Pages/LampData.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="IO" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Lamp Data" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/LampUseTime.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Lamp Use Time" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Lamp Use Time" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/RecipeBody.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Recipe Body" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Recipe Body" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/RecipeCount.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Recipe Count" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Recipe Count" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/RobotInterfaceIn.xaml

@@ -16,14 +16,17 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
-            <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
-            <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>
-            <TextBlock Text="--" VerticalAlignment="Center" Margin="2"/>
-            <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
-            <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
-            <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+        <StackPanel Grid.Row="0">
+            <TextBlock Text="Robot In" FontSize="25" Margin="10 5"/>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
+                <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>
+                <TextBlock Text="--" VerticalAlignment="Center" Margin="2"/>
+                <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
+                <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
+                <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
+                <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            </StackPanel>
         </StackPanel>
         <My:MPagination Grid.Row="1" x:Name="MyPagination" PageSize="1" PageIndexChange="MyPagination_PageIndexChange" IsShowTotalNum="False" IsShowPageSize="False"/>
         <StackPanel x:Name="DP" Grid.Row="2">

B20UVLog/Pages/RobotInterfaceOut.xaml

@@ -16,14 +16,17 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
-            <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
-            <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>
-            <TextBlock Text="--" VerticalAlignment="Center" Margin="2"/>
-            <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
-            <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
-            <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+        <StackPanel Grid.Row="0">
+            <TextBlock Text="Robot Out" FontSize="25" Margin="10 5"/>
+            <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
+                <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>
+                <TextBlock Text="--" VerticalAlignment="Center" Margin="2"/>
+                <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
+                <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
+                <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
+                <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+            </StackPanel>
         </StackPanel>
         <My:MPagination Grid.Row="1" x:Name="MyPagination" PageSize="1" PageIndexChange="MyPagination_PageIndexChange" IsShowTotalNum="False" IsShowPageSize="False"/>
         <StackPanel x:Name="DP" Grid.Row="2">

B20UVLog/Pages/SYSPara.xaml

@@ -16,20 +16,23 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <StackPanel Grid.Row="0" Orientation="Horizontal" VerticalAlignment="Center">
-            <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
-            <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>
-            <TextBlock Text="--" VerticalAlignment="Center" Margin="2"/>
-            <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
-            <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
-            <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
-            <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
-        </StackPanel>
-        <StackPanel x:Name="DP" Grid.Row="1">
-            <My:MPagination x:Name="MyPagination" PageSize="1" 
+        <StackPanel Orientation="Horizontal" Grid.Row="1">
+
+            <TextBlock Text="SYS Para" FontSize="25" Margin="10 5 30 5"/>
+            <StackPanel x:Name="DP" >
+                <StackPanel Orientation="Horizontal" VerticalAlignment="Center">
+                    <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>
+                    <TextBlock Text="--" VerticalAlignment="Center" Margin="2"/>
+                    <My:MDateTimePicker x:Name="DTPEnd" Title="结束时间"/>
+                    <My:MButton x:Name="BtnSearch" Content="查询" Type="Primary"  Click="BtnSearch_Click"/>
+                    <My:MButton x:Name="BtnReset" Content="条件重置"  Click="BtnReset_Click"/>
+                    <My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>
+                </StackPanel>
+                <My:MPagination x:Name="MyPagination" PageSize="1" 
                             PageIndexChange="MyPagination_PageIndexChange" 
                             IsShowPageSize="False"
                             IsShowTotalNum="False"/>
+            </StackPanel>
         </StackPanel>
         <WrapPanel Grid.Row="2" Orientation="Vertical" Margin="10 10 0 0" IsHitTestVisible="False" DataContext="{Binding GridData}">
             <WrapPanel.Resources>

B20UVLog/Pages/ServoAxisStatus.xaml

@@ -16,7 +16,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Servo Axis Status" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Servo Axis Status" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <My:MComboBox SelectedItem="{Binding AxisName}" ItemsSource="{Binding AxisNames}" SelectionChanged="MComboBox_SelectionChanged"/>
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>

B20UVLog/Pages/YMeasureData.xaml

@@ -19,7 +19,7 @@
             <RowDefinition Height="auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
-        <!--<TextBlock Grid.Row="0" Text="Y Measure Data" FontSize="25" Margin="10 5"/>-->
+        <TextBlock Grid.Row="0" Text="Y Measure Data" FontSize="25" Margin="10 5"/>
         <StackPanel Grid.Row="1" Orientation="Horizontal" VerticalAlignment="Center">
             <!--<My:MTextBox x:Name="TextIndex" Title="Index_No"/>-->
             <My:MDateTimePicker x:Name="DTPStart" Title="开始时间"/>