Merge branch 'master' of http://scddns.f3322.net:13000/sc/Audit_APP

View/QueryView.xaml

@@ -15,7 +15,7 @@
         <Border BorderThickness="0,0,0,1" BorderBrush="#CCCCCC">
         </Border>
         <Grid Grid.Row="1">
-            <DataGrid ItemsSource="{Binding Dyelots}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
+            <DataGrid x:Name="DataGridDyelots" MouseDoubleClick="DataGridDyelot_MouseDoubleClick"  ItemsSource="{Binding Dyelots}" SelectionMode="Single" AlternationCount="2" IsReadOnly="True" HorizontalAlignment="Left" Margin="15,15,0,150" VerticalAlignment="Stretch" Width="320" d:ItemsSource="{d:SampleData ItemCount=100}" AutoGenerateColumns="False" MinColumnWidth="30" HorizontalGridLinesBrush="#FFC9C9C9" VerticalGridLinesBrush="#FFC9C9C9" GridLinesVisibility="All" SelectionChanged="DataGrid_Directory" BorderBrush="#CCCCCC" BorderThickness="1,1,1,1" ColumnHeaderHeight="40" FontSize="15">
                 <DataGrid.RowStyle>
                     <Style TargetType="{x:Type DataGridRow}">
                         <Style.Triggers>
@@ -82,7 +82,7 @@
                     <DataGridTextColumn Header="结束时间" Width="300" FontSize="15" Binding="{Binding FinishTime}"/>
                 </DataGrid.Columns>
             </DataGrid>
-            <TextBox x:Name="Dyelots_Dyelot" HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="250" FontSize="16" MaxLines="1"/>
+            <TextBox x:Name="Dyelots_Dyelot"   HorizontalAlignment="Left" Height="30" Margin="65,0,0,100" TextWrapping="Wrap" Text="{Binding Path=DataGridDyelot_value}" VerticalAlignment="Bottom" Width="250" FontSize="16" MaxLines="1"/>
             <TextBox x:Name="Dyelots_Machine" HorizontalAlignment="Left" Height="30" Margin="200,0,0,50" TextWrapping="Wrap" Text="" VerticalAlignment="Bottom" Width="115" FontSize="16" MaxLines="1"/>
             <DatePicker HorizontalAlignment="Left" Height="30" Margin="450,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>
             <DatePicker HorizontalAlignment="Left" Height="30" Margin="715,0,0,100" VerticalAlignment="Bottom" Width="225" FontSize="16"/>

View/QueryView.xaml.cs

@@ -42,5 +42,11 @@ namespace Audit.View
         {
 
         }
+        private void DataGridDyelot_MouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            int rownum = this.DataGridDyelots.SelectedIndex;
+            string DataGridDyelots_value = (DataGridDyelots.Columns[0].GetCellContent(DataGridDyelots.Items[rownum]) as TextBlock).Text;
+            MessageBox.Show(DataGridDyelots_value.ToString());
+        }
     }
 }

ViewModel/QueryViewModel.cs

@@ -38,4 +38,5 @@ namespace Audit.ViewModel
             dyelots = new DyelotsProvider().Select();
         }
     }
+
 }