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-01-21 18:35:00 +08:00
parent 914a8b3dbc
commit 0bbe361ab7
23 changed files with 536 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -346,7 +346,7 @@
Command="{Binding OperCmd}"
CommandParameter="开始"
GroupName="OpRunStop"
IsChecked="False"
IsChecked="{Binding MachineRtDataService.SysExdBoolInfos.StartRunStateQuickTag.Value}"
Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}">
<RadioButton.Content>
<StackPanel Orientation="Horizontal">
@@ -415,6 +415,22 @@
<TextBlock Text="复位" />
</StackPanel>
</Button>
<Button
Margin="5,0"
Command="{Binding OperCmd}"
CommandParameter="暂停"
Foreground="White">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="2,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="14"
Foreground="White"
Text="&#xe75b;" />
<TextBlock Text="暂停" />
</StackPanel>
</Button>
<Button
Margin="5,0"
Command="{Binding OperCmd}"
@@ -447,12 +463,12 @@
<TextBlock Text="试验信息" />
</StackPanel>
</Button>
<Button
<!--<Button
Margin="5,0"
Command="{x:Static materialDesign:DrawerHost.OpenDrawerCommand}"
CommandParameter="{x:Static Dock.Left}"
Content="{materialDesign:PackIcon Kind=ArrowUp}"
Foreground="White" />
Foreground="White" />-->
</StackPanel>
</materialDesign:Card>
@@ -952,7 +968,7 @@
HorizontalAlignment="Left"
VerticalAlignment="Center"
CellTitle="功率"
CellUnit="Kw"
CellUnit="{Binding ComCapPwTag.Unit}"
CellValue="{Binding ComCapPwTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="105"