TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加了初始弹窗，但是没有成功

Browse Source 
更改了CAN和LIN协调
更改了配置程序的名称顺序
This commit is contained in:
Tyrone CT
2025-01-11 12:04:34 +08:00
parent 620c5e8178
commit e49a48fb25
53 changed files with 5118 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
CapMachine.Wpf/Views/MonitorView.xaml
View File

@@ -168,6 +168,8 @@
AutoHandCommand="{Binding Source={StaticResource Proxy}, Path=Data.AutoHandCmd}"
AutoHandState="False"
HandValueCommand="{Binding Source={StaticResource Proxy}, Path=Data.HandValueCmd}"
HandValueMVParameter="{Binding EngMvValue}"
HandValueSVParameter="{Binding EngSvValue}"
MeterName="{Binding NameNoUnit}"
PVValue="{Binding EngPvValue}"
SVValue="{Binding EngSvValue}"
@@ -208,7 +210,7 @@
</Grid.ColumnDefinitions>
<materialDesign:Card
Grid.ColumnSpan="3"
Grid.ColumnSpan="6"
Margin="3"
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
@@ -229,7 +231,7 @@
</StackPanel>
</materialDesign:Card>
<materialDesign:Card
<!--<materialDesign:Card
Grid.Column="3"
Grid.ColumnSpan="3"
Margin="3"
@@ -252,11 +254,11 @@
</StackPanel>
</materialDesign:Card>
</materialDesign:Card>-->
<materialDesign:Card
Grid.Row="1"
Grid.ColumnSpan="2"
Grid.ColumnSpan="6"
Margin="3"
Background="{DynamicResource MaterialDesignLightBackground}"
Foreground="{DynamicResource PrimaryHueLightForegroundBrush}"
@@ -268,16 +270,17 @@
FontFamily="/Assets/Fonts/#iconfont"
FontSize="26"
Text="&#xe7e7;" />
<TextBlock Style="{StaticResource TitelStyle}" Text="总时间:" />
<TextBlock Style="{StaticResource TitelStyle}" Text="总运行时间:" />
<TextBlock
VerticalAlignment="Center"
FontSize="30"
FontSize="26"
FontWeight="Bold"
Text="" />
Foreground="LimeGreen"
Text="{Binding MachineRtDataService.CurSysExdInfo.RunTimeMsg}" />
</StackPanel>
</materialDesign:Card>
<materialDesign:Card
<!--<materialDesign:Card
Grid.Row="1"
Grid.Column="2"
Grid.ColumnSpan="2"
@@ -323,7 +326,7 @@
FontWeight="Bold"
Text="0" />
</StackPanel>
</materialDesign:Card>
</materialDesign:Card>-->
<materialDesign:Card
Grid.Row="2"
@@ -942,13 +945,14 @@
CellTitle="电流"
CellUnit="{Binding ComCapBusCurTag.Unit}"
CellValue="{Binding ComCapBusCurTag.EngPvValueStr}" />
<!-- CellUnit="{Binding ComCapPwTag.Unit}" -->
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="220"
HorizontalAlignment="Left"
VerticalAlignment="Center"
CellTitle="功率"
CellUnit="{Binding ComCapPwTag.Unit}"
CellUnit="Kw"
CellValue="{Binding ComCapPwTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="105"
@@ -1054,15 +1058,23 @@
Content="CCV2&#x0a;冷凝器出水"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="1247"
Canvas.Top="4"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Content="工艺流程图"
FontSize="30"
FontWeight="Bold"
Foreground="Gray" />
<StackPanel
Canvas.Left="1250"
Canvas.Top="5"
Orientation="Horizontal">
<TextBlock
VerticalAlignment="Center"
FontFamily="/Assets/Fonts/#iconfont"
FontSize="30"
Foreground="Gray"
Text="&#xe9f4;" />
<Label
Content="工艺流程图"
FontSize="30"
FontWeight="Bold"
Foreground="Gray" />
</StackPanel>
</Canvas>
</Grid>