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