Skip to content

H
hemei
Commit 4825a876 authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

优化 称重V3界面样式

parent 4fb1a0fc
Show whitespace changes
Inline Side-by-side
Showing with 50 additions and 21 deletions
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/V3/UcTotalFlowV3_2.xaml
View file @ 4825a876
......@@ -20,8 +20,8 @@
</UserControl.Resources>
<Grid d:DataContext="{StaticResource weightSystemUt}">
<Grid.ColumnDefinitions>
<ColumnDefinition />
<ColumnDefinition Width="auto"/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Border Style="{StaticResource BorderStyle_block}" Margin="0,0,5,0">
<Viewbox Stretch="Uniform" StretchDirection="DownOnly" HorizontalAlignment="Left" VerticalAlignment="Top">
......@@ -38,15 +38,15 @@
<StackPanel VerticalAlignment="Bottom">
<StackPanel Orientation="Horizontal">
<TextBlock Text="设置&#13;总流量" Style="{StaticResource TextBlockStyle_title_activity}" Margin="3,0"/>
<TextBlock>
<Run Text="{Binding Accessory.TotalFlowSetting,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.TotalFlowSetting,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="kg/h" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal">
<TextBlock Text="当前&#13;总流量" Style="{StaticResource TextBlockStyle_title}" Margin="3,0"/>
<TextBlock>
<Run Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.TotalFlow,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="kg/h" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
......@@ -83,7 +83,7 @@
</Button>
<TextBlock Grid.Row="1" Grid.RowSpan="2" VerticalAlignment="Bottom" Grid.ColumnSpan="2" >
<Run Text="{Binding Accessory.TotalProduction,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
<Run Text="{Binding Accessory.TotalProduction,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="kg" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</Grid>
......@@ -96,50 +96,79 @@
<Viewbox Margin="15,5" MaxHeight="90" Stretch="Uniform" StretchDirection="DownOnly" >
<Button Style="{StaticResource Styles.Button.Empty}" Background="Transparent" Click="button_thickness_Click" >
<StackPanel Orientation="Horizontal">
<StackPanel Margin="3">
<StackPanel Margin="2">
<StackPanel Orientation="Horizontal" >
<TextBlock Text="切边&#13;不回收" Style="{StaticResource TextBlockStyle_title_activity}" />
<Grid Style="{StaticResource Styles.Shadow}" VerticalAlignment="Center">
<iconPacks:PackIconMaterial >
<iconPacks:PackIconMaterial.Style>
<Style TargetType="iconPacks:PackIconMaterial" BasedOn="{StaticResource Styles.Icon.Small}">
<Setter Property="Foreground" Value="{StaticResource Color_off}"/>
<Setter Property="Kind" Value="Close"/>
<Style.Triggers>
<DataTrigger Binding="{Binding Accessory.IsRimNoRecycle}" Value="True">
<Setter Property="Foreground" Value="{StaticResource Color_on}"/>
<Setter Property="Kind" Value="Check"/>
</DataTrigger>
</Style.Triggers>
</Style>
</iconPacks:PackIconMaterial.Style>
</iconPacks:PackIconMaterial>
</Grid>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<TextBlock Text="切边&#13;宽度" Style="{StaticResource TextBlockStyle_title_activity}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.RimWidth,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="mm" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="2">
<StackPanel Orientation="Horizontal" >
<TextBlock Text="吹膜&#13;宽度" Style="{StaticResource TextBlockStyle_title_activity}" Margin="3,0" />
<TextBlock >
<Run Text="{Binding Accessory.TotalFilmWidth,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.TotalFilmWidth,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="mm" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<TextBlock Text="收卷&#13;宽度" Style="{StaticResource TextBlockStyle_title}" Margin="3,0"/>
<TextBlock >
<Run Text="{Binding Accessory.ActFilmWidth,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.ActFilmWidth,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="mm" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="3">
<StackPanel Margin="2">
<StackPanel Orientation="Horizontal">
<TextBlock Text="设置&#13;厚度" Style="{StaticResource TextBlockStyle_title_activity}" Margin="3,0"/>
<TextBlock >
<Run Text="{Binding Accessory.SetThickness,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.SetThickness,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text_activity}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="um" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal" Background="{StaticResource Color_background2}" >
<TextBlock Text="当前&#13;厚度" Style="{StaticResource TextBlockStyle_title}" Margin="3,0"/>
<TextBlock >
<Run Text="{Binding Accessory.Thickness,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.Thickness,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="um" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="3">
<StackPanel Margin="2">
<StackPanel Orientation="Horizontal" Background="{StaticResource Color_background2}" Margin="3,0">
<TextBlock Text="当前&#13;速度" Style="{StaticResource TextBlockStyle_title}" />
<TextBlock >
<Run Text="{Binding Accessory.CurrentVelocity,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.CurrentVelocity,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="m/min" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Orientation="Horizontal" >
<TextBlock Text="理论&#13;速度" Style="{StaticResource TextBlockStyle_title}" Margin="3,0"/>
<TextBlock >
<Run Text="{Binding Accessory.TargetVelocity,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text_large}"/>
<TextBlock VerticalAlignment="Center">
<Run Text="{Binding Accessory.TargetVelocity,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text}" FontSize="{StaticResource FontSize_text}"/>
<Run Text="m/min" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment