liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change.

Browse Source
dev
liuwf 1 year ago
parent 4187eaa1ca
commit 867212e6b6
2 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File

2
Aucma.Core.OldBoxFoam/ViewModels/RoadKindPageViewModel.cs
Unescape Escape View File

@ -38,6 +38,8 @@ namespace Aucma.Core.BoxFoam.ViewModels
{ {
OldBoxFoamTypeModel model= new OldBoxFoamTypeModel(); OldBoxFoamTypeModel model= new OldBoxFoamTypeModel();
model.MaterialCode = item.MaterialCode; model.MaterialCode = item.MaterialCode;
model.MaterialName = item.MaterialName;
model.ObjId = item.ObjId;
model.Status = "1"; model.Status = "1";
Shapes.Add(model); Shapes.Add(model);
} }

28
Aucma.Core.OldBoxFoam/Views/RoadKindPageView.xaml
Unescape Escape View File

@ -151,7 +151,7 @@
<Grid Margin="3,3"> <Grid Margin="3,3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
<RowDefinition Height="3*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Border Grid.Row="0"> <Border Grid.Row="0">
<Grid> <Grid>
@ -187,29 +187,29 @@
<ColumnDefinition Width="6*"/> <ColumnDefinition Width="6*"/>
</Grid.ColumnDefinitions>--> </Grid.ColumnDefinitions>-->
<Border Grid.Column="0" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="0" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock x:Name="spaceCodeText" Text="{Binding ObjId}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Grid Grid.Column="1" > <Grid Grid.Column="1" >
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="3*"/> <ColumnDefinition Width="3*"/>
<ColumnDefinition Width="4*"/> <ColumnDefinition Width="4*"/>
<ColumnDefinition Width="2*"/> <!--<ColumnDefinition Width="2*"/>-->
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <!--<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> --><!--<RowDefinition/>--><!--
</Grid.RowDefinitions>-->
<Border Grid.Column="0" Grid.Row="0" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="0" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText1" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="1" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText2" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock x:Name="spaceCodeText2" Text="{Binding MaterialName}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Column="2" Grid.Row="0" BorderBrush="White" BorderThickness="1" > <!--<Border Grid.Column="2" Grid.Row="0" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>-->
<Border Grid.Column="0" Grid.Row="1" BorderBrush="White" BorderThickness="1" > <!--<Border Grid.Column="0" Grid.Row="1" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText5" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock x:Name="spaceCodeText5" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Column="1" Grid.Row="1" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="1" Grid.Row="1" BorderBrush="White" BorderThickness="1" >
@ -217,8 +217,8 @@
</Border> </Border>
<Border Grid.Column="2" Grid.Row="1" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="2" Grid.Row="1" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>-->
<Border Grid.Column="0" Grid.Row="2" BorderBrush="White" BorderThickness="1" > <!--<Border Grid.Column="0" Grid.Row="2" BorderBrush="White" BorderThickness="1" >
<TextBlock x:Name="spaceCodeText7" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock x:Name="spaceCodeText7" Text="{Binding MaterialCode}" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>
<Border Grid.Column="1" Grid.Row="2" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="1" Grid.Row="2" BorderBrush="White" BorderThickness="1" >
@ -226,7 +226,7 @@
</Border> </Border>
<Border Grid.Column="2" Grid.Row="2" BorderBrush="White" BorderThickness="1" > <Border Grid.Column="2" Grid.Row="2" BorderBrush="White" BorderThickness="1" >
<TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/> <TextBlock Text="清除" FontSize="18" Foreground="White" VerticalAlignment="Center" HorizontalAlignment="Center"/>
</Border> </Border>-->
</Grid> </Grid>
</Grid> </Grid>

Write Preview
Loading…
Cancel
Save