|
@@ -150,9 +150,9 @@
|
|
|
<TextBlock Text="前置项明细:" Style="{StaticResource textBlockStyle}" />
|
|
|
<Button Content="新增" Height="22" Width="60" Margin="5,0" Command="{Binding AddDetailCommand}" CommandParameter="Before" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
|
|
|
</DockPanel>
|
|
|
- <DataGrid Grid.Row="1" ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False" SelectionUnit="FullRow" SelectionMode="Single" RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
|
|
|
+ <DataGrid Grid.Row="1" Style="{StaticResource MyDataGridSyle}"
|
|
|
ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" x:Name="DeviceDataGrid" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}" AlternationCount="2"
|
|
|
- ItemsSource="{Binding BeforeConList}" IsReadOnly="True" Padding="0" >
|
|
|
+ ItemsSource="{Binding BeforeConList}" >
|
|
|
<DataGrid.Columns >
|
|
|
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
@@ -234,9 +234,9 @@ Command="{Binding DataContext.DeleteBeforeCommand, RelativeSource={RelativeSourc
|
|
|
<TextBlock Text="输入项明细:" Style="{StaticResource textBlockStyle}" />
|
|
|
<Button Content="新增" Height="22" Width="60" Margin="5,0" Command="{Binding AddDetailCommand}" CommandParameter="In" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
|
|
|
</DockPanel>
|
|
|
- <DataGrid Grid.Row="1" ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False" SelectionUnit="FullRow" SelectionMode="Single" RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
|
|
|
- ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}" AlternationCount="2"
|
|
|
- ItemsSource="{Binding InConList}" IsReadOnly="True" Padding="0" >
|
|
|
+ <DataGrid Grid.Row="1" Style="{StaticResource MyDataGridSyle}"
|
|
|
+ ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}" AlternationCount="2"
|
|
|
+ ItemsSource="{Binding InConList}" >
|
|
|
<DataGrid.Columns >
|
|
|
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
@@ -322,9 +322,9 @@ Command="{Binding DataContext.DeleteInCommand, RelativeSource={RelativeSource Mo
|
|
|
<TextBlock Text="结果项明细:" Style="{StaticResource textBlockStyle}" />
|
|
|
<Button Content="新增" Height="22" Width="60" Margin="5,0" Command="{Binding AddDetailCommand}" CommandParameter="Out" Style="{StaticResource NormalButtonStyle}" DockPanel.Dock="Right" />
|
|
|
</DockPanel>
|
|
|
- <DataGrid Grid.Row="1" ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False" SelectionUnit="FullRow" SelectionMode="Single" RowHeaderWidth="0" HorizontalScrollBarVisibility="Disabled"
|
|
|
+ <DataGrid Grid.Row="1" Style="{StaticResource MyDataGridSyle}"
|
|
|
ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}" AlternationCount="2"
|
|
|
- ItemsSource="{Binding OutConList}" IsReadOnly="True" Padding="0" >
|
|
|
+ ItemsSource="{Binding OutConList}" >
|
|
|
<DataGrid.Columns >
|
|
|
<DataGridTextColumn Header="序号" Width="40" Binding="{Binding Id}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
|
<DataGridTextColumn Header="PLC地址" Binding="{Binding PlcAddress}" CellStyle="{StaticResource MyDataGridCellStyle}" />
|
|
@@ -377,9 +377,9 @@ Command="{Binding DataContext.DeleteOutCommand, RelativeSource={RelativeSource M
|
|
|
<TextBlock Text="▊" TextAlignment="Center" VerticalAlignment="Center" Foreground="#409EFF" Margin="5,0,5,0"/>
|
|
|
<TextBlock Text="已添加测试项列表" Style="{StaticResource NormalTextBlockStyle}" Margin="0,0,5,0"/>
|
|
|
</StackPanel>
|
|
|
- <DataGrid ColumnWidth="*" AutoGenerateColumns="False" HeadersVisibility="All" CanUserAddRows="False" SelectionUnit="FullRow" SelectionMode="Single" RowHeaderWidth="0"
|
|
|
+ <DataGrid Style="{StaticResource MyDataGridSyle}"
|
|
|
ColumnHeaderStyle="{StaticResource ColumnHeaderStyle}" RowHeaderStyle="{StaticResource RowHeaderStyle}" RowStyle="{StaticResource DataGridRowtyle}" AlternationCount="2"
|
|
|
-ItemsSource="{Binding SchProjectList}" IsReadOnly="True" Margin="5" Padding="0" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" >
|
|
|
+ItemsSource="{Binding SchProjectList}" VerticalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible" >
|
|
|
<b:Interaction.Triggers>
|
|
|
<b:EventTrigger EventName="SelectionChanged">
|
|
|
<b:InvokeCommandAction Command="{Binding DgSelectChangeCommand}"
|