Skip to content

H
hemei
Commit 0547219d authored by 潘栩锋's avatar 潘栩锋 🚴
Browse files
Options

版本升级为v6.20.0

parent 0b584cd1
Show whitespace changes
Inline Side-by-side
Showing with 248 additions and 260 deletions
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml
View file @ 0547219d
<Page x:Class="FLY.FeedbackRenZiJia.UI.Client.UiModule.AirRingGraph"
<UserControl x:Class="FLY.FeedbackRenZiJia.UI.Client.UiModule.AirRingGraph"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
......@@ -7,8 +7,8 @@
xmlns:ed="http://schemas.microsoft.com/expression/2010/drawing" xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:lvc1="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Feng.Wpf"
mc:Ignorable="d"
d:DesignHeight="400" d:DesignWidth="980"
Title="Page_Graph" >
<Page.Resources>
>
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="pack://application:,,,/FLY.ControlLibrary;component/Themes/Dictionary_MyStyle.xaml"/>
......@@ -48,22 +48,14 @@
</Geometry>
</ResourceDictionary>
</Page.Resources>
<Grid Name="grid" Background="White" d:DataContext="{StaticResource viewModel}">
</UserControl.Resources>
<Border Style="{StaticResource BorderStyle_module}" >
<Grid Name="grid" d:DataContext="{StaticResource viewModel}">
<Grid.RowDefinitions>
<RowDefinition Height="auto" />
<RowDefinition Height="258*" />
</Grid.RowDefinitions>
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="18" />
<RowDefinition Height="32" />
</Grid.RowDefinitions>
<Rectangle Fill="#FF579aab"/>
</Grid>
<Border Background="#F0579aab" Height="20" VerticalAlignment="Top" CornerRadius="3,3,0,0"/>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto" />
......@@ -358,4 +350,5 @@
</lvc:CartesianChart>
</Grid>
</Grid>
</Page>
</Border>
</UserControl>
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml.cs
View file @ 0547219d
......@@ -32,7 +32,7 @@ namespace FLY.FeedbackRenZiJia.UI.Client.UiModule
/// <summary>
/// Page_Graph.xaml 的交互逻辑
/// </summary>
public partial class AirRingGraph : Page
public partial class AirRingGraph : UserControl
{
IUnityContainer container;
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")]
[assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.1")]
[assembly: AssemblyFileVersion("6.0.1")]
[assembly: AssemblyVersion("6.20.0")]
[assembly: AssemblyFileVersion("6.20.0")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--追边测厚仪客户端")]
[assembly: AssemblyCopyright("Copyright © 2018 FLYAutomation")]
[assembly: AssemblyCopyright("Copyright © 2020 FLYAutomation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyVersion("6.20.0")]
[assembly: AssemblyFileVersion("6.20.0")]
[assembly: Guid("27509A23-198D-420D-A472-982C07194BBB")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/ScanGraphCircular.xaml
View file @ 0547219d
......@@ -65,7 +65,7 @@
<Grid Style="{StaticResource GridStyle_ButtonShadow}" >
<TextBlock Padding="10,5" VerticalAlignment="Top"
FontSize="24" Foreground="White" Background="{StaticResource Color_theme_activity}"
Text="对比图" />
Text="环型图" />
</Grid>
</Button>
<Grid Grid.Column="1" Grid.RowSpan="2" Panel.ZIndex="2"
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI/UiModule/ScanGraphCircular/WdScanGraphCircularConfig.xaml
View file @ 0547219d
......@@ -57,11 +57,6 @@
<TextBox Style="{StaticResource TextBoxStyle_FieldContent}" Text="{Binding YRangePercent}" />
</StackPanel>
</StackPanel>
<StackPanel Margin="5">
<TextBlock Style="{StaticResource TextBlockStyle_FieldHeaderEditable}" Text="探头位于右边" />
<ToggleButton Style="{StaticResource ToggleButtonStyle1}" HorizontalAlignment="Left" IsChecked="{Binding MPIsRight}" />
</StackPanel>
</StackPanel>
</StackPanel>
<Button Style="{StaticResource ButtonStyle_apply}" Click="btnOkClick"/>
......
Project.FLY.Thick.Blowing/FLY.Thick.Blowing/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0")]
[assembly: AssemblyFileVersion("5.1.0")]
[assembly: AssemblyVersion("6.20.0")]
[assembly: AssemblyFileVersion("6.20.0")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")]
[assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("6.0.0.0")]
[assembly: AssemblyFileVersion("6.0.0.0")]
[assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -51,5 +51,5 @@ using System.Windows;
//可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
//通过使用 "*"，如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan/Properties/AssemblyInfo.cs
View file @ 0547219d
......@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("FLY.Thick.BlowingScan")]
[assembly: AssemblyCopyright("Copyright © 2018 FlyAutomation")]
[assembly: AssemblyCopyright("Copyright © 2020 FlyAutomation")]
[assembly: AssemblyTrademark("FlyAutomation")]
[assembly: AssemblyCulture("")]
......@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// 可以指定所有这些值，也可以使用“内部版本号”和“修订号”的默认值，
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("5.1.0.0")]
[assembly: AssemblyFileVersion("5.1.0.0")]
[assembly: AssemblyVersion("6.20.0.0")]
[assembly: AssemblyFileVersion("6.20.0.0")]
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