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
8d3cdae2
Commit
8d3cdae2
authored
May 03, 2023
by
潘栩锋
🚴
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复 当没有电流检查功能时,需要把 “电流:ON” 隐藏
parent
c6524d3e
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
13 additions
and
17 deletions
+13
-17
PgSetup.xaml
...dbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgSetup.xaml
+0
-4
AirRingGraph.xaml
...enZiJia.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml
+1
-1
AssemblyInfo.cs
...FLY.FeedbackRenZiJia.UI.Server/Properties/AssemblyInfo.cs
+3
-3
AssemblyInfo.cs
...LY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
+2
-2
AssemblyInfo.cs
...LY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
+2
-2
AssemblyInfo.cs
...LY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
+2
-2
AssemblyInfo.cs
...LY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
+3
-3
No files found.
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/PgSetup.xaml
View file @
8d3cdae2
...
...
@@ -198,10 +198,6 @@
</StackPanel>
</StackPanel >
</Border>
<Border Style="{StaticResource Styles.Card.Border}" >
</Border>
<Border Style="{StaticResource Styles.Card.Border}">
...
...
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Client/UiModule/AirRingGraph/AirRingGraph.xaml
View file @
8d3cdae2
...
...
@@ -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="电流: "
/>
...
...
Project.FLY.FeedbackRenZiJia/FLY.FeedbackRenZiJia.UI.Server/Properties/AssemblyInfo.cs
View file @
8d3cdae2
...
...
@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("自动风环")]
[assembly: AssemblyCopyright("Copyright © 202
2
FLYAutomation")]
[assembly: AssemblyCopyright("Copyright © 202
3
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")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Client/Properties/AssemblyInfo.cs
View file @
8d3cdae2
...
...
@@ -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")]
Project.FLY.Thick.Blowing/FLY.Thick.Blowing.UI.Fix.Server/Properties/AssemblyInfo.cs
View file @
8d3cdae2
...
...
@@ -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")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Client/Properties/AssemblyInfo.cs
View file @
8d3cdae2
...
...
@@ -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")]
Project.FLY.Thick.BlowingScan/FLY.Thick.BlowingScan.UI.Server/Properties/AssemblyInfo.cs
View file @
8d3cdae2
...
...
@@ -12,7 +12,7 @@ using System.Windows;
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("佛山市枫莱尔自动化技术有限公司")]
[assembly: AssemblyProduct("枫莱尔--吹膜扫描测厚仪服务器")]
[assembly: AssemblyCopyright("Copyright © 202
2
FlyAutomation. All rights reserved.")]
[assembly: AssemblyCopyright("Copyright © 202
3
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")]
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