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

增加了初始弹窗，但是没有成功

Browse Source 
更改了CAN和LIN协调
更改了配置程序的名称顺序
This commit is contained in:
Tyrone CT
2025-01-11 12:04:34 +08:00
parent 620c5e8178
commit e49a48fb25
53 changed files with 5118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
CapMachine.Wpf/Views/FooterView.xaml
View File

@@ -69,8 +69,51 @@
FontSize="16"
Foreground="White"
Text="{Binding MachineRtDataService.LinkState, Converter={StaticResource BoolOkStrConvert}}" />
<TextBlock
Margin="2,0"
FontSize="16"
Foreground="White"
Text="|" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding ConfigService.PlcCycleTime}" />
</StackPanel>
</Border>
<Border>
<Border.Style>
<Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">
<Style.Triggers>
<DataTrigger Binding="{Binding ConfigService.CanLinRunStateModel.CanLinRunState}" Value="true">
<Setter Property="Background" Value="LimeGreen" />
</DataTrigger>
<DataTrigger Binding="{Binding ConfigService.CanLinRunStateModel.CanLinRunState}" Value="false">
<Setter Property="Background" Value="Gray" />
</DataTrigger>
</Style.Triggers>
</Style>
</Border.Style>
<StackPanel Style="{StaticResource StackPanelStyle}">
<TextBlock
Margin="5,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="16"
Foreground="White"
Text="&#xe832;" />
<TextBlock
FontSize="16"
Foreground="White"
Text="压缩机驱动:" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding ConfigService.CanLinRunStateModel.SelectedCanLinMsg}" />
</StackPanel>
</Border>
<Border>
<Border.Style>
<Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">