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

更改了CAN和LIN的标志着色问题

Browse Source 
保存图片触发两次
CANLIN的一些数据回读到PLC
This commit is contained in:
Tyrone CT
2025-01-12 15:32:02 +08:00
parent e49a48fb25
commit 914a8b3dbc
15 changed files with 333 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CapMachine.Wpf/Views/CANConfigView.xaml
View File

@@ -73,7 +73,7 @@
<Grid.ColumnDefinitions>
<ColumnDefinition Width="400" />
<ColumnDefinition />
<ColumnDefinition Width="500" />
<ColumnDefinition Width="550" />
</Grid.ColumnDefinitions>
<Grid Margin="3">
@@ -931,6 +931,14 @@
</ContextMenu>
</Setter.Value>
</Setter>
<Style.Triggers>
<DataTrigger Binding="{Binding IsSeletedInfo}" Value="1">
<Setter Property="Background" Value="GreenYellow" />
</DataTrigger>
<DataTrigger Binding="{Binding IsSeletedInfo}" Value="2">
<Setter Property="Background" Value="SkyBlue" />
</DataTrigger>
</Style.Triggers>
</Style>
</DataGrid.RowStyle>

8
CapMachine.Wpf/Views/HistoryDataView.xaml
View File

@@ -73,7 +73,7 @@
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<Button
<!--<Button
Margin="5,0"
HorizontalAlignment="Center"
Command="{Binding ReportDataCmd}"
@@ -89,7 +89,7 @@
Text="&#xedde;" />
<TextBlock Text="导出Excel数据" />
</StackPanel>
</Button>
</Button>-->
<Button
Margin="5,0"
HorizontalAlignment="Center"
@@ -209,7 +209,7 @@
SelectionMode="Extended"
SelectionUnit="FullRow">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding Name}">
<DataGridTextColumn MinWidth="300" Binding="{Binding Name}">
<DataGridTextColumn.Header>
<TextBlock FontWeight="Bold" Text="试验名称" />
</DataGridTextColumn.Header>
@@ -271,7 +271,7 @@
SelectionMode="Extended"
SelectionUnit="FullRow">
<DataGrid.Columns>
<DataGridTextColumn Binding="{Binding WorkDay}">
<DataGridTextColumn MinWidth="300" Binding="{Binding WorkDay}">
<DataGridTextColumn.Header>
<TextBlock FontWeight="Bold" Text="文件名称/日期" />
</DataGridTextColumn.Header>

8
CapMachine.Wpf/Views/LINConfigView.xaml
View File

@@ -930,6 +930,14 @@
</ContextMenu>
</Setter.Value>
</Setter>
<Style.Triggers>
<DataTrigger Binding="{Binding IsSeletedInfo}" Value="1">
<Setter Property="Background" Value="GreenYellow" />
</DataTrigger>
<DataTrigger Binding="{Binding IsSeletedInfo}" Value="2">
<Setter Property="Background" Value="SkyBlue" />
</DataTrigger>
</Style.Triggers>
</Style>
</DataGrid.RowStyle>

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

@@ -1269,11 +1269,11 @@
ToolTip="输出锁定" />
</StackPanel>
<StackPanel Grid.Column="1" HorizontalAlignment="Center">
<TextBlock FontSize="12" Text="参数编号(1～16)" />
<TextBlock FontSize="12" Text="参数编号(1～10)" />
<TextBox Style="{StaticResource txtboxStyle}" Text="{Binding SelectedSlopMeterSpeed.ParNo}" />
</StackPanel>
<StackPanel Grid.Column="2" HorizontalAlignment="Center">
<TextBlock FontSize="12" Text="EV(1～4)" />
<TextBlock FontSize="12" Text="EV(1～2)" />
<TextBox Style="{StaticResource txtboxStyle}" Text="{Binding SelectedSlopMeterSpeed.Ev}" />
</StackPanel>
<StackPanel Grid.Column="3" HorizontalAlignment="Center">
@@ -1297,7 +1297,7 @@
Style="{StaticResource MaterialDesignSwitchToggleButton}"
ToolTip="吸排气阀" />
</StackPanel>
<StackPanel
<!--<StackPanel
Grid.Row="1"
Grid.Column="1"
HorizontalAlignment="Center">
@@ -1308,7 +1308,7 @@
IsChecked="{Binding SelectedSlopMeterSpeed.PTCEnable}"
Style="{StaticResource MaterialDesignSwitchToggleButton}"
ToolTip="PTC使能" />
</StackPanel>
</StackPanel>-->
</Grid>
</Border>