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

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

@@ -933,7 +933,7 @@
</Setter>
<Style.Triggers>
<DataTrigger Binding="{Binding IsSeletedInfo}" Value="1">
<Setter Property="Background" Value="GreenYellow" />
<Setter Property="Background" Value="LightGreen" />
</DataTrigger>
<DataTrigger Binding="{Binding IsSeletedInfo}" Value="2">
<Setter Property="Background" Value="SkyBlue" />

74
CapMachine.Wpf/Views/DialogEditProView.xaml
View File

@@ -14,31 +14,63 @@
<RowDefinition Height="auto" />
</Grid.RowDefinitions>
<StackPanel
Margin="70"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="10,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="24"
Foreground="Blue"
Text="&#xe9f8;" />
<TextBlock
VerticalAlignment="Center"
Orientation="Vertical">
<StackPanel
Margin="70,10"
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="24"
Text="程序名称："
TextAlignment="Center" />
<TextBox
Width="300"
VerticalAlignment="Center"
BorderBrush="Gray"
BorderThickness="1"
FontSize="24"
Text="{Binding Name}" />
Orientation="Horizontal">
<TextBlock
Margin="10,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="24"
Foreground="Blue"
Text="&#xe9f8;" />
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="24"
Text="程序名称："
TextAlignment="Center" />
<TextBox
Width="300"
VerticalAlignment="Center"
BorderBrush="Gray"
BorderThickness="1"
FontSize="24"
Text="{Binding Name}" />
</StackPanel>
<StackPanel
Margin="70,10"
HorizontalAlignment="Center"
Orientation="Horizontal">
<TextBlock
Margin="10,0,5,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="24"
Foreground="Blue"
Text="&#xe99f;" />
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="24"
Text="循环次数："
TextAlignment="Center" />
<TextBox
Width="300"
VerticalAlignment="Center"
BorderBrush="Gray"
BorderThickness="1"
FontSize="24"
Text="{Binding ProRepeat}" />
</StackPanel>
</StackPanel>
<StackPanel
Grid.Row="1"
HorizontalAlignment="Right"

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

@@ -16,6 +16,7 @@
<Grid.Resources>
<convert:BoolOkStrConvert x:Key="BoolOkStrConvert" />
<convert:BoolStateStrConvert x:Key="BoolStateStrConvert" />
<convert:BoolFinishStrConvert x:Key="BoolFinishStrConvert" />
<Style x:Key="BoardStyle" TargetType="Border">
<Setter Property="Background" Value="Gray" />
<Setter Property="Margin" Value="5,1" />
@@ -42,6 +43,96 @@
Visibility="Visible" />
</Border>
<StackPanel Grid.Row="1" Orientation="Horizontal">
<Border>
<Border.Style>
<Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">
<Style.Triggers>
<DataTrigger Binding="{Binding SysRunService.MachineRunState1.IsRunState}" Value="true">
<Setter Property="Background" Value="LimeGreen" />
</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="&#xe67f; " />
<TextBlock
FontSize="16"
Foreground="White"
Text="系统状态:" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding SysRunService.MachineRunState1.RunStateMsg}" />
</StackPanel>
</Border>
<Border>
<Border.Style>
<Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">
<Style.Triggers>
<DataTrigger Binding="{Binding SysRunService.MachineRunState1.IsProLoad}" Value="true">
<Setter Property="Background" Value="LimeGreen" />
</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="&#xe73b; " />
<TextBlock
FontSize="16"
Foreground="White"
Text="程序下载:" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding SysRunService.MachineRunState1.IsProLoad, Converter={StaticResource BoolFinishStrConvert}}" />
</StackPanel>
</Border>
<Border>
<Border.Style>
<Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">
<Style.Triggers>
<DataTrigger Binding="{Binding ConfigService.IsExpInfoOk}" Value="true">
<Setter Property="Background" Value="LimeGreen" />
</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="&#xe6b4; " />
<TextBlock
FontSize="16"
Foreground="White"
Text="试验名称:" />
<TextBlock
Margin="5,0"
FontSize="16"
Foreground="White"
Text="{Binding ConfigService.CurExpInfo.Name}" />
</StackPanel>
</Border>
<Border>
<Border.Style>
<Style BasedOn="{StaticResource BoardStyle}" TargetType="Border">

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"

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

@@ -1273,7 +1273,7 @@
<TextBox Style="{StaticResource txtboxStyle}" Text="{Binding SelectedSlopMeterSpeed.ParNo}" />
</StackPanel>
<StackPanel Grid.Column="2" HorizontalAlignment="Center">
<TextBlock FontSize="12" Text="EV(1～2)" />
<TextBlock FontSize="12" Text="EV(1～3)" />
<TextBox Style="{StaticResource txtboxStyle}" Text="{Binding SelectedSlopMeterSpeed.Ev}" />
</StackPanel>
<StackPanel Grid.Column="3" HorizontalAlignment="Center">