Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
H
hemei
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
潘栩锋
hemei
Commits
d3e29b0d
Commit
d3e29b0d
authored
Oct 28, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化 称重交换 料斗重量 与失重仓重量 的位置
parent
488d9865
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
10 deletions
+11
-10
UcWeighterItem.xaml
....Weight/FLY.Weight.UI.Client/UIModule/UcWeighterItem.xaml
+2
-2
UcWeighterItem2.xaml
...Weight/FLY.Weight.UI.Client/UiModule/UcWeighterItem2.xaml
+9
-8
No files found.
Project.FLY.Weight/FLY.Weight.UI.Client/UIModule/UcWeighterItem.xaml
View file @
d3e29b0d
...
@@ -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"/>
...
...
Project.FLY.Weight/FLY.Weight.UI.Client/UiModule/UcWeighterItem2.xaml
View file @
d3e29b0d
...
@@ -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 .}"
>
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment