105040 Update 优化界面
This commit is contained in:
parent
07c665e481
commit
dce99c813c
|
@ -23,7 +23,11 @@
|
|||
</Window.Resources>
|
||||
<TabControl>
|
||||
<TabItem Header="多芯线选型">
|
||||
<StackPanel Margin="0" Orientation="Vertical">
|
||||
<Grid Margin="0">
|
||||
<Grid.RowDefinitions>
|
||||
<RowDefinition Height="180" />
|
||||
<RowDefinition Height="*" />
|
||||
</Grid.RowDefinitions>
|
||||
<Border
|
||||
Grid.Row="0"
|
||||
Margin="0"
|
||||
|
@ -143,16 +147,20 @@
|
|||
</DockPanel>
|
||||
</hc:SimpleStackPanel>
|
||||
</Border>
|
||||
<ListBox ItemsSource="{Binding LecWires}">
|
||||
<ListBox.ItemTemplate>
|
||||
<DataTemplate>
|
||||
<StackPanel>
|
||||
<TextBlock Text="{Binding WireModelSpecification}" />
|
||||
</StackPanel>
|
||||
</DataTemplate>
|
||||
</ListBox.ItemTemplate>
|
||||
</ListBox>
|
||||
</StackPanel>
|
||||
<DataGrid
|
||||
Grid.Row="1"
|
||||
AutoGenerateColumns="False"
|
||||
ItemsSource="{Binding LecWires}">
|
||||
<DataGrid.Columns>
|
||||
<DataGridTextColumn Binding="{Binding ApplicationScenario}" Header="应用场景" />
|
||||
<DataGridTextColumn Binding="{Binding WireType}" Header="类型" />
|
||||
<DataGridTextColumn Binding="{Binding WireDiameterSpecification}" Header="线径规格(mm²)" />
|
||||
<DataGridTextColumn Binding="{Binding IsHighFlexibilityStr}" Header="是否高柔" />
|
||||
<DataGridTextColumn Binding="{Binding WireCoreCount}" Header="线芯数量" />
|
||||
<DataGridTextColumn Binding="{Binding WireModelSpecification}" Header="线材型号" />
|
||||
</DataGrid.Columns>
|
||||
</DataGrid>
|
||||
</Grid>
|
||||
</TabItem>
|
||||
<TabItem Header="数据抓取">
|
||||
<ListBox
|
||||
|
|
|
@ -374,7 +374,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel.MultiCoreWireViewModel
|
|||
{
|
||||
var wireData = new MultiCoreWireDataModel
|
||||
{
|
||||
WireModelSpecification = it.LibraryName
|
||||
WireModelSpecification = $"{it.Name} / {it.LibraryName}"
|
||||
};
|
||||
//Debug.WriteLine($"{it.Name} - {it.LibraryName}");
|
||||
if (it.Children?.Any() ?? false)
|
||||
|
@ -440,6 +440,7 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI.ViewModel.MultiCoreWireViewModel
|
|||
WireType = WireType,
|
||||
WireDiameterSpecification = WireDiameterSpecification,
|
||||
IsHighFlexibility = HighFlexibility == "是",
|
||||
IsHighFlexibilityStr = HighFlexibility,
|
||||
WireCoreCount = WireCoreCount,
|
||||
WireModelSpecification = WireModelSpecification,
|
||||
ConnectorModel = ConnectorModel,
|
||||
|
|
Loading…
Reference in New Issue