Browse Source

update axison

jiangjy 3 weeks ago
parent
commit
5b95c20106

+ 18 - 1
Furnace/FurnaceRT/Config/IO/ELK/DeviceModelPM.xml

@@ -237,8 +237,25 @@
 						diPositionB4="DI_BufferInPositionB4"
 						diPositionC4="DI_BufferInPositionC4"
 						diPositionD4="DI_BufferInPositionD4"
+					   
+					    diBufferStockA1="DI_BufferStockA1"
+					    diBufferStockB1="DI_BufferStockB1"
+					    diBufferStockC1="DI_BufferStockC1"
+					    diBufferStockD1="DI_BufferStockD1"
+					    diBufferStockA2="DI_BufferStockA2"
+					    diBufferStockB2="DI_BufferStockB2"
+					    diBufferStockC2="DI_BufferStockC2"
+					    diBufferStockD2="DI_BufferStockD2"
+					    diBufferStockA3="DI_BufferStockA3"
+					    diBufferStockB3="DI_BufferStockB3"
+					    diBufferStockC3="DI_BufferStockC3"
+					    diBufferStockD3="DI_BufferStockD3"
+					    diBufferStockA4="DI_BufferStockA4"
+					    diBufferStockB4="DI_BufferStockB4"
+					    diBufferStockC4="DI_BufferStockC4"
+					    diBufferStockD4="DI_BufferStockD4"
 						diServoOn="DI_BufferPowerOn"
-				   
+		
 						diNegativeLimit="DI_NegLmtAlmBufferAxis"
 						diPositiveLimit="DI_PotLmtAlmbBufferAxis"
 				   

BIN
Furnace/FurnaceRT/Config/VIDs/Equipment_VIDs_20250614.xlsx


+ 111 - 0
Furnace/FurnaceUI/Views/Maintenances/IOListEditView.xaml

@@ -1057,7 +1057,118 @@ Source="/FurnaceUI;component/Resources/Images/Controls3/bg1.png" />-->
                     </Grid>
                 </TabItem>
                 <TabItem Width="180" Header="AI-AO"  Visibility="{Binding DataContext.AIAOVisibility,RelativeSource={RelativeSource AncestorType=UserControl},UpdateSourceTrigger=PropertyChanged,Converter={StaticResource bool2VisibilityConverter}}" >
+                    <Grid Margin="10">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="0.5*" />
+                            <ColumnDefinition Width="80" />
+                            <ColumnDefinition Width="0.5*" />
+                        </Grid.ColumnDefinitions>
+                        <GroupBox VerticalAlignment="Top">
+                            <GroupBox.Header>
+                                <TextBlock Foreground="Black" Text="IN" />
+                            </GroupBox.Header>
+                            <ListBox  FontSize="14"
+     HorizontalContentAlignment="Stretch"
+     VerticalContentAlignment="Stretch"
+     ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+     ScrollViewer.VerticalScrollBarVisibility="Hidden"
+     IsManipulationEnabled="True" Foreground="Black" ItemsSource="{Binding DataContext.AIViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Height="40">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="45" />
+                                            </Grid.ColumnDefinitions>
+                                            <Border
+                            Grid.Column="0"
+                            Padding="5,1"
+                            BorderBrush="{DynamicResource DataGrid_Cell_BD}"
+                            BorderThickness="1,1,1,1">
+                                                <TextBlock
+                                             
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding Path=DisplayName}"
+                                ToolTip="{Binding Path=DisplayName}" />
+                                            </Border>
+                                            <Border
+                                               Background="White"
+                            Grid.Column="1"
+                            Padding="5,1"
+                            BorderBrush="{DynamicResource DataGrid_Cell_BD}"
+                            BorderThickness="0,1,1,1">
+                                                <TextBlock      HorizontalAlignment="Left"
+     VerticalAlignment="Center" Text="{Binding Path=Value}"  ></TextBlock>
+                                            </Border>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+                        </GroupBox>
+
+                        <GroupBox Grid.Column="2" VerticalAlignment="Top">
+                            <GroupBox.Header>
+                                <TextBlock Foreground="Black" Text="OUT" />
+                            </GroupBox.Header>
+                            <ListBox  FontSize="14"     HorizontalContentAlignment="Stretch"
+VerticalContentAlignment="Stretch"
+ScrollViewer.HorizontalScrollBarVisibility="Hidden"
+ScrollViewer.VerticalScrollBarVisibility="Hidden"
+IsManipulationEnabled="True"  Foreground="Black" ItemsSource="{Binding DataContext.AOViewSource, RelativeSource={RelativeSource AncestorType=UserControl}}">
+                                <ListBox.ItemTemplate>
+                                    <DataTemplate>
+                                        <Grid Height="40">
+                                            <Grid.ColumnDefinitions>
+                                                <ColumnDefinition Width="*" />
+                                                <ColumnDefinition Width="auto" />
+                                            </Grid.ColumnDefinitions>
+                                            <Border
+                            Padding="5,1"
+                            BorderBrush="{DynamicResource DataGrid_Cell_BD}"
+                            BorderThickness="1,1,1,1">
+                                                <TextBlock
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Center"
+                                Text="{Binding Path=DisplayName}"
+                                ToolTip="{Binding Path=DisplayName}" />
+                                            </Border>
+
+                                            <Border
+                            Grid.Column="1"
+                                               Grid.ColumnSpan="2"
+                            Padding="5,1"
+                            BorderBrush="{DynamicResource DataGrid_Cell_BD}"
+                            BorderThickness="0,1,1,1">
+
+                                                <StackPanel Orientation="Horizontal">
+                                                    <Label HorizontalAlignment="Center" VerticalAlignment="Center" Content="{Binding Path=Value,UpdateSourceTrigger=PropertyChanged}" Width="45"></Label>
+
+                                                    <TextBox Text="{Binding Path=NewValueFloat,UpdateSourceTrigger=PropertyChanged}" Width="45"></TextBox>
+                                                    <Button
+    Height="35"
+    Content="Set"
+    FontSize="14">
+                                                        <i:Interaction.Triggers>
+                                                            <i:EventTrigger EventName="Click">
+                                                                <cal:ActionMessage MethodName="SetAO">
+                                                                    <cal:Parameter Value="{Binding}" />
+                                                                </cal:ActionMessage>
+                                                            </i:EventTrigger>
+                                                        </i:Interaction.Triggers>
+                                                    </Button>
+                                                </StackPanel>
+
+                                            </Border>
+                                        </Grid>
+                                    </DataTemplate>
+                                </ListBox.ItemTemplate>
+                            </ListBox>
+
+                        </GroupBox>
+                    </Grid>
                 </TabItem>
+
             </TabControl>
         </DataTemplate>
     </UserControl.Resources>

+ 1 - 1
Furnace/FurnaceUI/Views/Maintenances/IOListEditViewModel.cs

@@ -363,7 +363,7 @@ namespace FurnaceUI.Views.Maintenances
                 }
                 return isfilter;
             };
-            if (!RunningModeIsDebug)
+            if (RunningModeIsDebug)
             {
                 OutViewSource = new ListCollectionView(DOs);
                 AOViewSource = new ListCollectionView(AOs);