Commit 3292fed4 authored by 潘栩锋's avatar 潘栩锋 🚴

1. 修复 IBC 主界面无法显示

2. 增加 限制了IBC主界面的比例
parent b37ca779
...@@ -63,7 +63,7 @@ ...@@ -63,7 +63,7 @@
<Grid x:Name="grid_ibc" d:DataContext="{StaticResource unitests_ibc}"/> <Grid x:Name="grid_ibc" d:DataContext="{StaticResource unitests_ibc}"/>
<local:IbcCtrlGraph x:Name="ibcCtrlGraph" Grid.Row="1" /> <local:IbcCtrlGraph x:Name="ibcCtrlGraph" Grid.Row="1" />
<Border Margin="5" CornerRadius="5" Background="{StaticResource Color_background}" DataContext="{Binding DataContext,ElementName=grid_ibc}"> <Border Margin="5" CornerRadius="5" Background="{StaticResource Color_background}" DataContext="{Binding DataContext,ElementName=grid_ibc}">
<Viewbox MaxHeight="250" HorizontalAlignment="Left" VerticalAlignment="Top"> <Viewbox MaxHeight="200" HorizontalAlignment="Left" VerticalAlignment="Top">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Grid Margin="30,10"> <Grid Margin="30,10">
......
...@@ -61,7 +61,7 @@ ...@@ -61,7 +61,7 @@
<Grid x:Name="grid_ibc" d:DataContext="{StaticResource unitests_ibc}"/> <Grid x:Name="grid_ibc" d:DataContext="{StaticResource unitests_ibc}"/>
<local:IbcCtrlGraph x:Name="ibcCtrlGraph" Grid.Row="1" /> <local:IbcCtrlGraph x:Name="ibcCtrlGraph" Grid.Row="1" />
<Border Margin="5" CornerRadius="5" Background="{StaticResource Color_background}" DataContext="{Binding DataContext,ElementName=grid_ibc}"> <Border Margin="5" CornerRadius="5" Background="{StaticResource Color_background}" DataContext="{Binding DataContext,ElementName=grid_ibc}">
<Viewbox MaxHeight="250" HorizontalAlignment="Left" VerticalAlignment="Top"> <Viewbox MaxHeight="200" HorizontalAlignment="Left" VerticalAlignment="Top">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Grid Margin="30,10"> <Grid Margin="30,10">
......
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Grid x:Name="grid_ibc" d:DataContext="{StaticResource unitests_ibc}"/> <Grid x:Name="grid_ibc" d:DataContext="{StaticResource unitests_ibc}"/>
<Border Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}" DataContext="{Binding DataContext,ElementName=grid_ibc}"> <Border Margin="5" CornerRadius="5" Background="{StaticResource Color_theme_background}" DataContext="{Binding DataContext,ElementName=grid_ibc}">
<Viewbox MaxHeight="250" HorizontalAlignment="Left" VerticalAlignment="Top"> <Viewbox MaxHeight="200" HorizontalAlignment="Left" VerticalAlignment="Top">
<StackPanel Orientation="Horizontal"> <StackPanel Orientation="Horizontal">
<Grid Margin="30,10"> <Grid Margin="30,10">
<Grid.RowDefinitions> <Grid.RowDefinitions>
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
</Grid> </Grid>
<Button Style="{StaticResource ButtonStyle_largeIcon}" Click="button_inletAir_plus_Click" Margin="-10,0,0,-80" Grid.Row="1" Grid.Column="0" VerticalAlignment="Top" Height="50" Width="50"> <Button Style="{StaticResource ButtonStyle_largeIcon}" Click="button_inletAir_plus_Click" Margin="-10,0,0,-80" Grid.Row="1" Grid.Column="0" VerticalAlignment="Top" Height="50" Width="50">
<Grid> <Grid>
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/> <Ellipse Fill="White" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="PlusCircle"/> <iconPacks:PackIconMaterial Kind="PlusCircle"/>
</Grid> </Grid>
</Button> </Button>
...@@ -168,7 +168,7 @@ ...@@ -168,7 +168,7 @@
</Grid> </Grid>
<Button Style="{StaticResource ButtonStyle_largeIcon}" Click="button_outletAir_plus_Click" Margin="-10,0,0,-80" Grid.Row="1" Grid.Column="0" VerticalAlignment="Top"> <Button Style="{StaticResource ButtonStyle_largeIcon}" Click="button_outletAir_plus_Click" Margin="-10,0,0,-80" Grid.Row="1" Grid.Column="0" VerticalAlignment="Top">
<Grid> <Grid>
<Ellipse Fill="{StaticResource WhiteBrush}" Stretch="Fill" Margin="1"/> <Ellipse Fill="White" Stretch="Fill" Margin="1"/>
<iconPacks:PackIconMaterial Kind="PlusCircle"/> <iconPacks:PackIconMaterial Kind="PlusCircle"/>
</Grid> </Grid>
</Button> </Button>
......
和美安装包_v6.21.1 -20201229
1. 修复 IBC 主界面无法显示
2. 增加 限制了IBC主界面的比例
和美安装包_v6.21.0 -20201227 和美安装包_v6.21.0 -20201227
1. 修改 称重流量图,IBC控制图,称重与IBC的表,都改为用BulkDb结构,有按时间查找,间隔功能 1. 修改 称重流量图,IBC控制图,称重与IBC的表,都改为用BulkDb结构,有按时间查找,间隔功能
......
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