alielie
2025-03-13 ba6207f52db76ab47cd6534de0cf1712674ff179
HMI.IOMonitor/IOMonitor.xaml
@@ -41,9 +41,9 @@
                    <Button Style="{StaticResource AddBtn}" x:Name="addBtn" Click="Button_Click"/>
                    <Button Style="{StaticResource ImportBtn}" x:Name="importBtn" Click="Button_Click"/>
                </StackPanel>
                <TextBlock DockPanel.Dock="Left" VerticalAlignment="Center" 
                       FontSize="{StaticResource TitleFontSize}" Text="DIO监控"/>
                       FontSize="{StaticResource TitleFontSize}" Text="{DynamicResource DIO.Title}"/>
            </DockPanel>
            <Border Grid.Row="1" Style="{StaticResource CardBoarder}" Padding="0">
@@ -61,24 +61,25 @@
                        <RowDefinition/>
                    </Grid.RowDefinitions>
                    <Label Grid.Row="0" Grid.Column="0" Content="DI名称"
                    <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource DIO.di.Name}"
                       FontSize="{StaticResource ContentFontSize}"/>
                    <ComboBox Grid.Row="0" Grid.Column="1" x:Name="diName" 
                          IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
                    <Button Style="{StaticResource PrimaryButton}" Grid.Row="0" Grid.Column="2" 
                        x:Name="diSelect" Click="Button_Click"
                        >DI查询</Button>
                        Content="{DynamicResource DIO.di.Query}"/>
                    <Button Style="{StaticResource PrimaryButton}" Grid.Row="0" Grid.Column="3"
                        x:Name="diReset" Click="Button_Click">DI重置</Button>
                        x:Name="diReset" Click="Button_Click"
                            Content="{DynamicResource DIO.di.Reset}"/>
                    <Label Grid.Row="1" Grid.Column="0" Content="DI编号"
                    <Label Grid.Row="1" Grid.Column="0" Content="{DynamicResource DIO.di.Code}"
       FontSize="{StaticResource ContentFontSize}"/>
                    <ComboBox Grid.Row="1" Grid.Column="1" x:Name="diCode" 
                          IsEditable="True"
                          Style="{StaticResource FormComboxStyle}"/>
                    <Label Grid.Row="2" Grid.Column="0" Content="DI分组"
                    <Label Grid.Row="2" Grid.Column="0" Content="{DynamicResource DIO.di.Group}"
       FontSize="{StaticResource ContentFontSize}"/>
                    <ComboBox Grid.Row="2" Grid.Column="1" x:Name="diGroup" 
                          IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
@@ -97,13 +98,6 @@
                            </Style>
                        </DataGrid.RowStyle>
                        <DataGrid.Columns>
                            <!--<DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
                                <DataGridTemplateColumn.CellTemplate>
                                    <DataTemplate>
                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Selected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                                    </DataTemplate>
                                </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>-->
                            <DataGridTemplateColumn Header="#" CanUserResize="False">
                                <DataGridTemplateColumn.CellTemplate>
                                    <DataTemplate>
@@ -112,30 +106,29 @@
                                    </DataTemplate>
                                </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Code}" Header="编号" />
                            <DataGridTextColumn Width="*" Binding="{Binding Name}" Header="名称" />
                            <DataGridTextColumn Width="*" Binding="{Binding Type}" Header="类型" />
                            <DataGridTextColumn Width="*" Binding="{Binding Value}" Header="DI值" />
                            <!--<DataGridTemplateColumn Header="操作" Width="100" IsReadOnly="True" CanUserResize="False">
                                <DataGridTemplateColumn.CellTemplate>
                                    <DataTemplate>
                                        <StackPanel Orientation="Horizontal">
                                            <Button x:Name="editBtn" Style="{StaticResource RowLink}"
            Margin="0,0,10,0"
            Click="Button_Click"
            DataContext="{Binding }">编辑</Button>
                                            <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}"
            DataContext="{Binding }"
            Click="Button_Click">删除</Button>
                                        </StackPanel>
                                    </DataTemplate>
                                </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>-->
                            <DataGridTextColumn Width="*" Binding="{Binding Code}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.Code}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Name}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.Name}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Type}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.Type}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Value}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.di.Value}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                        </DataGrid.Columns>
                    </DataGrid>
                </Grid>
            </Border>
            <Border Grid.Row="1" Grid.Column="1" Style="{StaticResource CardBoarder}" Padding="0">
@@ -153,23 +146,22 @@
                        <RowDefinition/>
                    </Grid.RowDefinitions>
                    <Label Grid.Row="0" Grid.Column="0" Content="DO名称"
                    <Label Grid.Row="0" Grid.Column="0" Content="{DynamicResource DIO.do.Name}"
                   FontSize="{StaticResource ContentFontSize}"/>
                    <ComboBox Grid.Row="0" Grid.Column="1" x:Name="doName"
                          IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
                    <Button Style="{StaticResource PrimaryButton}" Grid.Row="0" Grid.Column="2"
                        x:Name="doSelect" Click="Button_Click">DO查询</Button>
                        x:Name="doSelect" Click="Button_Click" Content="{DynamicResource DIO.do.Query}"/>
                    <Button Style="{StaticResource PrimaryButton}" Grid.Row="0" Grid.Column="3"
                        x:Name="doReset" Click="Button_Click"
                        >DO重置</Button>
                        x:Name="doReset" Click="Button_Click" Content="{DynamicResource DIO.do.Reset}"/>
                    <Label Grid.Row="1" Grid.Column="0" Content="DO编号"
                    <Label Grid.Row="1" Grid.Column="0" Content="{DynamicResource DIO.do.Code}"
   FontSize="{StaticResource ContentFontSize}"/>
                    <ComboBox Grid.Row="1" Grid.Column="1" x:Name="doCode"
                          IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
                    <Label Grid.Row="2" Grid.Column="0" Content="DO分组"
                    <Label Grid.Row="2" Grid.Column="0" Content="{DynamicResource DIO.do.Group}"
   FontSize="{StaticResource ContentFontSize}"/>
                    <ComboBox Grid.Row="2" Grid.Column="1" x:Name="doGroup"
                          IsEditable="True" Style="{StaticResource FormComboxStyle}"/>
@@ -187,13 +179,6 @@
                            </Style>
                        </DataGrid.RowStyle>
                        <DataGrid.Columns>
                            <!--<DataGridTemplateColumn Header="" Width="Auto" CanUserResize="False">
                                <DataGridTemplateColumn.CellTemplate>
                                    <DataTemplate>
                                        <CheckBox VerticalAlignment="Center" IsChecked="{Binding Selected,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"/>
                                    </DataTemplate>
                                </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>-->
                            <DataGridTemplateColumn Header="#" CanUserResize="False">
                                <DataGridTemplateColumn.CellTemplate>
                                    <DataTemplate>
@@ -202,25 +187,26 @@
                                    </DataTemplate>
                                </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Code}" Header="编号" />
                            <DataGridTextColumn Width="*" Binding="{Binding Name}" Header="名称" />
                            <DataGridTextColumn Width="*" Binding="{Binding Type}" Header="类型" />
                            <DataGridTextColumn Width="*" Binding="{Binding Value}" Header="DO值" />
                            <!--<DataGridTemplateColumn Header="操作" Width="100" IsReadOnly="True" CanUserResize="False">
                                <DataGridTemplateColumn.CellTemplate>
                                    <DataTemplate>
                                        <StackPanel Orientation="Horizontal">
                                            <Button x:Name="editBtn" Style="{StaticResource RowLink}"
        Margin="0,0,10,0"
        Click="Button_Click"
        DataContext="{Binding }">编辑</Button>
                                            <Button x:Name="delBtn" Style="{StaticResource DangerLinkButton}"
        DataContext="{Binding }"
        Click="Button_Click">删除</Button>
                                        </StackPanel>
                                    </DataTemplate>
                                </DataGridTemplateColumn.CellTemplate>
                            </DataGridTemplateColumn>-->
                            <DataGridTextColumn Width="*" Binding="{Binding Code}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.Code}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Name}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.Name}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Type}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.Type}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                            <DataGridTextColumn Width="*" Binding="{Binding Value}">
                                <DataGridTextColumn.Header>
                                    <TextBlock Text="{DynamicResource DIO.do.Value}"/>
                                </DataGridTextColumn.Header>
                            </DataGridTextColumn>
                        </DataGrid.Columns>
                    </DataGrid>
                </Grid>