更新最新版20260604

This commit is contained in:
GukSang.Jin
2026-06-04 09:22:18 +08:00
parent fff560db5d
commit 38eb461c36
3 changed files with 151 additions and 68 deletions

View File

@@ -7,16 +7,14 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
mc:Ignorable="d"
d:DesignWidth="1440"
d:DesignHeight="900"
d:DesignWidth="1024"
d:DesignHeight="768"
x:Class="Footwear_Test_methodsfor_wholeshoe_Slipresistanceperformance.Views.MainWindow"
x:DataType="vm:MainWindowViewModel"
Icon="/Assets/avalonia-logo.ico"
WindowState="Maximized"
Width="1280"
Height="800"
MinWidth="1024"
MinHeight="720"
Width="1024"
Height="768"
Title="鞋类 整鞋试验方法 防滑性能测定-GB/T 3903.6-2024"
Background="#F4F7FB"
BackgroundAnimationEnabled="False"
@@ -195,11 +193,11 @@
</suki:SukiWindow.Styles>
<Grid RowDefinitions="*"
Width="1264"
HorizontalAlignment="Left"
MaxWidth="1264"
HorizontalAlignment="Stretch"
Margin="8"
ClipToBounds="True">
<Grid Grid.Row="0" RowDefinitions="Auto,Auto,*" RowSpacing="8">
<Grid Grid.Row="0" RowDefinitions="Auto,*" RowSpacing="8">
<Border Classes="panel">
<Grid ColumnDefinitions="1.2*,1.15*" ColumnSpacing="14">
<Grid RowDefinitions="Auto,Auto,Auto" ColumnDefinitions="Auto,*,Auto,*" RowSpacing="6" ColumnSpacing="8">
@@ -249,57 +247,7 @@
</Grid>
</Border>
<Border Grid.Row="1"
Background="{StaticResource PanelBrush}"
BorderBrush="{StaticResource LineBrush}"
BorderThickness="1"
CornerRadius="8"
Padding="8,4"
ClipToBounds="True">
<ScrollViewer HorizontalScrollBarVisibility="Auto"
VerticalScrollBarVisibility="Disabled"
ClipToBounds="True">
<StackPanel Orientation="Horizontal" Spacing="16">
<TextBlock Text="标准数据" FontWeight="SemiBold" VerticalAlignment="Center"/>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="设备状态" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DeviceStatus}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="正压力(N)" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding VerticalPressure}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="摩擦力(N)" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding HorizontalForce}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="位移(mm)" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding Distance}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="实时系数" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding FrictionCoefficient}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="静摩擦系数" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding StaticCoefficient}" FontWeight="SemiBold" Foreground="#5B21B6" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="动摩擦系数" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding DynamicCoefficient}" FontWeight="SemiBold" Foreground="#047857" VerticalAlignment="Center"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Spacing="5">
<TextBlock Text="结果" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding ResultSummary}" FontWeight="SemiBold" VerticalAlignment="Center"/>
</StackPanel>
<TextBlock Text="{Binding StandardReference}" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
<TextBlock Text="{Binding CurrentStatus}" Foreground="{StaticResource TextSecondaryBrush}" VerticalAlignment="Center"/>
</StackPanel>
</ScrollViewer>
</Border>
<DockPanel Grid.Row="2" LastChildFill="True" MinHeight="0" ClipToBounds="True">
<DockPanel Grid.Row="1" LastChildFill="True" MinHeight="0" ClipToBounds="True">
<Border DockPanel.Dock="Left" Width="280" Classes="panel" Margin="0,0,10,0">
<Grid RowDefinitions="Auto,Auto,*" RowSpacing="8">
<TextBlock Text="实时数据"