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

修改 单组份界面去除隐藏

parent f9d7ef61
......@@ -31,7 +31,8 @@
<StackPanel Margin="3" Grid.Column="1" >
<StackPanel Orientation="Horizontal">
<TextBlock Text="当前产量" Style="{StaticResource TextBlockStyle_title}" Margin="3,0" />
<TextBlock Visibility="{Binding ScrewIsAutoMode,Converter={StaticResource visbilityconv}}">
<!--<TextBlock Visibility="{Binding ScrewIsAutoMode,Converter={StaticResource visbilityconv}}">-->
<TextBlock >
<Run Text="{Binding CurrentFlowAuto,StringFormat={}{0:F0}}" Style="{StaticResource RunStyle_text}" FontSize="30" />
<Run Text="kg" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
......@@ -71,8 +72,9 @@
<Run Text="%" Style="{StaticResource RunStyle_unit}" />
</TextBlock>
</StackPanel>
<StackPanel Grid.Column="1" Margin="3" Visibility="{Binding ScrewIsAutoMode,Converter={StaticResource visbilityconv}}">
<TextBlock Text="设置比例" Style="{StaticResource TextBlockStyle_title_activity}"/>
<!--<StackPanel Grid.Column="1" Margin="3" Visibility="{Binding ScrewIsAutoMode,Converter={StaticResource visbilityconv}}">-->
<StackPanel Grid.Column="1" Margin="3" >
<TextBlock Text="设置比例" Style="{StaticResource TextBlockStyle_title_activity}"/>
<TextBlock >
<Run Text="{Binding ScrewPDispAuto,StringFormat={}{0:F1}}" Style="{StaticResource RunStyle_text_activity}"/>
<Run Text="%" Style="{StaticResource RunStyle_unit}" />
......@@ -147,7 +149,8 @@
</i:Interaction.Behaviors>
</flyctrl:NoToggleButton>
</StackPanel>
<StackPanel Margin="3" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Visibility="{Binding IsChecked,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Hidden, ElementName=togglebutton_screw}">
<!--<StackPanel Margin="3" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" Visibility="{Binding IsChecked,Converter={StaticResource ResourceKey=visbilityconv},ConverterParameter=Hidden, ElementName=togglebutton_screw}">-->
<StackPanel Margin="3" Grid.Row="4" Grid.Column="1" VerticalAlignment="Center" >
<TextBlock Text="螺杆模式" Style="{StaticResource TextBlockStyle_title_activity}"/>
<flyctrl:ToggleButtonOnOff
IsChecked="{Binding ScrewIsAutoMode}"
......
#!/bin/bash
#
echo "backup FLY.Thick.Blowing.UI.Fix.Client"
cp -Rf ../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/bin/Debug restore/FLY.Thick.Blowing.UI.Fix.Client/*
echo "backup FLY.Thick.BlowingScan.UI.Client"
cp -Rf restore/FLY.Thick.Blowing.UI.Fix.Client/* ../Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/bin/Debug
echo "restore FLY.Thick.Blowing.UI.Fix.Server"
cp -Rf restore/FLY.Thick.Blowing.UI.Fix.Server/* ../Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/bin/Debug
echo "restore FLY.Thick.BlowingScan.UI.Server"
cp -Rf restore/FLY.Thick.BlowingScan.UI.Server/* ../Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/bin/Debug
echo "restore FLY.FeedbackRenZiJia.UI.Server"
cp -Rf restore/FLY.FeedbackRenZiJia.UI.Server/* ../Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/bin/Debug
echo "restore FLY.IBC.UI.Server"
cp -Rf restore/FLY.IBC.UI.Server/* ../Project.FLY.IBC/FLY.IBC.UI.Server/bin/Debug
echo "restore FLY.Weight.UI.Server"
cp -Rf restore/FLY.Weight.UI.Server/* ../Project.FLY.Weight/FLY.Weight.UI.Server/bin/Debug
echo "restore FLY.Winder.UI.Server"
cp -Rf restore/FLY.Winder.UI.Server/* ../Project.FLY.Winder_20190413/FLY.Winder.UI.Server/bin/Debug
echo "restore FLY.Weight2.UI.Server"
cp -Rf restore/FLY.Weight2.UI.Server/* ../Project.FLY.Weight2/FLY.Weight2.UI.Server/bin/Debug
\ No newline at end of file
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