|
|
@@ -2642,7 +2642,6 @@ Grid.Row="1">
|
|
|
</StackPanel>
|
|
|
</Grid>
|
|
|
<!--刷卡参数配置-->
|
|
|
- <!--刷卡参数配置-->
|
|
|
<StackPanel Grid.Row="5"
|
|
|
Margin="0,12,0,0"
|
|
|
Orientation="Horizontal">
|
|
|
@@ -2728,7 +2727,7 @@ Grid.Row="1">
|
|
|
Header="扫码机配置"
|
|
|
HorizontalAlignment="Left"
|
|
|
MinWidth="170"
|
|
|
- Margin="0,12,0,0">
|
|
|
+ Margin="0,0,0,0">
|
|
|
<Grid Margin="10">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition Width="auto" />
|
|
|
@@ -2801,29 +2800,10 @@ Grid.Row="1">
|
|
|
</Button>-->
|
|
|
</Grid>
|
|
|
</GroupBox>
|
|
|
- </StackPanel>
|
|
|
- </StackPanel>
|
|
|
- <!--<Button Grid.Row="5"
|
|
|
- Grid.Column="0"
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- Margin="0,6"
|
|
|
- Style="{StaticResource MaterialDesignRaisedButton}"
|
|
|
- materialDesign:ButtonAssist.CornerRadius="10"
|
|
|
- MinWidth="120"
|
|
|
- Command="{Binding SaveCardReaderConfigCommand}">
|
|
|
- <StackPanel Orientation="Horizontal"
|
|
|
- HorizontalAlignment="Center">
|
|
|
- <materialDesign:PackIcon Kind="ContentSaveCheck"
|
|
|
- Margin="0,0,6,0" />
|
|
|
- <TextBlock VerticalAlignment="Center"
|
|
|
- Text="保存刷卡器配置" />
|
|
|
- </StackPanel>
|
|
|
-</Button>-->
|
|
|
- </Grid>
|
|
|
- </GroupBox>
|
|
|
+
|
|
|
<GroupBox Header="A_Camera Assy配置"
|
|
|
- Margin="20,0"
|
|
|
- Width="200">
|
|
|
+ Margin="20,0"
|
|
|
+ Width="200">
|
|
|
<Grid Margin="10">
|
|
|
<Grid.ColumnDefinitions>
|
|
|
<ColumnDefinition Width="auto" />
|
|
|
@@ -2839,65 +2819,65 @@ Grid.Row="1">
|
|
|
<RowDefinition Height="Auto" />
|
|
|
</Grid.RowDefinitions>
|
|
|
<TextBlock Text="保压时间:"
|
|
|
- Grid.Row="0"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBox Text="{Binding DownPressureConfig.PressureTime,Mode=TwoWay}"
|
|
|
- Grid.Row="0"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
<TextBlock Text="ms"
|
|
|
- Grid.Row="0"
|
|
|
- Grid.Column="2"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBlock Text="保压压力:"
|
|
|
- Grid.Row="1"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBox Text="{Binding DownPressureConfig.PressureNum,Mode=TwoWay}"
|
|
|
- Grid.Row="1"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
<TextBlock Text="kg"
|
|
|
- Grid.Row="1"
|
|
|
- Grid.Column="2"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBlock Text="保压最大值:"
|
|
|
- Grid.Row="2"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBox Text="{Binding DownPressureConfig.PressureNumMax,Mode=TwoWay}"
|
|
|
- Grid.Row="2"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
<TextBlock Text="kg"
|
|
|
- Grid.Row="2"
|
|
|
- Grid.Column="2"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBlock Text="保压上限:"
|
|
|
- Grid.Row="4"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="4"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBox Text="{Binding DownPressureConfig.PressureUpLimit,Mode=TwoWay}"
|
|
|
- Grid.Row="4"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
+ Grid.Row="4"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
<TextBlock Text="kg"
|
|
|
- Grid.Row="4"
|
|
|
- Grid.Column="2"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="4"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBlock Text="保压下限:"
|
|
|
- Grid.Row="5"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="5"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
<TextBox Text="{Binding DownPressureConfig.PressureDownLimit,Mode=TwoWay}"
|
|
|
- Grid.Row="5"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
+ Grid.Row="5"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
<TextBlock Text="kg"
|
|
|
- Grid.Row="5"
|
|
|
- Grid.Column="2"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
+ Grid.Row="5"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
</Grid>
|
|
|
</GroupBox>
|
|
|
</StackPanel>
|
