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
2025-03-04 22:34:46 +08:00
parent d0aca2cbdb
commit 8b96c482f7
3 changed files with 87 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CapMachine.Wpf/Models/Tag/QuickTag.cs
View File

@@ -72,6 +72,8 @@ namespace CapMachine.Wpf.Models.Tag
get { return _OperateResultSource; } get { return _OperateResultSource; }
set set
{ {
if (value!.Content == null) return;
switch (ValueType) switch (ValueType)
{ {
case DataType.Short: case DataType.Short:

12
CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
View File

@@ -17,6 +17,7 @@ using System.Collections.ObjectModel;
using System.Data; using System.Data;
using System.Text; using System.Text;
using System.Windows; using System.Windows;
using System.Windows.Controls;
namespace CapMachine.Wpf.ViewModels namespace CapMachine.Wpf.ViewModels
{ {
@@ -1759,7 +1760,16 @@ namespace CapMachine.Wpf.ViewModels
// cr.EndEdit(); // cr.EndEdit();
//} //}
var dd = par; //if (par is DataGrid dataGrid && dataGrid.SelectedCells.Count > 0)
//{
// var selectedCell = dataGrid.SelectedCells[0];
// string columnHeader = selectedCell.Column.Header?.ToString();
// // 处理列头信息
//}
//var dd = par;
//var dd = new SelectedCellsCollection(); //var dd = new SelectedCellsCollection();
//if (par is SelectedCellCo selectedCells) //if (par is SelectedCellCo selectedCells)
//{ //{

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

@@ -833,9 +833,11 @@
<prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}" /> <prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}" />
</i:EventTrigger> </i:EventTrigger>
<i:EventTrigger EventName="SelectedCellsChanged"> <i:EventTrigger EventName="SelectedCellsChanged">
<prism:InvokeCommandAction Command="{Binding GridSelectedCellsChangedCmd}" CommandParameter="{Binding SelectedCells, ElementName=MainDatagrid}" /> <prism:InvokeCommandAction Command="{Binding GridSelectedCellsChangedCmd}" CommandParameter="{Binding ElementName=MainDatagrid}" />
</i:EventTrigger> </i:EventTrigger>
</i:Interaction.Triggers> </i:Interaction.Triggers>
<!-- CommandParameter="{Binding SelectedCells, ElementName=MainDatagrid}" /> -->
<!--<prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}}" />--> <!--<prism:InvokeCommandAction Command="{Binding GridSelectionChangedCmd}" CommandParameter="{Binding RelativeSource={RelativeSource AncestorType=DataGrid}}" />-->
<!-- CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}" --> <!-- CommandParameter="{Binding ElementName=MainDatagrid, Path=SelectedItem}" -->
<!--<DataGrid.RowStyle> <!--<DataGrid.RowStyle>
@@ -1474,7 +1476,7 @@
VerticalAlignment="Center" VerticalAlignment="Center"
FontSize="12" FontSize="12"
FontWeight="Bold" FontWeight="Bold"
Text="COND1温度&#10;(℃)" /> Text="冷凝器出口水温&#x0A;(℃)" />
</StackPanel> </StackPanel>
</TabItem.Header> </TabItem.Header>
<Controls:MeterConfig <Controls:MeterConfig
@@ -1488,7 +1490,7 @@
EditCommand="{Binding ProStepCond1TempEditCmd}" EditCommand="{Binding ProStepCond1TempEditCmd}"
IsTimeOk="{Binding MeterCond1TempExDto.IsTimeOk}" IsTimeOk="{Binding MeterCond1TempExDto.IsTimeOk}"
ListMeter="{Binding ListSlopMeterCond1TempItems}" ListMeter="{Binding ListSlopMeterCond1TempItems}"
MeterName="COND1温度" MeterName="冷凝器出口水温"
MeterSelectedChangedCmd="{Binding MeterCond1TempSlopSelectedChangedCmd}" MeterSelectedChangedCmd="{Binding MeterCond1TempSlopSelectedChangedCmd}"
ParConfigCommand="{Binding MeterCond1TempParConfigCmd}" ParConfigCommand="{Binding MeterCond1TempParConfigCmd}"
SelectedMeter="{Binding SelectedSlopCond1Temp, Mode=TwoWay}" SelectedMeter="{Binding SelectedSlopCond1Temp, Mode=TwoWay}"
@@ -1633,6 +1635,40 @@
</TabItem>--> </TabItem>-->
<TabItem>
<TabItem.Header>
<StackPanel
Width="90"
Margin="-20"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="吸气混合器温度&#x0A;(℃)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig
Margin="5,5,0,5"
AddCommand="{Binding ProStepOS2TempAddCmd}"
ConstSlopSelectedIndex="{Binding ProStepOS2TempSwitchConstSlopIndex, Mode=TwoWay}"
ConstantSaveCommand="{Binding ProStepOS2TempConstantSaveCmd}"
ConstantValue="{Binding SelectedConstOS2TempValue, Mode=TwoWay}"
Cycle="{Binding MeterOS2TempExDto.SlopCycle}"
DeleteCommand="{Binding ProStepOS2TempDeleteCmd}"
EditCommand="{Binding ProStepOS2TempEditCmd}"
IsTimeOk="{Binding MeterOS2TempExDto.IsTimeOk}"
ListMeter="{Binding ListSlopMeterOS2TempItems}"
MeterName="吸气混合器温度"
MeterSelectedChangedCmd="{Binding MeterOS2TempSlopSelectedChangedCmd}"
ParConfigCommand="{Binding MeterOS2TempParConfigCmd}"
SelectedMeter="{Binding SelectedSlopOS2Temp, Mode=TwoWay}"
SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
</TabItem>
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
@@ -1668,7 +1704,6 @@
TotalSlopTime="{Binding MeterHVVolExDto.SlopTime}" /> TotalSlopTime="{Binding MeterHVVolExDto.SlopTime}" />
</TabItem> </TabItem>
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel <StackPanel
@@ -1771,39 +1806,7 @@
TotalSlopTime="{Binding MeterOS1TempExDto.SlopTime}" /> TotalSlopTime="{Binding MeterOS1TempExDto.SlopTime}" />
</TabItem>--> </TabItem>-->
<TabItem>
<TabItem.Header>
<StackPanel
Width="90"
Margin="-20"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="OS2温度&#10;(℃)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig
Margin="5,5,0,5"
AddCommand="{Binding ProStepOS2TempAddCmd}"
ConstSlopSelectedIndex="{Binding ProStepOS2TempSwitchConstSlopIndex, Mode=TwoWay}"
ConstantSaveCommand="{Binding ProStepOS2TempConstantSaveCmd}"
ConstantValue="{Binding SelectedConstOS2TempValue, Mode=TwoWay}"
Cycle="{Binding MeterOS2TempExDto.SlopCycle}"
DeleteCommand="{Binding ProStepOS2TempDeleteCmd}"
EditCommand="{Binding ProStepOS2TempEditCmd}"
IsTimeOk="{Binding MeterOS2TempExDto.IsTimeOk}"
ListMeter="{Binding ListSlopMeterOS2TempItems}"
MeterName="OS2温度"
MeterSelectedChangedCmd="{Binding MeterOS2TempSlopSelectedChangedCmd}"
ParConfigCommand="{Binding MeterOS2TempParConfigCmd}"
SelectedMeter="{Binding SelectedSlopOS2Temp, Mode=TwoWay}"
SwitchConstSlopCommand="{Binding MeterOS2TempSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterOS2TempExDto.SlopTime}" />
</TabItem>
<!--<TabItem> <!--<TabItem>
<TabItem.Header> <TabItem.Header>
@@ -1906,40 +1909,6 @@
TotalSlopTime="{Binding MeterPTCPwExDto.SlopTime}" /> TotalSlopTime="{Binding MeterPTCPwExDto.SlopTime}" />
</TabItem>--> </TabItem>-->
<TabItem>
<TabItem.Header>
<StackPanel
Width="90"
Margin="-20"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="压缩机环境湿度&#10;(%)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig
Margin="5,5,0,5"
AddCommand="{Binding ProStepEnvRHAddCmd}"
ConstSlopSelectedIndex="{Binding ProStepEnvRHSwitchConstSlopIndex, Mode=TwoWay}"
ConstantSaveCommand="{Binding ProStepEnvRHConstantSaveCmd}"
ConstantValue="{Binding SelectedConstEnvRHValue, Mode=TwoWay}"
Cycle="{Binding MeterEnvRHExDto.SlopCycle}"
DeleteCommand="{Binding ProStepEnvRHDeleteCmd}"
EditCommand="{Binding ProStepEnvRHEditCmd}"
IsTimeOk="{Binding MeterEnvRHExDto.IsTimeOk}"
ListMeter="{Binding ListSlopMeterEnvRHItems}"
MeterName="压缩机环境湿度"
MeterSelectedChangedCmd="{Binding MeterEnvRHSlopSelectedChangedCmd}"
ParConfigCommand="{Binding MeterEnvRHParConfigCmd}"
SelectedMeter="{Binding SelectedSlopEnvRH, Mode=TwoWay}"
SwitchConstSlopCommand="{Binding MeterEnvRHSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterEnvRHExDto.SlopTime}" />
</TabItem>
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<StackPanel <StackPanel
@@ -1974,6 +1943,40 @@
TotalSlopTime="{Binding MeterEnvTempExDto.SlopTime}" /> TotalSlopTime="{Binding MeterEnvTempExDto.SlopTime}" />
</TabItem> </TabItem>
<TabItem>
<TabItem.Header>
<StackPanel
Width="90"
Margin="-20"
HorizontalAlignment="Center"
VerticalAlignment="Center">
<TextBlock
HorizontalAlignment="Center"
VerticalAlignment="Center"
FontSize="12"
FontWeight="Bold"
Text="压缩机环境湿度&#10;(%)" />
</StackPanel>
</TabItem.Header>
<Controls:MeterConfig
Margin="5,5,0,5"
AddCommand="{Binding ProStepEnvRHAddCmd}"
ConstSlopSelectedIndex="{Binding ProStepEnvRHSwitchConstSlopIndex, Mode=TwoWay}"
ConstantSaveCommand="{Binding ProStepEnvRHConstantSaveCmd}"
ConstantValue="{Binding SelectedConstEnvRHValue, Mode=TwoWay}"
Cycle="{Binding MeterEnvRHExDto.SlopCycle}"
DeleteCommand="{Binding ProStepEnvRHDeleteCmd}"
EditCommand="{Binding ProStepEnvRHEditCmd}"
IsTimeOk="{Binding MeterEnvRHExDto.IsTimeOk}"
ListMeter="{Binding ListSlopMeterEnvRHItems}"
MeterName="压缩机环境湿度"
MeterSelectedChangedCmd="{Binding MeterEnvRHSlopSelectedChangedCmd}"
ParConfigCommand="{Binding MeterEnvRHParConfigCmd}"
SelectedMeter="{Binding SelectedSlopEnvRH, Mode=TwoWay}"
SwitchConstSlopCommand="{Binding MeterEnvRHSwitchConstSlopCmd}"
TotalSlopTime="{Binding MeterEnvRHExDto.SlopTime}" />
</TabItem>
</TabControl> </TabControl>