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

更改主UI界面

Browse Source
This commit is contained in:
Tyrone CT
2025-04-27 17:50:57 +08:00
parent cf3d09cb3e
commit 96597c95f2
11 changed files with 545 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -174,6 +174,7 @@
MeterName="{Binding NameNoUnit}"
PVValue="{Binding PVModel.EngValueStr}"
SVValue="{Binding SVModel.EngValueStr}"
StepExeInfo="{Binding StepExeInfo}"
Unit="{Binding Unit}" />
</DataTemplate>
</ItemsControl.ItemTemplate>
@@ -211,7 +212,7 @@
</Grid.ColumnDefinitions>
<materialDesign:Card
Grid.ColumnSpan="6"
Grid.ColumnSpan="2"
Margin="3"
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
@@ -232,6 +233,29 @@
</StackPanel>
</materialDesign:Card>
<materialDesign:Card
Grid.Column="2"
Grid.ColumnSpan="4"
Margin="3"
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
UniformCornerRadius="5">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="10,0,0,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="26"
Text="&#xe6b4;" />
<TextBlock Style="{StaticResource TitelStyle}" Text="试验工况:" />
<TextBlock
VerticalAlignment="Center"
FontSize="26"
FontWeight="Bold"
Text="{Binding ProRuntimeService.SpeedProExModel.RunSegName}" />
</StackPanel>
</materialDesign:Card>
<!--<materialDesign:Card
Grid.Column="3"
Grid.ColumnSpan="3"
@@ -264,21 +288,34 @@
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
UniformCornerRadius="5">
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="10,0,0,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="26"
Text="&#xe7e7;" />
<TextBlock Style="{StaticResource TitelStyle}" Text="总运行时间:" />
<TextBlock
VerticalAlignment="Center"
FontSize="26"
FontWeight="Bold"
Foreground="LimeGreen"
Text="{Binding ProRuntimeService.ProRunTimeCalcModel.ProRunTimeStr}" />
</StackPanel>
<Grid>
<Border>
<ProgressBar
Height="45"
Background="Transparent"
BorderThickness="0"
Foreground="LightGreen"
Value="{Binding ProRuntimeService.ProRunTimeCalcModel.ProValue}" />
</Border>
<StackPanel Orientation="Horizontal">
<TextBlock
Margin="10,0,0,0"
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="26"
Text="&#xe7e7;" />
<TextBlock Style="{StaticResource TitelStyle}" Text="总运行时间:" />
<TextBlock
VerticalAlignment="Center"
FontSize="26"
FontWeight="Bold"
Foreground="#404040"
Text="{Binding ProRuntimeService.ProRunTimeCalcModel.ProRunTimeStr}" />
</StackPanel>
</Grid>
</materialDesign:Card>
<materialDesign:Card
@@ -301,7 +338,7 @@
VerticalAlignment="Center"
FontSize="30"
FontWeight="Bold"
Text="{Binding ProRuntimeService.SpeedProExModel.CurProStepExe.ProStepInfo}" />
Text="{Binding ProRuntimeService.SpeedProExModel.CurProStepExe.ProStep}" />
</StackPanel>
</materialDesign:Card>
@@ -320,12 +357,12 @@
FontFamily="/Assets/Fonts/#iconfont"
FontSize="26"
Text="&#xe7f7;" />
<TextBlock Style="{StaticResource TitelStyle}" Text="步进运行时间:" />
<TextBlock Style="{StaticResource TitelStyle}" Text="结束时间:" />
<TextBlock
VerticalAlignment="Center"
FontSize="26"
FontWeight="Bold"
Text="0" />
Text="{Binding ProRuntimeService.ProRunTimeCalcModel.EndTimeInfo}" />
</StackPanel>
</materialDesign:Card>