diff --git a/LAEPS.sln b/LAEPS.sln index b440747..f2f01c9 100644 --- a/LAEPS.sln +++ b/LAEPS.sln @@ -27,6 +27,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UpdateInfoModule", "UpdateI EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MainModule", "MainModule\MainModule.csproj", "{715852A3-D2DE-4C2E-AEF2-2BC0ADBEAC0A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LOT", "LOT\LOT.csproj", "{01E01684-DDE8-4B00-9BFC-2C5CDB2A261F}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -77,6 +79,10 @@ Global {715852A3-D2DE-4C2E-AEF2-2BC0ADBEAC0A}.Debug|Any CPU.Build.0 = Debug|Any CPU {715852A3-D2DE-4C2E-AEF2-2BC0ADBEAC0A}.Release|Any CPU.ActiveCfg = Release|Any CPU {715852A3-D2DE-4C2E-AEF2-2BC0ADBEAC0A}.Release|Any CPU.Build.0 = Release|Any CPU + {01E01684-DDE8-4B00-9BFC-2C5CDB2A261F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {01E01684-DDE8-4B00-9BFC-2C5CDB2A261F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {01E01684-DDE8-4B00-9BFC-2C5CDB2A261F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {01E01684-DDE8-4B00-9BFC-2C5CDB2A261F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/LAEPS/App.xaml b/LOT/App.xaml similarity index 87% rename from LAEPS/App.xaml rename to LOT/App.xaml index 79174dd..f6038fd 100644 --- a/LAEPS/App.xaml +++ b/LOT/App.xaml @@ -1,7 +1,7 @@ - diff --git a/LAEPS/App.xaml.cs b/LOT/App.xaml.cs similarity index 93% rename from LAEPS/App.xaml.cs rename to LOT/App.xaml.cs index 4e44dba..d5b131a 100644 --- a/LAEPS/App.xaml.cs +++ b/LOT/App.xaml.cs @@ -1,10 +1,10 @@ using Castle.DynamicProxy; using Common; -using LAEPS.ViewModels; -using LAEPS.ViewModels.Dialogs; -using LAEPS.Views; -using LAEPS.Views; -using LAEPS.Views.Dialogs; +using LOT.ViewModels; +using LOT.ViewModels.Dialogs; +using LOT.Views; +using LOT.Views; +using LOT.Views.Dialogs; using Logger; using Notifications.Wpf.Core; using ORM; @@ -17,7 +17,7 @@ using System.Windows; using UIShare.PubEvent; using static System.Runtime.InteropServices.JavaScript.JSType; -namespace LAEPS +namespace LOT { /// /// Interaction logic for App.xaml @@ -54,7 +54,7 @@ namespace LAEPS { //初始化数据库 //DatabaseConfig.SetTenant(10001); - //DatabaseConfig.InitMySql("127.0.0.1",3306,"LAEPS","root","123456"); + //DatabaseConfig.InitMySql("127.0.0.1",3306,"LOT","root","123456"); //DatabaseConfig.CreateDatabaseAndCheckConnection(createDatabase: true, checkConnection: true); //SqlSugarContext.InitDatabase(); //显示登录窗口 diff --git a/LAEPS/AssemblyInfo.cs b/LOT/AssemblyInfo.cs similarity index 100% rename from LAEPS/AssemblyInfo.cs rename to LOT/AssemblyInfo.cs diff --git a/LAEPS/LAEPS.csproj b/LOT/LOT.csproj similarity index 100% rename from LAEPS/LAEPS.csproj rename to LOT/LOT.csproj diff --git a/LAEPS/Resources/Images/error.png b/LOT/Resources/Images/error.png similarity index 100% rename from LAEPS/Resources/Images/error.png rename to LOT/Resources/Images/error.png diff --git a/LAEPS/Resources/Images/info.png b/LOT/Resources/Images/info.png similarity index 100% rename from LAEPS/Resources/Images/info.png rename to LOT/Resources/Images/info.png diff --git a/LAEPS/Resources/Images/warning.png b/LOT/Resources/Images/warning.png similarity index 100% rename from LAEPS/Resources/Images/warning.png rename to LOT/Resources/Images/warning.png diff --git a/LAEPS/ViewModels/Dialogs/MessageBoxViewModel.cs b/LOT/ViewModels/Dialogs/MessageBoxViewModel.cs similarity index 99% rename from LAEPS/ViewModels/Dialogs/MessageBoxViewModel.cs rename to LOT/ViewModels/Dialogs/MessageBoxViewModel.cs index c035272..2aac5fd 100644 --- a/LAEPS/ViewModels/Dialogs/MessageBoxViewModel.cs +++ b/LOT/ViewModels/Dialogs/MessageBoxViewModel.cs @@ -2,7 +2,7 @@ using UIShare.ViewModelBase; using System.Windows.Input; -namespace LAEPS.ViewModels.Dialogs +namespace LOT.ViewModels.Dialogs { public class MessageBoxViewModel : DialogViewModelBase { diff --git a/LAEPS/ViewModels/ShellViewModel.cs b/LOT/ViewModels/ShellViewModel.cs similarity index 98% rename from LAEPS/ViewModels/ShellViewModel.cs rename to LOT/ViewModels/ShellViewModel.cs index 1813bf0..ce03771 100644 --- a/LAEPS/ViewModels/ShellViewModel.cs +++ b/LOT/ViewModels/ShellViewModel.cs @@ -1,4 +1,4 @@ -using LAEPS.Views; +using LOT.Views; using MaterialDesignThemes.Wpf; using Notifications.Wpf.Core; using Prism.Events; @@ -13,7 +13,7 @@ using System.Windows; using System.Windows.Input; using UIShare.PubEvent; -namespace LAEPS.ViewModels +namespace LOT.ViewModels { public class ShellViewModel : BindableBase { diff --git a/LAEPS/Views/Dialogs/MessageBoxView.xaml b/LOT/Views/Dialogs/MessageBoxView.xaml similarity index 96% rename from LAEPS/Views/Dialogs/MessageBoxView.xaml rename to LOT/Views/Dialogs/MessageBoxView.xaml index a486e26..7b13b8e 100644 --- a/LAEPS/Views/Dialogs/MessageBoxView.xaml +++ b/LOT/Views/Dialogs/MessageBoxView.xaml @@ -1,9 +1,9 @@ - /// MessageBoxView.xaml 的交互逻辑 diff --git a/LAEPS/Views/LoginModuleView.xaml b/LOT/Views/LoginModuleView.xaml similarity index 84% rename from LAEPS/Views/LoginModuleView.xaml rename to LOT/Views/LoginModuleView.xaml index 90568f9..2d4b172 100644 --- a/LAEPS/Views/LoginModuleView.xaml +++ b/LOT/Views/LoginModuleView.xaml @@ -1,16 +1,16 @@  /// Login.xaml 的交互逻辑 diff --git a/LAEPS/Views/ShellView.xaml b/LOT/Views/ShellView.xaml similarity index 99% rename from LAEPS/Views/ShellView.xaml rename to LOT/Views/ShellView.xaml index 5ddea2f..471d9e4 100644 --- a/LAEPS/Views/ShellView.xaml +++ b/LOT/Views/ShellView.xaml @@ -1,4 +1,4 @@ - /// ShellView.xaml 的交互逻辑