Commit d3e29b0d authored by 潘栩锋's avatar 潘栩锋 🚴

优化 称重交换 料斗重量 与失重仓重量 的位置

parent 488d9865
...@@ -113,14 +113,14 @@ ...@@ -113,14 +113,14 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<StackPanel Margin="3" Grid.Row="1" > <StackPanel Margin="3" Grid.Row="2" >
<TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/> <TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
<TextBlock > <TextBlock >
<Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" /> <Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
<Run Text="kg" Style="{StaticResource RunStyle_unit}" /> <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
<StackPanel Margin="3" Grid.Row="2" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}"> <StackPanel Margin="3" Grid.Row="1" Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
<TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/> <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
<TextBlock > <TextBlock >
<Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" FontSize="36"/> <Run Text="{Binding MixBucketWeight,StringFormat={}{0:F4}}" Style="{StaticResource RunStyle_text}" FontSize="36"/>
......
...@@ -82,13 +82,6 @@ ...@@ -82,13 +82,6 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
</Button> </Button>
<StackPanel Margin="3" >
<TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
<TextBlock >
<Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
<Run Text="kg" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}"> <StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
<StackPanel Margin="3" > <StackPanel Margin="3" >
<TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/> <TextBlock Text="料斗重量" Style="{StaticResource TextBlockStyle_title}"/>
...@@ -97,7 +90,16 @@ ...@@ -97,7 +90,16 @@
<Run Text="kg" Style="{StaticResource RunStyle_unit}" /> <Run Text="kg" Style="{StaticResource RunStyle_unit}" />
</TextBlock> </TextBlock>
</StackPanel> </StackPanel>
</StackPanel>
<StackPanel Margin="3" >
<TextBlock Text="失重仓重量" Style="{StaticResource TextBlockStyle_title}"/>
<TextBlock >
<Run Text="{Binding BinWeight,StringFormat={}{0:F3}}" Style="{StaticResource RunStyle_text}" />
<Run Text="kg" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Visibility="{Binding IsSingle,Converter={StaticResource visbilityconv},ConverterParameter=HiddenWhenTrue}">
<StackPanel Margin="3" > <StackPanel Margin="3" >
<TextBlock Text="配料" Style="{StaticResource TextBlockStyle_title_activity}"/> <TextBlock Text="配料" Style="{StaticResource TextBlockStyle_title_activity}"/>
<flyctrl:ToggleButtonOnOff <flyctrl:ToggleButtonOnOff
...@@ -121,7 +123,6 @@ ...@@ -121,7 +123,6 @@
</flyctrl:ToggleButtonOnOff> </flyctrl:ToggleButtonOnOff>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_frequency_Click" <Button Style="{StaticResource ButtonStyle_empty}" Background="Transparent" Click="button_frequency_Click"
Tag="{Binding .}" Tag="{Binding .}"
> >
......
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