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

干度2的计算和多日期历史数据的选择的增加

Browse Source
This commit is contained in:
Tyrone CT
2025-11-27 18:09:57 +08:00
parent b9085c4a93
commit 231801ccc3
4 changed files with 262 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -211,7 +211,7 @@
</Grid.ColumnDefinitions>
<materialDesign:Card
Grid.ColumnSpan="6"
Grid.ColumnSpan="5"
Margin="3"
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
@@ -232,6 +232,32 @@
</StackPanel>
</materialDesign:Card>
<materialDesign:Card
Grid.Column="5"
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"
Foreground="Blue"
Text="&#xe9f8;" />
<TextBlock
Foreground="Blue"
Style="{StaticResource TitelStyle}"
Text="干度2:" />
<TextBlock
VerticalAlignment="Center"
FontSize="26"
FontWeight="Bold"
Text="{Binding PPCService.DrynessTag2Value}" />
</StackPanel>
</materialDesign:Card>
<!--<materialDesign:Card
Grid.Column="3"
Grid.ColumnSpan="3"