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
3292fed4
Commit
3292fed4
authored
Dec 30, 2020
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修复 IBC 主界面无法显示
2. 增加 限制了IBC主界面的比例
parent
b37ca779
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
MainPanel2.xaml
Project.FLY.IBC/FLY.IBC.UI.Client/UIModule/MainPanel2.xaml
+1
-1
MainPanel3.xaml
Project.FLY.IBC/FLY.IBC.UI.Client/UIModule/MainPanel3.xaml
+1
-1
MainPanel.xaml
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/MainPanel.xaml
+3
-3
版本描述.txt
脚本/版本描述.txt
+4
-0
No files found.
Project.FLY.IBC/FLY.IBC.UI.Client/UIModule/MainPanel2.xaml
View file @
3292fed4
...
@@ -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="2
5
0" HorizontalAlignment="Left" VerticalAlignment="Top">
<Viewbox MaxHeight="2
0
0" HorizontalAlignment="Left" VerticalAlignment="Top">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<Grid Margin="30,10">
<Grid Margin="30,10">
...
...
Project.FLY.IBC/FLY.IBC.UI.Client/UIModule/MainPanel3.xaml
View file @
3292fed4
...
@@ -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="2
5
0" HorizontalAlignment="Left" VerticalAlignment="Top">
<Viewbox MaxHeight="2
0
0" HorizontalAlignment="Left" VerticalAlignment="Top">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal">
<Grid Margin="30,10">
<Grid Margin="30,10">
...
...
Project.FLY.IBC/FLY.IBC.UI.Client/UiModule/MainPanel.xaml
View file @
3292fed4
...
@@ -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="2
5
0" HorizontalAlignment="Left" VerticalAlignment="Top">
<Viewbox MaxHeight="2
0
0" 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>
...
...
脚本/版本描述.txt
View file @
3292fed4
和美安装包_v6.21.1 -20201229
1. 修复 IBC 主界面无法显示
2. 增加 限制了IBC主界面的比例
和美安装包_v6.21.0 -20201227
和美安装包_v6.21.0 -20201227
1. 修改 称重流量图,IBC控制图,称重与IBC的表,都改为用BulkDb结构,有按时间查找,间隔功能
1. 修改 称重流量图,IBC控制图,称重与IBC的表,都改为用BulkDb结构,有按时间查找,间隔功能
...
...
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