TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
Tyrone CT
2025-04-26 10:02:53 +08:00
parent 2f80b50e0b
commit 55c9e1c216
6 changed files with 88 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CapMachine.Wpf/Views/CANConfigView.xaml
View File

@@ -569,6 +569,28 @@
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="2"
Orientation="Horizontal">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Foreground="LimeGreen"
Text="&#xe673;" />
<TextBlock
Width="auto"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="自动转速(rpm)" />
<TextBlock
Margin="5,0"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="{Binding CanDriveService.AutoSpeedSv}" />
</StackPanel>
</Grid>
</Grid>

23
CapMachine.Wpf/Views/LINConfigView.xaml
View File

@@ -573,6 +573,29 @@
</StackPanel>
<StackPanel
Grid.Row="1"
Grid.Column="2"
Orientation="Horizontal">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="18"
Foreground="LimeGreen"
Text="&#xe673;" />
<TextBlock
Width="auto"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="自动转速(rpm)" />
<TextBlock
Margin="5,0"
Foreground="LimeGreen"
Style="{StaticResource TextBlockStyle}"
Text="{Binding LinDriveService.AutoSpeedSv}" />
</StackPanel>
</Grid>
</Grid>

2
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -875,7 +875,7 @@
</StackPanel>
</Grid>-->
<materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2">
<ItemsControl IsEnabled="False" ItemsSource="{Binding ListHandSwitchData}">
<ItemsControl IsEnabled="True" ItemsSource="{Binding ListHandSwitchData}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel Orientation="Vertical" />