diff --git a/App.xaml.cs b/App.xaml.cs index a69e4a7..89104d2 100644 --- a/App.xaml.cs +++ b/App.xaml.cs @@ -44,7 +44,7 @@ namespace formula_manage this.DispatcherUnhandledException += App_DispatcherUnhandledException; } - string Log_time = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); + string Log_time = DateTime.Now.ToString("yyyy-MM-dd"); string logpath = System.Environment.CurrentDirectory + "\\Log";//日志文件目录 //string logPathtxt = "" + System.Environment.CurrentDirectory + "\\Log\\"+ Log_time + "Log.txt";//日志文件 diff --git a/EX/ExProgram.xaml b/EX/ExProgram.xaml index 0cfde24..6656cca 100644 --- a/EX/ExProgram.xaml +++ b/EX/ExProgram.xaml @@ -5,7 +5,7 @@ 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" Background="#FFE0E0E0"> + Title="ExProgram" Height="720" Width="1280" MinHeight="720" MinWidth="1280" Background="#FFE0E0E0"> diff --git a/EX/Exchange.xaml b/EX/Exchange.xaml new file mode 100644 index 0000000..aa3d684 --- /dev/null +++ b/EX/Exchange.xaml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + diff --git a/EX/Exchange.xaml.cs b/EX/Exchange.xaml.cs new file mode 100644 index 0000000..0ca8f80 --- /dev/null +++ b/EX/Exchange.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 +{ + /// + /// Exchange.xaml 的交互逻辑 + /// + public partial class Exchange : Window + { + public Exchange() + { + InitializeComponent(); + } + } +} diff --git a/MainWindow.xaml b/MainWindow.xaml index c56e3ce..272a31e 100644 --- a/MainWindow.xaml +++ b/MainWindow.xaml @@ -24,7 +24,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs index 9d9d9f6..f49b1db 100644 --- a/MainWindow.xaml.cs +++ b/MainWindow.xaml.cs @@ -35,6 +35,7 @@ using System.Printing; using System.Drawing.Printing; using static System.Drawing.Printing.PrinterSettings; using formula_manage.View; +using formula_manage.EX; namespace formula_manage { @@ -93,7 +94,7 @@ namespace formula_manage _SQL.IsEnabled = true; _SQLBAK.IsEnabled = true; _SOFTWARE_SET.IsEnabled = true; - _EXCHANGE_SET.IsEnabled = true; + _EX_SET.IsEnabled = true; _PRINT_SET.IsEnabled = true; _USER_SET.IsEnabled = true; _USER_log.IsEnabled = true; @@ -107,6 +108,7 @@ namespace formula_manage _client.IsEnabled = true; _color.IsEnabled = true; _statistics.IsEnabled = true; + _exchange.IsEnabled = true; } sql_(); @@ -207,7 +209,7 @@ namespace formula_manage _SQL.IsEnabled = true; _SQLBAK.IsEnabled = true; _SOFTWARE_SET.IsEnabled = true; - _EXCHANGE_SET.IsEnabled = true; + _EX_SET.IsEnabled = true; _PRINT_SET.IsEnabled = true; _USER_SET.IsEnabled = true; _RECIPE.IsEnabled = true; @@ -220,6 +222,7 @@ namespace formula_manage _client.IsEnabled = true; _color.IsEnabled = true; _statistics.IsEnabled = true; + _exchange.IsEnabled = true; } else { @@ -237,6 +240,7 @@ namespace formula_manage _client.IsEnabled = true; _color.IsEnabled = true; _statistics.IsEnabled = true; + _exchange.IsEnabled = true; } } } @@ -381,10 +385,15 @@ namespace formula_manage Windows.User user_set = new Windows.User(); user_set.ShowDialog();//实例化并置顶打开用户窗口 } - private void PRINT_SET(object sender, RoutedEventArgs e) + private void EX_SET(object sender, RoutedEventArgs e)//扩展程序 + { + EX.ExProgram ex = new EX.ExProgram(); + ex.ShowDialog(); + } + private void PRINT_SET(object sender, RoutedEventArgs e)//打印设置 { Windows.Print print = new Windows.Print(); - print.ShowDialog();//实例化并置顶打开打印窗口 + print.ShowDialog(); } private void HELP(object sender, RoutedEventArgs e) { @@ -419,6 +428,14 @@ namespace formula_manage Windows.Dissolve dissolve = new Windows.Dissolve(); dissolve.ShowDialog();//实例化并置顶打开设置窗口 } + private void EXCHANGE(object sender, RoutedEventArgs e)//交换日志 + { + EX.Exchange exchange = new EX.Exchange(); + exchange.ShowDialog(); + } + + + private void print(object sender, RoutedEventArgs e) { Print.IsEnabled = false; @@ -1034,6 +1051,5 @@ namespace formula_manage Save.IsEnabled = false; Confirm.IsEnabled = false; } - } } diff --git a/formula_manage.csproj b/formula_manage.csproj index 545622a..d5f0409 100644 --- a/formula_manage.csproj +++ b/formula_manage.csproj @@ -248,6 +248,9 @@ + + Exchange.xaml + ExProgram.xaml @@ -319,6 +322,10 @@ Stuff.xaml + + Designer + MSBuild:Compile + Designer MSBuild:Compile