Browse Source

添加ex页面

master
sc 2 years ago
parent
commit
3d267018b1
  1. 2
      App.xaml.cs
  2. 12
      EX/ExProgram.xaml
  3. 27
      EX/ExProgram.xaml.cs
  4. 2
      MainWindow.xaml
  5. 8
      formula_manage.csproj

2
App.xaml.cs

@ -71,7 +71,7 @@ namespace formula_manage
private void Application_Startup(object sender, StartupEventArgs e) private void Application_Startup(object sender, StartupEventArgs e)
{ {
Application.Current.StartupUri = new Uri("Login.xaml", UriKind.Relative);//和MainWindwo同一目录 Application.Current.StartupUri = new Uri("Login.xaml", UriKind.Relative);//和MainWindwo同一目录
//Application.Current.StartupUri = new Uri("", UriKind.Relative);//在目录下 //Application.Current.StartupUri = new Uri("EX/ExProgram.xaml", UriKind.Relative);//在目录下
} }
} }

12
EX/ExProgram.xaml

@ -0,0 +1,12 @@
<Window x:Class="formula_manage.EX.ExProgram"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:formula_manage.EX"
mc:Ignorable="d"
Title="ExProgram" Height="450" Width="800">
<Grid>
</Grid>
</Window>

27
EX/ExProgram.xaml.cs

@ -0,0 +1,27 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Shapes;
namespace formula_manage.EX
{
/// <summary>
/// ExProgram.xaml 的交互逻辑
/// </summary>
public partial class ExProgram : Window
{
public ExProgram()
{
InitializeComponent();
}
}
}

2
MainWindow.xaml

@ -162,6 +162,8 @@
</DataGrid.Resources> </DataGrid.Resources>
<DataGrid.Columns> <DataGrid.Columns>
<!--列信息绑定--> <!--列信息绑定-->
<DataGridTextColumn Header="序" Width="30" FontSize="15" MaxWidth="30" MinWidth="30" Binding="{Binding ID}" IsReadOnly="True" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="序" Width="30" FontSize="15" MaxWidth="30" MinWidth="30" Binding="{Binding ID}" IsReadOnly="True" CellStyle="{StaticResource CellStyle}"/>
<DataGridTextColumn Header="步骤" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" Binding="{Binding STEP}" IsReadOnly="True" CellStyle="{StaticResource CellStyle}"/> <DataGridTextColumn Header="步骤" Width="50" FontSize="15" MaxWidth="50" MinWidth="50" Binding="{Binding STEP}" IsReadOnly="True" CellStyle="{StaticResource CellStyle}"/>
<DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100" IsReadOnly="False"> <DataGridTemplateColumn Header="原料代码" Width="200" MaxWidth="400" MinWidth="100" IsReadOnly="False">

8
formula_manage.csproj

@ -160,6 +160,7 @@
<Reference Include="System.Management" /> <Reference Include="System.Management" />
<Reference Include="System.Printing" /> <Reference Include="System.Printing" />
<Reference Include="System.Security" /> <Reference Include="System.Security" />
<Reference Include="System.ServiceProcess" />
<Reference Include="System.Windows.Forms" /> <Reference Include="System.Windows.Forms" />
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath> <HintPath>packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath>
@ -210,6 +211,9 @@
<Compile Include="ConvertMoels\StatenConvert.cs" /> <Compile Include="ConvertMoels\StatenConvert.cs" />
<Compile Include="ConvertMoels\StatenERRConvert.cs" /> <Compile Include="ConvertMoels\StatenERRConvert.cs" />
<Compile Include="ConvertMoels\UserSQLConvert.cs" /> <Compile Include="ConvertMoels\UserSQLConvert.cs" />
<Compile Include="EX\ExProgram.xaml.cs">
<DependentUpon>ExProgram.xaml</DependentUpon>
</Compile>
<Compile Include="IProvider.cs" /> <Compile Include="IProvider.cs" />
<Compile Include="Login.xaml.cs"> <Compile Include="Login.xaml.cs">
<DependentUpon>Login.xaml</DependentUpon> <DependentUpon>Login.xaml</DependentUpon>
@ -276,6 +280,10 @@
<Compile Include="Windows\Stuff.xaml.cs"> <Compile Include="Windows\Stuff.xaml.cs">
<DependentUpon>Stuff.xaml</DependentUpon> <DependentUpon>Stuff.xaml</DependentUpon>
</Compile> </Compile>
<Page Include="EX\ExProgram.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Flow_Document\PRINT_D.xaml"> <Page Include="Flow_Document\PRINT_D.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>

Loading…
Cancel
Save