sc/formula_manage
1
0 Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Browse Source
This commit is contained in:
sc committed 2023-10-31 22:42:54 +08:00
2 parents 223a40ce5f 7430bfb3f5
commit bcf132dd6c
4 files changed
+7 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MainWindow.xaml
+2 -2
View File
@@ -122,8 +122,8 @@
<Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/> <Button Content="保存" HorizontalAlignment="Left" Height="40" Width="80" Margin="15,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="save" IsTabStop="False" Focusable ="False"/>
<Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/> <Button Content="删除" HorizontalAlignment="Left" Height="40" Width="80" Margin="100,0,0,20" VerticalAlignment="Bottom" FontSize="20" Background="#FFEFEFEF" BorderBrush="White" Click="delete" IsTabStop="False" Focusable ="False"/>
<Grid Height="255" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7" > <Grid Grid.Column="1">
<ContentControl x:Name="Deputy" /> <ContentControl x:Name="Deputy" Height="255" Margin="410,35,5,0" VerticalAlignment="Top" Background="#FFF7F7F7" />
</Grid> </Grid>
</Grid> </Grid>
MainWindow.xaml.cs
+1 -3
View File
@@ -147,9 +147,7 @@ namespace formula_manage
private void Button_Technology(object sender, RoutedEventArgs e) private void Button_Technology(object sender, RoutedEventArgs e)
{ {
// Window Deputy = new Window(); //支持导航预设工艺窗口 Deputy.Content = new View.ViewProcess(); //打开工艺选择
// Deputy.Content = new View.ViewProcess();
// Deputy.Show(); //打开窗口
} }
} }
} }
View/ViewProcess.xaml
+3 -6
View File
@@ -1,13 +1,11 @@
<Page x:Class="formula_manage.View.ViewProcess" <UserControl x:Class="formula_manage.View.ViewProcess"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:formula_manage.View" xmlns:local="clr-namespace:formula_manage.View"
mc:Ignorable="d" mc:Ignorable="d"
d:DesignHeight="150" d:DesignWidth="405" d:DesignHeight="150" d:DesignWidth="405">
Title="ViewProcess">
<Grid> <Grid>
<DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False" <DataGrid x:Name="edit" AlternationCount="2" IsReadOnly="False"
Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30" Margin="0,0,0,0" d:ItemsSource="{d:SampleData ItemCount=30}" AutoGenerateColumns="False" MinColumnWidth="30"
@@ -52,6 +50,5 @@
<DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/> <DataGridTextColumn Header="备注" Width="400" FontSize="15" MinWidth="100" CanUserReorder="False"/>
</DataGrid.Columns> </DataGrid.Columns>
</DataGrid> </DataGrid>
</Grid> </Grid>
</Page> </UserControl>
View/ViewProcess.xaml.cs
+1 -1
View File
@@ -18,7 +18,7 @@ namespace formula_manage.View
/// <summary> /// <summary>
/// ViewProcess.xaml 的交互逻辑 /// ViewProcess.xaml 的交互逻辑
/// </summary> /// </summary>
public partial class ViewProcess : Page public partial class ViewProcess : UserControl
{ {
public ViewProcess() public ViewProcess()
{ {