diff --git a/SlnMesnac.WPF/App.xaml.cs b/SlnMesnac.WPF/App.xaml.cs index 72661c5..d88acd7 100644 --- a/SlnMesnac.WPF/App.xaml.cs +++ b/SlnMesnac.WPF/App.xaml.cs @@ -58,9 +58,9 @@ namespace SlnMesnac.WPF var appConfig = ServiceProvider.GetService(); Log.Information($"系统初始化完成,日志存放路径:{appConfig?.logPath}"); - var loginWindow = ServiceProvider.GetRequiredService(); - loginWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen; - loginWindow.Show(); + var mainWindow = ServiceProvider.GetRequiredService(); + mainWindow.WindowStartupLocation = WindowStartupLocation.CenterScreen; + mainWindow.Show(); } @@ -86,7 +86,6 @@ namespace SlnMesnac.WPF Assembly[] assemblies = { Assembly.LoadFrom("SlnMesnac.Repository.dll"), - Assembly.LoadFrom("SlnMesnac.Plc.dll"), Assembly.LoadFrom("SlnMesnac.Rfid.dll"), Assembly.LoadFrom("SlnMesnac.Common.dll"), Assembly.LoadFrom("SlnMesnac.TouchSocket.dll"), @@ -112,22 +111,6 @@ namespace SlnMesnac.WPF // 注册ORM services.AddSqlSugarSetup(); - - // 注册PLC工厂 - //services.AddPlcFactorySetup(); - - //services.AddJob(); - - // 注册 EventBus 服务 - //services.AddEventBus(builder => - //{ - // // 注册 ToDo 事件订阅者 - // builder.AddSubscriber(); - //}); - - - - } // Exit事件 diff --git a/SlnMesnac.WPF/MainWindow.xaml b/SlnMesnac.WPF/MainWindow.xaml index 95bca2c..95d24c2 100644 --- a/SlnMesnac.WPF/MainWindow.xaml +++ b/SlnMesnac.WPF/MainWindow.xaml @@ -6,263 +6,52 @@ xmlns:local="clr-namespace:SlnMesnac.WPF" mc:Ignorable="d" Title="MainWindow" Height="1080" Width="1920" - WindowState="Maximized" WindowStyle="None" ResizeMode="NoResize" Topmost="False"> - - - - + WindowState="Maximized" Topmost="False" Background="#ECF5F8"> + - - - - - - - + + - + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - -