Browse Source

fix carrierId展示问题

jiangjy 3 weeks ago
parent
commit
aa2468cdd5

+ 4 - 4
Furnace/FurnaceUI/Views/Maintenances/LPSensorView.xaml

@@ -74,7 +74,7 @@
                                 <TextBlock Style="{StaticResource TextBlock_Title}"  Grid.Row="0" Grid.Column="2" Text="ID"  FontSize="16"></TextBlock>
                                 <Border BorderBrush="Black" BorderThickness="1"  Grid.Row="2" Grid.Column="2"  >
                                     <StackPanel  Orientation="Horizontal">
-                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP1CarrierInfo.CarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
+                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP1CarrierInfoCarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
                                         <Button  Content="Read ID" Width="85" Height="40" FontSize="13" IsEnabled="{Binding IsEnableManualOperation}" >
                                             <i:Interaction.Triggers>
                                                 <i:EventTrigger EventName="Click">
@@ -286,7 +286,7 @@
                                 <TextBlock Style="{StaticResource TextBlock_Title}"  Grid.Row="0" Grid.Column="2" Text="ID"  FontSize="16"></TextBlock>
                                 <Border BorderBrush="Black" BorderThickness="1"  Grid.Row="2" Grid.Column="2"  >
                                     <StackPanel  Orientation="Horizontal">
-                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP2CarrierInfo.CarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
+                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP2CarrierInfoCarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
                                         <Button  Content="Read ID" Width="85" Height="40" FontSize="13" IsEnabled="{Binding IsEnableManualOperation}" >
                                             <i:Interaction.Triggers>
                                                 <i:EventTrigger EventName="Click">
@@ -497,7 +497,7 @@
                                 <TextBlock Style="{StaticResource TextBlock_Title}"  Grid.Row="0" Grid.Column="2" Text="ID"  FontSize="16"></TextBlock>
                                 <Border BorderBrush="Black" BorderThickness="1"  Grid.Row="2" Grid.Column="2"  >
                                     <StackPanel  Orientation="Horizontal">
-                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP3CarrierInfo.CarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
+                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP3CarrierInfoCarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
                                         <Button  Content="Read ID" Width="85" Height="40" FontSize="13" IsEnabled="{Binding IsEnableManualOperation}" >
                                             <i:Interaction.Triggers>
                                                 <i:EventTrigger EventName="Click">
@@ -708,7 +708,7 @@
                                 <TextBlock Style="{StaticResource TextBlock_Title}"  Grid.Row="0" Grid.Column="2" Text="ID"  FontSize="16"></TextBlock>
                                 <Border BorderBrush="Black" BorderThickness="1"  Grid.Row="2" Grid.Column="2"  >
                                     <StackPanel  Orientation="Horizontal">
-                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP4CarrierInfo.CarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
+                                        <Label BorderThickness="0"  Style="{StaticResource LableToTextBox}" Width="130" Content="{Binding  LP4CarrierInfoCarrierId,UpdateSourceTrigger=PropertyChanged}"   Height="40"></Label>
                                         <Button  Content="Read ID" Width="85" Height="40" FontSize="13" IsEnabled="{Binding IsEnableManualOperation}" >
                                             <i:Interaction.Triggers>
                                                 <i:EventTrigger EventName="Click">

+ 8 - 0
Furnace/FurnaceUI/Views/Maintenances/LPSensorViewModel.cs

@@ -197,6 +197,14 @@ namespace FurnaceUI.Views.Maintenances
         //        }
         //    }
         //}
+        [Subscription("LP1.CarrierId")]
+        public string LP1CarrierInfoCarrierId { get; set; }
+        [Subscription("LP2.CarrierId")]
+        public string LP2CarrierInfoCarrierId { get; set; }
+        [Subscription("LP3.CarrierId")]
+        public string LP3CarrierInfoCarrierId { get; set; }
+        [Subscription("LP4.CarrierId")]
+        public string LP4CarrierInfoCarrierId { get; set; }
         public void DoLoadPortCmd(string deviceName, string cmd)
         {