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-03-01 11:26:35 +08:00
parent a2c69f24f2
commit 1caa2fdd9f
16 changed files with 3318 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -277,7 +277,7 @@
FontSize="26"
FontWeight="Bold"
Foreground="LimeGreen"
Text="{Binding MachineRtDataService.CurSysExdInfo.RunTimeMsg}" />
Text="{Binding ProRuntimeService.ProRunTimeCalcModel.ProRunTimeStr}" />
</StackPanel>
</materialDesign:Card>
@@ -341,14 +341,12 @@
Width="100"
Margin="5,0"
HorizontalAlignment="Center"
Background="Green"
BorderBrush="Blue"
BorderThickness="2"
Command="{Binding OperCmd}"
CommandParameter="开始"
GroupName="OpRunStop"
IsChecked="{Binding MachineRtDataService.SysExdBoolInfos.StartRunStateQuickTag.Value}"
Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}">
GroupName="OpRunStop">
<!-- Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" Background="Green" IsChecked="{Binding SysRunServer.MachineRunState1.BtnStartState}" -->
<RadioButton.Content>
<StackPanel Orientation="Horizontal">
<TextBlock
@@ -364,17 +362,28 @@
Text="开始" />
</StackPanel>
</RadioButton.Content>
<RadioButton.Style>
<Style BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" TargetType="RadioButton">
<Style.Triggers>
<DataTrigger Binding="{Binding SysRunServer.MachineRunState1.BtnStartState}" Value="true">
<Setter Property="Background" Value="Green" />
</DataTrigger>
<DataTrigger Binding="{Binding SysRunServer.MachineRunState1.BtnStartState}" Value="false">
<Setter Property="Background" Value="Gray" />
</DataTrigger>
</Style.Triggers>
</Style>
</RadioButton.Style>
</RadioButton>
<RadioButton
Width="100"
HorizontalAlignment="Center"
Background="Green"
BorderBrush="Blue"
BorderThickness="2"
Command="{Binding OperCmd}"
CommandParameter="结束"
GroupName="OpRunStop"
Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}">
GroupName="OpRunStop">
<!-- Style="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" Background="Green" IsChecked="{Binding SysRunServer.MachineRunState1.BtnEndState}" -->
<RadioButton.Content>
<StackPanel Orientation="Horizontal">
<TextBlock
@@ -390,6 +399,18 @@
Text="结束" />
</StackPanel>
</RadioButton.Content>
<RadioButton.Style>
<Style BasedOn="{StaticResource MaterialDesignChoiceChipSecondaryRadioButton}" TargetType="RadioButton">
<Style.Triggers>
<DataTrigger Binding="{Binding SysRunServer.MachineRunState1.BtnEndState}" Value="true">
<Setter Property="Background" Value="Green" />
</DataTrigger>
<DataTrigger Binding="{Binding SysRunServer.MachineRunState1.BtnEndState}" Value="false">
<Setter Property="Background" Value="Gray" />
</DataTrigger>
</Style.Triggers>
</Style>
</RadioButton.Style>
</RadioButton>
<!-- 分隔符 -->
@@ -432,6 +453,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="&#xe893;" />
<TextBlock Text="继续" />
</StackPanel>
</Button>
<Button
Margin="5,0"
Command="{Binding OperCmd}"

68
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -523,73 +523,7 @@
Text="删除" />
</StackPanel>
</Button>
<Button
Width="80"
Height="25"
Margin="2"
Background="Yellow"
Command="{Binding ProRunSelectedDelete1}"
CommandParameter="1"
Style="{StaticResource MaterialDesignOutlinedDarkButton}"
ToolTip="停止">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,2,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="14"
Text="&#xe910;" />
<TextBlock
VerticalAlignment="Center"
FontSize="14"
Text="停止" />
</StackPanel>
</Button>
<Button
Width="80"
Height="25"
Margin="2"
Background="Yellow"
Command="{Binding ProRunSelectedDelete1}"
CommandParameter="2"
Style="{StaticResource MaterialDesignOutlinedDarkButton}"
ToolTip="暂停">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,2,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="14"
Text="&#xe910;" />
<TextBlock
VerticalAlignment="Center"
FontSize="14"
Text="暂停" />
</StackPanel>
</Button>
<Button
Width="80"
Height="25"
Margin="2"
Background="Yellow"
Command="{Binding ProRunSelectedDelete1}"
CommandParameter="3"
Style="{StaticResource MaterialDesignOutlinedDarkButton}"
ToolTip="继续">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="0,0,2,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="14"
Text="&#xe910;" />
<TextBlock
VerticalAlignment="Center"
FontSize="14"
Text="继续" />
</StackPanel>
</Button>
</StackPanel>
</StackPanel>