|
|
@@ -2502,83 +2502,195 @@
|
|
|
</StackPanel>
|
|
|
</Grid>
|
|
|
<!--刷卡参数配置-->
|
|
|
- <GroupBox Grid.Row="5"
|
|
|
- Grid.ColumnSpan="2"
|
|
|
- Header="刷卡器配置"
|
|
|
- HorizontalAlignment="Left"
|
|
|
- MinWidth="400"
|
|
|
- Margin="0,12,0,0">
|
|
|
- <Grid Margin="10">
|
|
|
- <Grid.ColumnDefinitions>
|
|
|
- <ColumnDefinition Width="auto" />
|
|
|
- <ColumnDefinition Width="*" />
|
|
|
- </Grid.ColumnDefinitions>
|
|
|
- <Grid.RowDefinitions>
|
|
|
- <RowDefinition Height="Auto" />
|
|
|
- <RowDefinition Height="Auto" />
|
|
|
- <RowDefinition Height="Auto" />
|
|
|
- <RowDefinition Height="Auto" />
|
|
|
- <RowDefinition Height="Auto" />
|
|
|
- <RowDefinition Height="Auto" />
|
|
|
- </Grid.RowDefinitions>
|
|
|
- <TextBlock Text="PortName:"
|
|
|
- Grid.Row="0"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
- <TextBox Text="{Binding CardReaderConfig.PortName,Mode=TwoWay}"
|
|
|
- Grid.Row="0"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
- <TextBlock Text="BaudRate:"
|
|
|
- Grid.Row="1"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
- <TextBox Text="{Binding CardReaderConfig.BaudRate,Mode=TwoWay}"
|
|
|
- Grid.Row="1"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
- <TextBlock Text="Parity:"
|
|
|
- Grid.Row="2"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
- <ComboBox Grid.Row="2"
|
|
|
- Grid.Column="1"
|
|
|
- SelectedItem="{Binding CardReaderConfig.Parity,Mode=TwoWay}"
|
|
|
- ItemsSource="{Binding Source={StaticResource Parity}}" />
|
|
|
- <TextBlock Text="StopBits:"
|
|
|
- Grid.Row="3"
|
|
|
- Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
- <ComboBox Grid.Row="3"
|
|
|
- Grid.Column="1"
|
|
|
- SelectedItem="{Binding CardReaderConfig.StopBits,Mode=TwoWay}"
|
|
|
- ItemsSource="{Binding Source={StaticResource StopBits}}" />
|
|
|
- <TextBlock Text="DataBits:"
|
|
|
- Grid.Row="4"
|
|
|
+ <StackPanel Grid.Row="5"
|
|
|
+ Margin="0,12,0,0"
|
|
|
+ Orientation="Horizontal">
|
|
|
+ <!--刷卡参数配置-->
|
|
|
+ <GroupBox Header="刷卡器配置"
|
|
|
+ Width="200"
|
|
|
+ Margin="0,0,20,0"
|
|
|
+ HorizontalAlignment="Left">
|
|
|
+ <Grid Margin="10">
|
|
|
+ <Grid.ColumnDefinitions>
|
|
|
+ <ColumnDefinition Width="auto" />
|
|
|
+ <ColumnDefinition Width="*" />
|
|
|
+ </Grid.ColumnDefinitions>
|
|
|
+ <Grid.RowDefinitions>
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ </Grid.RowDefinitions>
|
|
|
+ <TextBlock Text="PortName:"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding CardReaderConfig.PortName,Mode=TwoWay}"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="BaudRate:"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding CardReaderConfig.BaudRate,Mode=TwoWay}"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="Parity:"
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <ComboBox Grid.Row="2"
|
|
|
+ Grid.Column="1"
|
|
|
+ SelectedItem="{Binding CardReaderConfig.Parity,Mode=TwoWay}"
|
|
|
+ ItemsSource="{Binding Source={StaticResource Parity}}" />
|
|
|
+ <TextBlock Text="StopBits:"
|
|
|
+ Grid.Row="3"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <ComboBox Grid.Row="3"
|
|
|
+ Grid.Column="1"
|
|
|
+ SelectedItem="{Binding CardReaderConfig.StopBits,Mode=TwoWay}"
|
|
|
+ ItemsSource="{Binding Source={StaticResource StopBits}}" />
|
|
|
+ <TextBlock Text="DataBits:"
|
|
|
+ Grid.Row="4"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding CardReaderConfig.DataBits,Mode=TwoWay}"
|
|
|
+ Grid.Row="4"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+
|
|
|
+ <!--<Button Grid.Row="5"
|
|
|
Grid.Column="0"
|
|
|
- HorizontalAlignment="Right" />
|
|
|
- <TextBox Text="{Binding CardReaderConfig.DataBits,Mode=TwoWay}"
|
|
|
- Grid.Row="4"
|
|
|
- Grid.Column="1"
|
|
|
- Margin="6,0" />
|
|
|
-
|
|
|
- <Button Grid.Row="5"
|
|
|
- Grid.Column="1"
|
|
|
- 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>
|
|
|
+ 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="组装保压配置"
|
|
|
+ Margin="0"
|
|
|
+ Width="200">
|
|
|
+ <Grid Margin="10">
|
|
|
+ <Grid.ColumnDefinitions>
|
|
|
+ <ColumnDefinition Width="auto" />
|
|
|
+ <ColumnDefinition Width="*" />
|
|
|
+ <ColumnDefinition Width="auto" />
|
|
|
+ </Grid.ColumnDefinitions>
|
|
|
+ <Grid.RowDefinitions>
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ </Grid.RowDefinitions>
|
|
|
+ <TextBlock Text="保压时间:"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding AssemblyPressureConfig.PressureTime,Mode=TwoWay}"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="ms"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBlock Text="保压压力:"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding AssemblyPressureConfig.PressureNum,Mode=TwoWay}"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="kg"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBlock Text="保压最大值:"
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding AssemblyPressureConfig.PressureNumMax,Mode=TwoWay}"
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="kg"
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ </Grid>
|
|
|
+ </GroupBox>
|
|
|
+ <GroupBox Header="后保压配置"
|
|
|
+ Margin="20,0"
|
|
|
+
|
|
|
+ Width="200">
|
|
|
+ <Grid Margin="10">
|
|
|
+ <Grid.ColumnDefinitions>
|
|
|
+ <ColumnDefinition Width="auto" />
|
|
|
+ <ColumnDefinition Width="*" />
|
|
|
+ <ColumnDefinition Width="auto" />
|
|
|
+ </Grid.ColumnDefinitions>
|
|
|
+ <Grid.RowDefinitions>
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ <RowDefinition Height="Auto" />
|
|
|
+ </Grid.RowDefinitions>
|
|
|
+ <TextBlock Text="保压时间:"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding DownPressureConfig.PressureTime,Mode=TwoWay}"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="ms"
|
|
|
+ Grid.Row="0"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBlock Text="保压压力:"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding DownPressureConfig.PressureNum,Mode=TwoWay}"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="kg"
|
|
|
+ Grid.Row="1"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBlock Text="保压最大值:"
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="0"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ <TextBox Text="{Binding DownPressureConfig.PressureNumMax,Mode=TwoWay}"
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="1"
|
|
|
+ Margin="6,0" />
|
|
|
+ <TextBlock Text="kg"
|
|
|
+ Grid.Row="2"
|
|
|
+ Grid.Column="2"
|
|
|
+ HorizontalAlignment="Right" />
|
|
|
+ </Grid>
|
|
|
+ </GroupBox>
|
|
|
+ </StackPanel>
|
|
|
</StackPanel>
|
|
|
</ScrollViewer>
|
|
|
</TabItem>
|