一些优化：CAN和PLC地址的优化
This commit is contained in:
@@ -488,7 +488,8 @@
|
||||
<ColumnDefinition Width="180" />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>
|
||||
<Grid>
|
||||
<!-- 手动添加 -->
|
||||
<!--<Grid>
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
@@ -509,10 +510,6 @@
|
||||
<RowDefinition />
|
||||
<RowDefinition />
|
||||
</Grid.RowDefinitions>
|
||||
<!--<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="120" />
|
||||
<ColumnDefinition />
|
||||
</Grid.ColumnDefinitions>-->
|
||||
<StackPanel Orientation="Horizontal">
|
||||
<ToggleButton
|
||||
Name="冷水机组"
|
||||
@@ -750,16 +747,43 @@
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Text="抽真空" />
|
||||
|
||||
</StackPanel>
|
||||
</Grid>
|
||||
</Grid>-->
|
||||
<materialDesign:Card Margin="0,0" materialDesign:ElevationAssist.Elevation="Dp2">
|
||||
<ItemsControl ItemsSource="{Binding ListHandSwitchData}">
|
||||
<ItemsControl.ItemsPanel>
|
||||
<ItemsPanelTemplate>
|
||||
<StackPanel Orientation="Vertical" />
|
||||
</ItemsPanelTemplate>
|
||||
</ItemsControl.ItemsPanel>
|
||||
<ItemsControl.ItemTemplate>
|
||||
<!-- HandValueParameter="{Binding MVValue}" -->
|
||||
<DataTemplate>
|
||||
<StackPanel Margin="0,2,2,2" Orientation="Horizontal">
|
||||
<ToggleButton
|
||||
Margin="8,0,2,0"
|
||||
Command="{Binding Source={StaticResource Proxy}, Path=Data.HandEnableCmd}"
|
||||
CommandParameter="{Binding RelativeSource={RelativeSource Self}}"
|
||||
IsChecked="{Binding State}"
|
||||
Style="{StaticResource MaterialDesignSwitchToggleButton}"
|
||||
ToolTip="{Binding Name}" />
|
||||
<TextBlock
|
||||
Margin="2,0"
|
||||
VerticalAlignment="Center"
|
||||
FontSize="16"
|
||||
Text="{Binding Name}" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ItemsControl.ItemTemplate>
|
||||
</ItemsControl>
|
||||
</materialDesign:Card>
|
||||
|
||||
<!--<svg1:SVGImage Grid.Column="1" Source="E:\图库资源\SVGEdit\CapMachineOutput.svg" RenderTransformOrigin="0.5,0.5" VerticalContentAlignment="Center" HorizontalContentAlignment="Center" Margin="3" />-->
|
||||
|
||||
<!-- inkscape -->
|
||||
<Canvas Grid.Column="1">
|
||||
<!--<Canvas.Background>
|
||||
<Canvas.Background>
|
||||
<ImageBrush ImageSource="\Assets\Images\CapMachineOutput1.png" />
|
||||
</Canvas.Background>-->
|
||||
</Canvas.Background>
|
||||
<Rectangle
|
||||
Canvas.Left="30"
|
||||
Canvas.Top="107"
|
||||
@@ -778,188 +802,199 @@
|
||||
FontSize="26"
|
||||
Foreground="DarkSlateBlue" />
|
||||
<Label
|
||||
Canvas.Left="861"
|
||||
Canvas.Top="269"
|
||||
Canvas.Left="795"
|
||||
Canvas.Top="252"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="HCV1"
|
||||
FontSize="16"
|
||||
FontWeight="Bold" />
|
||||
<Label
|
||||
Canvas.Left="762"
|
||||
Canvas.Top="305"
|
||||
Canvas.Left="697"
|
||||
Canvas.Top="293"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="HCV2"
|
||||
FontSize="16"
|
||||
FontWeight="Bold" />
|
||||
<Label
|
||||
Canvas.Left="1072"
|
||||
Canvas.Top="330"
|
||||
HorizontalAlignment="Left"
|
||||
Canvas.Left="1007"
|
||||
Canvas.Top="310"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
Content="ECV1"
|
||||
FontSize="16"
|
||||
FontWeight="Bold" />
|
||||
<Label
|
||||
Canvas.Left="967"
|
||||
Canvas.Top="377"
|
||||
HorizontalAlignment="Left"
|
||||
Canvas.Left="906"
|
||||
Canvas.Top="360"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
Content="ECV2"
|
||||
FontSize="16"
|
||||
FontWeight="Bold" />
|
||||
<Label
|
||||
Canvas.Left="986"
|
||||
Canvas.Top="122"
|
||||
Canvas.Left="915"
|
||||
Canvas.Top="88"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
VerticalAlignment="Center"
|
||||
Content="COND"
|
||||
FontSize="16"
|
||||
FontWeight="Bold" />
|
||||
<Label
|
||||
Canvas.Left="1275"
|
||||
Canvas.Top="255"
|
||||
Canvas.Left="1219"
|
||||
Canvas.Top="231"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
Content="冷凝器进水"
|
||||
Content="CCV1
冷凝器进水"
|
||||
FontSize="16"
|
||||
FontWeight="Bold" />
|
||||
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="290"
|
||||
Canvas.Top="325"
|
||||
Canvas.Top="290"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="转速"
|
||||
CellUnit="RPM"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding SpeedTag.Unit}"
|
||||
CellValue="{Binding SpeedTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="301"
|
||||
Canvas.Top="120"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="电压"
|
||||
CellUnit="V"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding ComCapBusVolTag.Unit}"
|
||||
CellValue="{Binding ComCapBusVolTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="301"
|
||||
Canvas.Top="170"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="电流"
|
||||
CellUnit="A"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding ComCapBusCurTag.Unit}"
|
||||
CellValue="{Binding ComCapBusCurTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="301"
|
||||
Canvas.Top="220"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="功率"
|
||||
CellUnit="W"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding ComCapPwTag.Unit}"
|
||||
CellValue="{Binding ComCapPwTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="88"
|
||||
Canvas.Top="169"
|
||||
Canvas.Left="105"
|
||||
Canvas.Top="147"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="排气口压力"
|
||||
CellUnit="MpaA"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding ExPressTag.Unit}"
|
||||
CellValue="{Binding ExPressTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="89"
|
||||
Canvas.Top="215"
|
||||
Canvas.Left="106"
|
||||
Canvas.Top="193"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="吸气口温度"
|
||||
CellUnit="℃"
|
||||
CellValue="15" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="88"
|
||||
Canvas.Top="314"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="吸气口压力"
|
||||
CellUnit="MpaA"
|
||||
CellValue="15" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="89"
|
||||
Canvas.Top="360"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="排气口温度"
|
||||
CellUnit="℃"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding ExTempTag.Unit}"
|
||||
CellValue="{Binding ExTempTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="610"
|
||||
Canvas.Top="289"
|
||||
Canvas.Left="105"
|
||||
Canvas.Top="292"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="吸气口压力"
|
||||
CellUnit="{Binding InhPressTag.Unit}"
|
||||
CellValue="{Binding InhPressTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="106"
|
||||
Canvas.Top="338"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="吸气口温度"
|
||||
CellUnit="{Binding InhTempTag.Unit}"
|
||||
CellValue="{Binding InhTempTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="551"
|
||||
Canvas.Top="272"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="吸气压力MV"
|
||||
CellUnit="%"
|
||||
CellValue="15" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1070"
|
||||
Canvas.Top="434"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="阀前温度"
|
||||
CellUnit="℃"
|
||||
CellValue="15" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1070"
|
||||
Canvas.Top="490"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="阀前压力"
|
||||
CellUnit="MpaA"
|
||||
CellValue="15" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="703"
|
||||
Canvas.Top="464"
|
||||
Canvas.Left="1003"
|
||||
Canvas.Top="152"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="阀前温度"
|
||||
CellUnit="{Binding TxvFrTempTag.Unit}"
|
||||
CellValue="{Binding TxvFrTempTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1003"
|
||||
Canvas.Top="239"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="阀前压力"
|
||||
CellUnit="{Binding TxvFrPressTag.Unit}"
|
||||
CellValue="{Binding TxvFrPressTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="635"
|
||||
Canvas.Top="420"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="吸气混合器温度"
|
||||
CellUnit="℃"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding OS2TempTag.Unit}"
|
||||
CellValue="{Binding OS2TempTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1125"
|
||||
Canvas.Top="369"
|
||||
Canvas.Left="1190"
|
||||
Canvas.Top="357"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="冷凝器进水温"
|
||||
CellUnit="℃"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding Cond1TempTag.Unit}"
|
||||
CellValue="{Binding Cond1TempTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1240"
|
||||
Canvas.Top="370"
|
||||
Canvas.Left="1074"
|
||||
Canvas.Top="357"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="冷凝器出水温"
|
||||
CellUnit="℃"
|
||||
CellValue="15" />
|
||||
CellUnit="{Binding CondInTempTag.Unit}"
|
||||
CellValue="{Binding CondInTempTag.EngValueStr}" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="1280"
|
||||
Canvas.Top="159"
|
||||
Canvas.Left="1217"
|
||||
Canvas.Top="136"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="排气压力MV"
|
||||
CellUnit="%"
|
||||
CellValue="15" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="932"
|
||||
Canvas.Top="170"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
CellTitle="流量"
|
||||
CellUnit="kg/h"
|
||||
CellValue="15" />
|
||||
<Controls:ValueShow
|
||||
Canvas.Left="932"
|
||||
Canvas.Left="871"
|
||||
Canvas.Top="224"
|
||||
HorizontalAlignment="Center"
|
||||
VerticalAlignment="Top"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Center"
|
||||
CellTitle="吸气温度MV"
|
||||
CellUnit="%"
|
||||
CellValue="15" />
|
||||
<Label
|
||||
Canvas.Left="1339"
|
||||
Canvas.Top="135"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Content="CCV2"
|
||||
FontSize="16"
|
||||
FontWeight="Bold" />
|
||||
<Label
|
||||
Canvas.Left="1247"
|
||||
Canvas.Top="4"
|
||||
HorizontalAlignment="Left"
|
||||
VerticalAlignment="Top"
|
||||
Content="工艺图流程图"
|
||||
FontSize="30"
|
||||
FontWeight="Bold"
|
||||
Foreground="Gray" />
|
||||
|
||||
</Canvas>
|
||||
</Grid>
|
||||
|
||||
Reference in New Issue
Block a user