|
|
@@ -83,18 +83,67 @@
|
|
|
CanUserAddRows="False"
|
|
|
IsReadOnly="True">
|
|
|
<DataGrid.Columns>
|
|
|
+ <DataGridTextColumn Header="Id"
|
|
|
+ Binding="{Binding Id}"
|
|
|
+ Width="50" />
|
|
|
<DataGridTextColumn Header="CaptureTime"
|
|
|
- Binding="{Binding CaptureTime, StringFormat=yyyy-MM-dd HH:mm:ss}" />
|
|
|
- <DataGridTextColumn Header="RecipeName"
|
|
|
+ Binding="{Binding CaptureTime, StringFormat=yyyy-MM-dd HH:mm:ss}"/>
|
|
|
+ <DataGridTextColumn Header="配方名"
|
|
|
Binding="{Binding RecipeName}" />
|
|
|
- <DataGridTextColumn Header="CameraName"
|
|
|
+ <DataGridTextColumn Header="流程名"
|
|
|
+ Binding="{Binding ProcessName}" />
|
|
|
+ <DataGridTextColumn Header="相机名"
|
|
|
Binding="{Binding CameraName}" />
|
|
|
- <DataGridTextColumn Header="ProductSN"
|
|
|
+ <DataGridTextColumn Header="产品SN"
|
|
|
Binding="{Binding ProductSN}" />
|
|
|
- <DataGridTextColumn Header="Result"
|
|
|
- Binding="{Binding Result}" />
|
|
|
- <DataGridTextColumn Header="ImagePath"
|
|
|
+ <!-- Changed to TemplateColumn to show OK/NG with color -->
|
|
|
+ <DataGridTemplateColumn Header="是否成功"
|
|
|
+ Width="85">
|
|
|
+ <DataGridTemplateColumn.CellTemplate>
|
|
|
+ <DataTemplate>
|
|
|
+ <Border CornerRadius="4"
|
|
|
+ Padding="2"
|
|
|
+ HorizontalAlignment="Center"
|
|
|
+ VerticalAlignment="Center">
|
|
|
+ <TextBlock HorizontalAlignment="Center"
|
|
|
+ VerticalAlignment="Center"
|
|
|
+ Foreground="White"
|
|
|
+ FontWeight="Bold"
|
|
|
+ TextAlignment="Center">
|
|
|
+ <TextBlock.Style>
|
|
|
+ <Style TargetType="TextBlock">
|
|
|
+ <Setter Property="Text"
|
|
|
+ Value="OK" />
|
|
|
+ <Setter Property="Background"
|
|
|
+ Value="Green" />
|
|
|
+ <Style.Triggers>
|
|
|
+ <DataTrigger Binding="{Binding IsSuccess}"
|
|
|
+ Value="False">
|
|
|
+ <Setter Property="Text"
|
|
|
+ Value="NG" />
|
|
|
+ <Setter Property="Background"
|
|
|
+ Value="Red" />
|
|
|
+ </DataTrigger>
|
|
|
+ </Style.Triggers>
|
|
|
+ </Style>
|
|
|
+ </TextBlock.Style>
|
|
|
+ </TextBlock>
|
|
|
+ </Border>
|
|
|
+ </DataTemplate>
|
|
|
+ </DataGridTemplateColumn.CellTemplate>
|
|
|
+ </DataGridTemplateColumn>
|
|
|
+ <DataGridTextColumn Header="机器人位置"
|
|
|
+ Binding="{Binding RobotPosition}" />
|
|
|
+ <DataGridTextColumn Header="像素坐标"
|
|
|
+ Binding="{Binding PixelPosition}"/>
|
|
|
+ <DataGridTextColumn Header="绝对坐标"
|
|
|
+ Binding="{Binding AbsolutePosition}" />
|
|
|
+ <DataGridTextColumn Header="图片路径"
|
|
|
Binding="{Binding ImagePath}" />
|
|
|
+ <DataGridTextColumn Header="操作员"
|
|
|
+ Binding="{Binding OperatorName}"/>
|
|
|
+ <DataGridTextColumn Header="备注"
|
|
|
+ Binding="{Binding Remarks}" />
|
|
|
</DataGrid.Columns>
|
|
|
</DataGrid>
|
|
|
<StackPanel Grid.Row="3"
|