From e7ae39cc082d22810313d9eeb72429d2fa548563 Mon Sep 17 00:00:00 2001 From: wenjy Date: Fri, 21 Mar 2025 09:44:03 +0800 Subject: [PATCH] =?UTF-8?q?change=20-=20=E9=A6=96=E9=A1=B5=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SlnMesnac.WPF/App.xaml.cs | 23 +- SlnMesnac.WPF/MainWindow.xaml | 277 ++------- SlnMesnac.WPF/Page/IndexControl.xaml | 115 ++++ SlnMesnac.WPF/Page/IndexControl.xaml.cs | 30 + .../ProductDetails/DetailsEditControl.xaml | 113 ++++ .../ProductDetails/DetailsEditControl.xaml.cs | 31 + .../ProductDetails/ProductDetailsControl.xaml | 12 + .../ProductDetailsControl.xaml.cs | 28 + SlnMesnac.WPF/SlnMesnac.WPF.csproj | 5 +- .../Templates/fonts/font_5w2octy6l1q/demo.css | 539 ++++++++++++++++++ .../fonts/font_5w2octy6l1q/demo_index.html | 414 ++++++++++++++ .../fonts/font_5w2octy6l1q/iconfont.css | 53 ++ .../fonts/font_5w2octy6l1q/iconfont.js | 1 + .../fonts/font_5w2octy6l1q/iconfont.json | 79 +++ .../fonts/font_5w2octy6l1q/iconfont.ttf | Bin 0 -> 4928 bytes SlnMesnac.WPF/Templates/image/background.jpg | Bin 48856 -> 256726 bytes .../ViewModel/MainWindowViewModel.cs | 11 +- 17 files changed, 1463 insertions(+), 268 deletions(-) create mode 100644 SlnMesnac.WPF/Page/IndexControl.xaml create mode 100644 SlnMesnac.WPF/Page/IndexControl.xaml.cs create mode 100644 SlnMesnac.WPF/Page/ProductDetails/DetailsEditControl.xaml create mode 100644 SlnMesnac.WPF/Page/ProductDetails/DetailsEditControl.xaml.cs create mode 100644 SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml create mode 100644 SlnMesnac.WPF/Page/ProductDetails/ProductDetailsControl.xaml.cs create mode 100644 SlnMesnac.WPF/Templates/fonts/font_5w2octy6l1q/demo.css create mode 100644 SlnMesnac.WPF/Templates/fonts/font_5w2octy6l1q/demo_index.html create mode 100644 SlnMesnac.WPF/Templates/fonts/font_5w2octy6l1q/iconfont.css create mode 100644 SlnMesnac.WPF/Templates/fonts/font_5w2octy6l1q/iconfont.js create mode 100644 SlnMesnac.WPF/Templates/fonts/font_5w2octy6l1q/iconfont.json create mode 100644 SlnMesnac.WPF/Templates/fonts/font_5w2octy6l1q/iconfont.ttf 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"> + - - - - - - - + + - + + - - + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - -