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

更改

Browse Source
This commit is contained in:
Tyrone CT
2026-03-10 14:05:51 +08:00
parent 6026385807
commit 57df5647a7
4 changed files with 253 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
CapMachine.Wpf/Assets/Images/CapMachineOutput1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 270 KiB

After

Width:  |  Height:  |  Size: 335 KiB

7
CapMachine.Wpf/CapMachine.Wpf.csproj
View File

@@ -11,6 +11,7 @@
<ItemGroup>
<None Remove="Assets\Fonts\iconfont.ttf" />
<None Remove="Assets\Images\CapMachineOutput1.png" />
<None Remove="Assets\Images\favicon.ico" />
<None Remove="Assets\Images\Logo.png" />
<None Remove="Assets\Images\参考工艺图.png" />
@@ -177,6 +178,9 @@
<Content Include="Assets\Fonts\iconfont.ttf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Images\CapMachineOutput1.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Assets\Images\Logo.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -720,9 +724,6 @@
</Resource>
</ItemGroup>
<ItemGroup>
<None Update="Assets\Images\CapMachineOutput1.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="Db\CapMachine.db">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

16
CapMachine.Wpf/ViewModels/MonitorViewModel.cs
View File

@@ -56,15 +56,17 @@ namespace CapMachine.Wpf.ViewModels
ExTempTag = TagManager.DicTags.GetValueOrDefault("排气温度[℃]");
InhPressTag = TagManager.DicTags.GetValueOrDefault("吸气压力[BarA]");
InhTempTag = TagManager.DicTags.GetValueOrDefault("吸气温度[℃]");
ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]");
ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]");
ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯Cmp母线电压[V]");
ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯Cmp母线电流[A]");
ComCapPwTag = TagManager.DicTags.GetValueOrDefault("通讯功率[W]");
OS2TempTag = TagManager.DicTags.GetValueOrDefault("吸气混合器温度[℃]");
TxvFrTempTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前温度[℃]");
TxvFrPressTag = TagManager.DicTags.GetValueOrDefault("膨胀阀前压力[BarA]");
Cond1TempTag = TagManager.DicTags.GetValueOrDefault("冷凝器出口水温[℃]");
Cond1TempTag = TagManager.DicTags.GetValueOrDefault("COND1温度[℃]");
CondInTempTag = TagManager.DicTags.GetValueOrDefault("冷凝器进口温度[℃]");
LubeFlowTag = TagManager.DicTags.GetValueOrDefault("润滑油流量[L/min]");
Cond2TempTag = TagManager.DicTags.GetValueOrDefault("COND2温度[℃]");
}
@@ -195,6 +197,14 @@ namespace CapMachine.Wpf.ViewModels
/// </summary>
public ITag CondInTempTag { get; set; }
/// <summary>
/// 润滑油流量
/// </summary>
public ITag LubeFlowTag { get; set; }
public ITag Cond2TempTag { get; set; }
#endregion
private DelegateCommand<string> _OperCmd;

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

@@ -874,131 +874,108 @@
</Canvas.Background>
<Rectangle
Canvas.Left="30"
Canvas.Top="85"
Width="470"
Height="380"
Canvas.Top="127"
Width="400"
Height="306"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Stroke="SkyBlue"
StrokeThickness="4" />
<Label
Canvas.Left="35"
Canvas.Top="88"
Canvas.Top="128"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="压缩机环境箱"
FontSize="26"
Foreground="DarkSlateBlue" />
<Label
Canvas.Left="795"
Canvas.Top="252"
HorizontalAlignment="Left"
Canvas.Left="582"
Canvas.Top="57"
HorizontalAlignment="Center"
VerticalAlignment="Center"
Content="HCV1"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="697"
Canvas.Top="293"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Canvas.Left="907"
Canvas.Top="25"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="HCV2"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="1007"
Canvas.Top="310"
Canvas.Left="907"
Canvas.Top="342"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="ECV1"
Content="HCV4"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="906"
Canvas.Top="360"
HorizontalAlignment="Center"
Canvas.Left="1057"
Canvas.Top="117"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Content="ECV2"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="915"
Canvas.Top="88"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="COND"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="1219"
Canvas.Top="231"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="CCV1&#x0a;冷凝器出水"
Content="COND2"
FontSize="16"
FontWeight="Bold" />
<Controls:ValueShow
Canvas.Left="290"
Canvas.Top="290"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Canvas.Left="304"
Canvas.Top="332"
HorizontalAlignment="Left"
VerticalAlignment="Center"
CellTitle="转速"
CellUnit="{Binding SpeedTag.Unit}"
CellValue="{Binding SpeedTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="120"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Canvas.Top="162"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="电压"
CellUnit="{Binding ComCapBusVolTag.Unit}"
CellValue="{Binding ComCapBusVolTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="301"
Canvas.Top="170"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Canvas.Top="212"
HorizontalAlignment="Center"
VerticalAlignment="Top"
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"
Canvas.Top="262"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="功率"
CellUnit="{Binding ComCapPwTag.Unit}"
CellValue="{Binding ComCapPwTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="105"
Canvas.Top="147"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Canvas.Left="89"
Canvas.Top="183"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="排气口压力"
CellUnit="{Binding ExPressTag.Unit}"
CellValue="{Binding ExPressTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="106"
Canvas.Top="193"
HorizontalAlignment="Left"
VerticalAlignment="Center"
CellTitle="排气口温度"
CellUnit="{Binding ExTempTag.Unit}"
<Controls:ValueShow
Canvas.Left="105"
Canvas.Top="292"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Canvas.Left="89"
Canvas.Top="236"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="吸气口压力"
CellUnit="{Binding InhPressTag.Unit}"
CellValue="{Binding InhPressTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="106"
Canvas.Top="338"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Canvas.Left="90"
Canvas.Top="292"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="吸气口温度"
CellUnit="{Binding InhTempTag.Unit}"
CellValue="{Binding InhTempTag.EngPvValueStr}" />
@@ -1017,7 +994,7 @@
VerticalAlignment="Center"
CellTitle="阀前温度"
CellUnit="{Binding TxvFrTempTag.Unit}"
CellValue="{Binding TxvFrTempTag.EngPvValueStr}" />
CellValue="{Binding TxvFrTempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1003"
Canvas.Top="239"
@@ -1025,7 +1002,7 @@
VerticalAlignment="Center"
CellTitle="阀前压力"
CellUnit="{Binding TxvFrPressTag.Unit}"
CellValue="{Binding TxvFrPressTag.EngPvValueStr}" />
CellValue="{Binding TxvFrPressTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="635"
Canvas.Top="420"
@@ -1033,7 +1010,7 @@
VerticalAlignment="Top"
CellTitle="吸气混合器温度"
CellUnit="{Binding OS2TempTag.Unit}"
CellValue="{Binding OS2TempTag.EngPvValueStr}" />
CellValue="{Binding OS2TempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1076"
Canvas.Top="360"
@@ -1041,7 +1018,7 @@
VerticalAlignment="Top"
CellTitle="冷凝器进水温"
CellUnit="{Binding CondInTempTag.Unit}"
CellValue="{Binding CondInTempTag.EngPvValueStr}" />
CellValue="{Binding CondInTempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1194"
Canvas.Top="360"
@@ -1049,7 +1026,7 @@
VerticalAlignment="Top"
CellTitle="冷凝器出水温"
CellUnit="{Binding Cond1TempTag.Unit}"
CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
CellValue="{Binding Cond1TempTag.PVModel.EngValueStr}" />
<Controls:ValueShow
Canvas.Left="1217"
Canvas.Top="136"
@@ -1066,14 +1043,6 @@
CellTitle="吸气温度MV"
CellUnit="%"
CellValue="{Binding InhTempTag.EngMvValue}" />-->
<Label
Canvas.Left="1339"
Canvas.Top="225"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="CCV2&#x0a;冷凝器出水"
FontSize="16"
FontWeight="Bold" />
<StackPanel
Canvas.Left="1250"
Canvas.Top="5"
@@ -1090,9 +1059,140 @@
FontWeight="Bold"
Foreground="Gray" />
</StackPanel>
<Label
Canvas.Left="447"
Canvas.Top="120"
HorizontalAlignment="Left"
VerticalAlignment="Top"
Content="COND1"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="361"
Canvas.Top="15"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="CCV1"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="993"
Canvas.Top="8"
HorizontalAlignment="Left"
VerticalAlignment="Center"
Content="CCV2"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="852"
Canvas.Top="43"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="FM1"
FontSize="16"
FontWeight="Bold"
RenderTransformOrigin="0.879,0.282" />
<Label
Canvas.Left="760"
Canvas.Top="142"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="OS1"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="692"
Canvas.Top="289"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="OS2"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="748"
Canvas.Top="359"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="FM2"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="917"
Canvas.Top="460"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="HCV3"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="1097"
Canvas.Top="407"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="EV4"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="1157"
Canvas.Top="362"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="EV3"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="1215"
Canvas.Top="315"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="EV2"
FontSize="16"
FontWeight="Bold" />
<Label
Canvas.Left="1272"
Canvas.Top="265"
HorizontalAlignment="Center"
VerticalAlignment="Top"
Content="EV1"
FontSize="16"
FontWeight="Bold" />
<Controls:ValueShow
Canvas.Left="740"
Canvas.Top="415"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="润滑油流量"
CellUnit="{Binding LubeFlowTag.Unit}"
CellValue="{Binding LubeFlowTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="723"
Canvas.Top="23"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="冷媒流量"
CellUnit="{Binding VRVTag.Unit}"
CellValue="{Binding VRVTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="1060"
Canvas.Top="149"
HorizontalAlignment="Left"
VerticalAlignment="Top"
CellTitle="COND2温度"
CellUnit="{Binding Cond2TempTag.Unit}"
CellValue="{Binding Cond2TempTag.EngPvValueStr}" />
<Controls:ValueShow
Canvas.Left="448"
Canvas.Top="147"
HorizontalAlignment="Center"
VerticalAlignment="Top"
CellTitle="COND1温度"
CellUnit="{Binding Cond1TempTag.Unit}"
CellValue="{Binding Cond1TempTag.EngPvValueStr}" />
</Canvas>
</Grid>
</materialDesign:Card>