Commit 8d3cdae2 authored by 潘栩锋's avatar 潘栩锋 🚴

修复 当没有电流检查功能时,需要把 “电流:ON” 隐藏

parent c6524d3e
......@@ -198,10 +198,6 @@
</StackPanel>
</StackPanel >
</Border>
<Border Style="{StaticResource Styles.Card.Border}" >
</Border>
<Border Style="{StaticResource Styles.Card.Border}">
......
......@@ -373,7 +373,7 @@
Text="{Binding Kp,StringFormat={}{0:F1},Mode=OneWay}"
/>
</StackPanel>
<StackPanel Orientation="Horizontal" Width="120">
<StackPanel Orientation="Horizontal" Width="120" Visibility="{Binding FeedbackHeat.HasCheck, Converter={StaticResource visbilityconv}}" >
<TextBlock Style="{StaticResource TitleStyle}"
Text="电流: "
/>
......
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("自动风环")]
[assembly: AssemblyCopyright("Copyright © 2022 FLYAutomation")]
[assembly: AssemblyCopyright("Copyright © 2023 FLYAutomation")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.6.1.0")]
[assembly: AssemblyFileVersion("7.6.1.0")]
[assembly: AssemblyVersion("7.9.0.0")]
[assembly: AssemblyFileVersion("7.9.0.0")]
[assembly: Guid("32104657-86E9-4380-9113-606589E6D812")]
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.7.4.1")]
[assembly: AssemblyFileVersion("7.7.4.1")]
[assembly: AssemblyVersion("7.9.0.0")]
[assembly: AssemblyFileVersion("7.9.0.0")]
[assembly: Guid("D12087A7-EEC4-4D9F-9269-8F20324F4B04")]
......@@ -51,6 +51,6 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.8.0")]
[assembly: AssemblyFileVersion("7.8.0")]
[assembly: AssemblyVersion("7.9.0")]
[assembly: AssemblyFileVersion("7.9.0")]
[assembly: Guid("72FBA808-FA10-43BF-8504-C6E814E031E7")]
......@@ -51,6 +51,6 @@ using System.Windows;
//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
//通过使用 "*",如下所示:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.8.1.0")]
[assembly: AssemblyFileVersion("7.8.1.0")]
[assembly: AssemblyVersion("7.9.0.0")]
[assembly: AssemblyFileVersion("7.9.0.0")]
[assembly: Guid("38E0D8EC-4D1C-49FF-AB08-6289294C5BD4")]
......@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--吹膜扫描测厚仪服务器")]
[assembly: AssemblyCopyright("Copyright © 2022 FlyAutomation. All rights reserved.")]
[assembly: AssemblyCopyright("Copyright © 2023 FlyAutomation. All rights reserved.")]
[assembly: AssemblyTrademark("FlyAutomation")]
[assembly: AssemblyCulture("")]
......@@ -51,7 +51,7 @@ using System.Windows;
// 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值,
// 方法是按如下所示使用“*”:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("7.6.2.0")]
[assembly: AssemblyFileVersion("7.6.2.0")]
[assembly: AssemblyVersion("7.9.0.0")]
[assembly: AssemblyFileVersion("7.9.0.0")]
[assembly: Guid("A2277244-BCD4-485B-85F4-AAE96DA235B5")]
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