完善Ymeasure数据UI

B20UVLog/Pages/YMeasureData.xaml

@@ -3,10 +3,16 @@
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-      xmlns:local="clr-namespace:B20UVLog.Pages" xmlns:My="clr-namespace:MyWPFControl.Controls;assembly=MyWPFControl"
+      xmlns:local="clr-namespace:B20UVLog.Pages" 
+      xmlns:My="clr-namespace:MyWPFControl.Controls;assembly=MyWPFControl" 
+      xmlns:viewmodels="clr-namespace:B20UVLog.ViewModels"
+      xmlns:sys="clr-namespace:System;assembly=mscorlib"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Title="YMeasureData">
+    <Page.DataContext>
+        <viewmodels:YMeasureDataViewModel/>
+    </Page.DataContext>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="auto"/>
@@ -24,8 +30,58 @@
             <!--<My:MButton x:Name="BtnExport" Content="导出报表"  Click="BtnExport_Click" Type="Warning"/>-->
         </StackPanel>
         <StackPanel x:Name="DP" Grid.Row="2">
-            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  PageIndexChange="MyPagination_PageIndexChange" IsShowPageSize="False"/>
-            <My:MDataGrid  DockPanel.Dock="Top" AutoGenerateColumns="True"/>
+            <My:MPagination x:Name="MyPagination" DockPanel.Dock="Bottom"  
+                            PageIndexChange="MyPagination_PageIndexChange"
+                            IsShowPageSize="False" IsShowTotalNum="False"
+                            PageSize="11"/>
+
+            <My:MDataGrid ItemsSource="{Binding GridData}" 
+                          VerticalGridLinesBrush="{StaticResource DefaultBorderBrush}"
+                          Stripe="True"
+                          HeadersVisibility="None"
+                          Margin="2 10 2 0"
+                          HorizontalAlignment="Left"
+                          BorderBrush="{StaticResource DefaultBorderBrush}"
+                          BorderThickness="1 1 0 0">
+                <DataGrid.Resources>
+                    <DataGridLength x:Key="ColumnWidth">100</DataGridLength>
+                </DataGrid.Resources>
+                <DataGrid.Columns>
+                    <DataGridTextColumn Binding="{Binding DetermineLocNo}" Width="50"/>
+                    <DataGridTextColumn Binding="{Binding Point1Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point2Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point3Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point4Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point5Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point6Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point7Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point8Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding Point9Value}" Width="{StaticResource ColumnWidth}"/>
+                    <DataGridTextColumn Binding="{Binding RecordTime,StringFormat=yyyy-MM-dd HH:mm:ss}"/>
+                </DataGrid.Columns>
+            </My:MDataGrid>
+            <StackPanel Orientation="Horizontal" Margin="2 5 2 5">
+                <StackPanel.Resources>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="Width" Value="100"/>
+                        <Setter Property="Margin" Value="0"/>
+                        <Setter Property="Padding" Value="5 0 0 0"/>
+                        <Setter Property="FontSize" Value="15"/>
+                        <Setter Property="FontWeight" Value="Bold"/>
+                        <!--<Setter Property="Background" Value="Red"/>-->
+                    </Style>
+                </StackPanel.Resources>
+                <TextBlock Width="50">POS</TextBlock>
+                <TextBlock>Point 1</TextBlock>
+                <TextBlock>Point 2</TextBlock>
+                <TextBlock>Point 3</TextBlock>
+                <TextBlock>Point 4</TextBlock>
+                <TextBlock>Point 5</TextBlock>
+                <TextBlock>Point 6</TextBlock>
+                <TextBlock>Point 7</TextBlock>
+                <TextBlock>Point 8</TextBlock>
+                <TextBlock>Point 9</TextBlock>
+            </StackPanel>
         </StackPanel>
 
     </Grid>

B20UVLog/Windows/DictionarySet.xaml

@@ -30,26 +30,17 @@
                             BorderBrush="{StaticResource DefaultBorderBrushLight}"
                             BorderThickness="{StaticResource DefaultBorderThickness}"
                             Margin="0">
-                        <StackPanel>
-                            <TextBlock x:Name="TextTitle" FontSize="18" Margin="10 10 10 0"/>
-                            <Grid Height="260" Width="300" Margin="10">
-                                <Grid.RowDefinitions>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                    <RowDefinition/>
-                                </Grid.RowDefinitions>
-                                <My:MComboBox x:Name="EditType" Grid.Row="0" Title="选择字典种类">
-                                    <ComboBoxItem>Normal</ComboBoxItem>
-                                    <ComboBoxItem>Alarm</ComboBoxItem>
-                                    <ComboBoxItem>Warn</ComboBoxItem>
-                                </My:MComboBox>
-                                <My:MTextBox x:Name="EditCode" Grid.Row="1" Title="字典编码"/>
-                                <My:MTextBox x:Name="EditKey" Grid.Row="2" Title="字典键"/>
-                                <My:MTextBox x:Name="EditValue" Grid.Row="3" Title="字典值"/>
-                                <My:MButton Grid.Row="4" Type="Primary" Width="{StaticResource DefaultWidth}" Click="MButton_OK_Click">确定</My:MButton>
-                            </Grid>
+                        <StackPanel Margin="20 5 20 20">
+                            <TextBlock x:Name="TextTitle" FontSize="18" Margin="10 10 10 5"/>
+                            <My:MComboBox x:Name="EditType" Grid.Row="0" Title="选择字典种类">
+                                <ComboBoxItem>Normal</ComboBoxItem>
+                                <ComboBoxItem>Alarm</ComboBoxItem>
+                                <ComboBoxItem>Warn</ComboBoxItem>
+                            </My:MComboBox>
+                            <My:MTextBox x:Name="EditCode"  Title="字典编码"/>
+                            <My:MTextBox x:Name="EditKey" Title="字典键"/>
+                            <My:MTextBox x:Name="EditValue" Title="字典值"/>
+                            <My:MButton   Type="Primary" Width="{StaticResource DefaultWidth}" Click="MButton_OK_Click">确定</My:MButton>
                         </StackPanel>
                     </Border>
                 </Popup>