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

当前项目ProConfigView更改

Browse Source
This commit is contained in:
Tyrone CT
2024-12-21 20:40:36 +08:00
parent 8bd30b2c7b
commit 713b9b02e6
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -647,7 +647,7 @@
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn> <!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="润滑油压力&#x0A;(barA)" /> <TextBlock FontWeight="Bold" Text="润滑油压力&#x0A;(barA)" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
@@ -678,7 +678,7 @@
<TextBlock Text="{Binding MeterOCRInfo}" TextWrapping="Wrap" /> <TextBlock Text="{Binding MeterOCRInfo}" TextWrapping="Wrap" />
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>-->
<DataGridTemplateColumn> <DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
@@ -724,7 +724,7 @@
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn> <!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="EVAP出口温度(℃)&#x0A;(℃)" /> <TextBlock FontWeight="Bold" Text="EVAP出口温度(℃)&#x0A;(℃)" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
@@ -744,7 +744,7 @@
<TextBlock Text="{Binding MeterOS1TempInfo}" TextWrapping="Wrap" /> <TextBlock Text="{Binding MeterOS1TempInfo}" TextWrapping="Wrap" />
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>-->
<DataGridTemplateColumn> <DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
@@ -757,7 +757,7 @@
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>
<DataGridTemplateColumn> <!--<DataGridTemplateColumn>
<DataGridTemplateColumn.Header> <DataGridTemplateColumn.Header>
<TextBlock FontWeight="Bold" Text="PTC入口温度 &#x0A;(℃)" /> <TextBlock FontWeight="Bold" Text="PTC入口温度 &#x0A;(℃)" />
</DataGridTemplateColumn.Header> </DataGridTemplateColumn.Header>
@@ -799,7 +799,7 @@
<TextBlock Text="{Binding MeterCond2TempInfo}" TextWrapping="Wrap" /> <TextBlock Text="{Binding MeterCond2TempInfo}" TextWrapping="Wrap" />
</DataTemplate> </DataTemplate>
</DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn> </DataGridTemplateColumn>-->
<!--<DataGridTemplateColumn Width="200" Header="压缩机转速&#x0A;信息"> <!--<DataGridTemplateColumn Width="200" Header="压缩机转速&#x0A;信息">
@@ -1479,7 +1479,7 @@
TotalSlopTime="{Binding MeterCond1TempExDto.SlopTime}" /> TotalSlopTime="{Binding MeterCond1TempExDto.SlopTime}" />
</TabItem> </TabItem>
<TabItem> <!--<TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel <StackPanel
Width="90" Width="90"
@@ -1613,7 +1613,7 @@
SelectedMeter="{Binding SelectedSlopEVAPExpTemp, Mode=TwoWay}" SelectedMeter="{Binding SelectedSlopEVAPExpTemp, Mode=TwoWay}"
SwitchConstSlopCommand="{Binding MeterEVAPExpTempSwitchConstSlopCmd}" SwitchConstSlopCommand="{Binding MeterEVAPExpTempSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterEVAPExpTempExDto.SlopTime}" /> TotalSlopTime="{Binding MeterEVAPExpTempExDto.SlopTime}" />
</TabItem> </TabItem>-->
@@ -1686,7 +1686,7 @@
TotalSlopTime="{Binding MeterLVVolExDto.SlopTime}" /> TotalSlopTime="{Binding MeterLVVolExDto.SlopTime}" />
</TabItem> </TabItem>
<TabItem> <!--<TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel <StackPanel
Width="90" Width="90"
@@ -1752,7 +1752,7 @@
SelectedMeter="{Binding SelectedSlopOS1Temp, Mode=TwoWay}" SelectedMeter="{Binding SelectedSlopOS1Temp, Mode=TwoWay}"
SwitchConstSlopCommand="{Binding MeterOS1TempSwitchConstSlopCmd}" SwitchConstSlopCommand="{Binding MeterOS1TempSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterOS1TempExDto.SlopTime}" /> TotalSlopTime="{Binding MeterOS1TempExDto.SlopTime}" />
</TabItem> </TabItem>-->
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
@@ -1787,7 +1787,8 @@
SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}" SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" /> TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
</TabItem> </TabItem>
<TabItem>
<!--<TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel <StackPanel
Width="90" Width="90"
@@ -1886,7 +1887,7 @@
SelectedMeter="{Binding SelectedSlopPTCPw, Mode=TwoWay}" SelectedMeter="{Binding SelectedSlopPTCPw, Mode=TwoWay}"
SwitchConstSlopCommand="{Binding MeterPTCPwSwitchConstSlopCmd}" SwitchConstSlopCommand="{Binding MeterPTCPwSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterPTCPwExDto.SlopTime}" /> TotalSlopTime="{Binding MeterPTCPwExDto.SlopTime}" />
</TabItem> </TabItem>-->
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>