diff --git a/.gitignore b/.gitignore index aaa20a8d..b00004b0 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ bld/ /.vs/Admin.Core/v17/.futdcache.v2 /Admin.Core.Repository/Repository_New/SysUserInfoRepository.cs /Aucma.Core.SheetMetal/ViewModels/IndexPageViewModel.cs +/Admin.Core.sln diff --git a/Admin.Core.RealTimeService/Log/GlobalInfoLogs_20240115.log b/Admin.Core.RealTimeService/Log/GlobalInfoLogs_20240115.log new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/Admin.Core.RealTimeService/Log/GlobalInfoLogs_20240115.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240101.log b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240101.log new file mode 100644 index 00000000..e69de29b diff --git a/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240102.log b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240102.log new file mode 100644 index 00000000..e69de29b diff --git a/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240103.log b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240103.log new file mode 100644 index 00000000..e69de29b diff --git a/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240104.log b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240104.log new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240104.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240307.log b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240307.log new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240307.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240308.log b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240308.log new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240308.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240314.log b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240314.log new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalExceptionLogs_20240314.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240101.log b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240101.log new file mode 100644 index 00000000..e69de29b diff --git a/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240102.log b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240102.log new file mode 100644 index 00000000..e69de29b diff --git a/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240103.log b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240103.log new file mode 100644 index 00000000..e69de29b diff --git a/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240104.log b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240104.log new file mode 100644 index 00000000..5f282702 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240104.log @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240307.log b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240307.log new file mode 100644 index 00000000..78f81580 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240307.log @@ -0,0 +1,42 @@ +2024-03-07 10:36:08,730| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 10:36:53,475| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 10:45:22,426| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 10:46:20,485| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:09:35,983| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:10:01,077| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:10:30,297| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:15:12,333| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:20:20,077| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:24:00,889| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:24:42,049| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 11:42:57,108| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 14:38:34,853| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-07 14:39:00,779| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- diff --git a/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240308.log b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240308.log new file mode 100644 index 00000000..270bd0e9 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240308.log @@ -0,0 +1,15 @@ +2024-03-08 09:24:52,719| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-08 09:36:12,548| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-08 09:37:05,954| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-08 09:37:32,121| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-08 09:38:01,807| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- diff --git a/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240314.log b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240314.log new file mode 100644 index 00000000..75cd5815 --- /dev/null +++ b/Aucam.Core.PerfusionService/Log/GlobalInfoLogs_20240314.log @@ -0,0 +1,12 @@ +2024-03-14 15:16:45,691| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-14 15:19:17,058| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-14 15:43:11,019| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- +2024-03-14 15:43:45,071| INFO Aucma.Core.HwPLc.MelsecPlc +HslCommunication激活成功! +-------------------------------- diff --git a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml index 0f63b2d0..2a896e6e 100644 --- a/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml +++ b/Aucma.Core.BoxFoam/Views/FoamMonitorPageView.xaml @@ -66,7 +66,7 @@ --> - + @@ -231,7 +231,7 @@ - + diff --git a/Aucma.Core.BoxFoam/Views/MainWindow.xaml b/Aucma.Core.BoxFoam/Views/MainWindow.xaml index c1fc3aef..56530ab9 100644 --- a/Aucma.Core.BoxFoam/Views/MainWindow.xaml +++ b/Aucma.Core.BoxFoam/Views/MainWindow.xaml @@ -27,7 +27,7 @@ - + diff --git a/Aucma.Core.BoxFoam/Views/MainWindow.xaml.cs b/Aucma.Core.BoxFoam/Views/MainWindow.xaml.cs index addd8c30..62c688b6 100644 --- a/Aucma.Core.BoxFoam/Views/MainWindow.xaml.cs +++ b/Aucma.Core.BoxFoam/Views/MainWindow.xaml.cs @@ -17,6 +17,15 @@ namespace Aucma.Core.BoxFoam.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件s + } + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); } } } diff --git a/Aucma.Core.BoxFoam/appsettings.json b/Aucma.Core.BoxFoam/appsettings.json index 7dc8376f..b3853899 100644 --- a/Aucma.Core.BoxFoam/appsettings.json +++ b/Aucma.Core.BoxFoam/appsettings.json @@ -219,7 +219,7 @@ "PlcType": "Siemens", "Enabled": true, // "IP": "127.0.0.1", - "IP": "10.10.93.21", + "IP": "10.10.93.1", "Port": 102 }, { @@ -228,7 +228,7 @@ "PlcType": "Siemens", "Enabled": true, // "IP": "127.0.0.1", - "IP": "10.10.93.1", + "IP": "10.10.93.21", "Port": 102 }, { diff --git a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs index 4f00cedf..6e9a56a2 100644 --- a/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs +++ b/Aucma.Core.CodeBinding/ViewModels/IndexPageViewModel.cs @@ -623,6 +623,7 @@ namespace Aucma.Core.CodeBinding.ViewModels if (string.IsNullOrEmpty(appConfig.TeamName)) { log.Error($"条码{code1}未登录不做处理,禁止放行"); + SendPlcStop(); speechStr.SpeakAsync("请登录以后在使用,请登录"); return; } diff --git a/Aucma.Core.CodeBinding/Views/MainWindow.xaml b/Aucma.Core.CodeBinding/Views/MainWindow.xaml index 5fe49330..34735bef 100644 --- a/Aucma.Core.CodeBinding/Views/MainWindow.xaml +++ b/Aucma.Core.CodeBinding/Views/MainWindow.xaml @@ -25,7 +25,7 @@ - + diff --git a/Aucma.Core.CodeBinding/Views/MainWindow.xaml.cs b/Aucma.Core.CodeBinding/Views/MainWindow.xaml.cs index c0af6053..c7dd62b8 100644 --- a/Aucma.Core.CodeBinding/Views/MainWindow.xaml.cs +++ b/Aucma.Core.CodeBinding/Views/MainWindow.xaml.cs @@ -17,6 +17,15 @@ namespace Aucma.Core.CodeBinding.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 + } + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); } } } diff --git a/Aucma.Core.DoorFoam/Views/MainWindow.xaml b/Aucma.Core.DoorFoam/Views/MainWindow.xaml index 63ac949c..71ec18fa 100644 --- a/Aucma.Core.DoorFoam/Views/MainWindow.xaml +++ b/Aucma.Core.DoorFoam/Views/MainWindow.xaml @@ -9,7 +9,7 @@ d:DesignHeight="1080" d:DesignWidth="1920" MinHeight="1080" - MinWidth="1920" + MinWidth="1920" WindowStyle="None" WindowState="Maximized" WindowStartupLocation="CenterScreen" > @@ -29,9 +29,9 @@ - + - + diff --git a/Aucma.Core.DoorFoam/Views/MainWindow.xaml.cs b/Aucma.Core.DoorFoam/Views/MainWindow.xaml.cs index 430b9336..a39429fb 100644 --- a/Aucma.Core.DoorFoam/Views/MainWindow.xaml.cs +++ b/Aucma.Core.DoorFoam/Views/MainWindow.xaml.cs @@ -17,6 +17,15 @@ namespace Aucma.Core.DoorFoam.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 } + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); + } + } } diff --git a/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml b/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml index a35c221e..6c263c94 100644 --- a/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml +++ b/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml @@ -27,7 +27,7 @@ - + diff --git a/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml.cs b/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml.cs index 6a818cb3..1df3b3a6 100644 --- a/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml.cs +++ b/Aucma.Core.OldBoxFoam/Views/MainWindow.xaml.cs @@ -17,6 +17,16 @@ namespace Aucma.Core.OldBoxFoam.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 } + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); + } + } } diff --git a/Aucma.Core.Palletiz/Log/GlobalInfoLogs_20231127.log b/Aucma.Core.Palletiz/Log/GlobalInfoLogs_20231127.log new file mode 100644 index 00000000..2117e13b --- /dev/null +++ b/Aucma.Core.Palletiz/Log/GlobalInfoLogs_20231127.log @@ -0,0 +1,12 @@ +2023-11-27 08:57:46,721| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-27 08:57:46,865| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- +2023-11-27 09:02:12,789| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-27 09:02:12,930| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- diff --git a/Aucma.Core.Palletiz/Log/GlobalInfoLogs_20231129.log b/Aucma.Core.Palletiz/Log/GlobalInfoLogs_20231129.log new file mode 100644 index 00000000..c6259398 --- /dev/null +++ b/Aucma.Core.Palletiz/Log/GlobalInfoLogs_20231129.log @@ -0,0 +1,12 @@ +2023-11-29 13:11:31,986| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-29 13:11:32,166| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- +2023-11-29 13:13:17,129| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-29 13:13:17,273| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- diff --git a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs index 8b8eebe6..92e6d4d9 100644 --- a/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.Palletiz/ViewModels/MainWindowViewModel.cs @@ -474,7 +474,7 @@ namespace Aucma.Core.Palletiz.ViewModels { System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => { - TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account} 条码系统: {appConfig.BarCodeAccount}"; + TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account}"; CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); })); diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml b/Aucma.Core.Palletiz/Views/MainWindow.xaml index 90b7c4f9..8cc41637 100644 --- a/Aucma.Core.Palletiz/Views/MainWindow.xaml +++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/Aucma.Core.Palletiz/Views/MainWindow.xaml.cs b/Aucma.Core.Palletiz/Views/MainWindow.xaml.cs index a98dfea5..aa75a7cc 100644 --- a/Aucma.Core.Palletiz/Views/MainWindow.xaml.cs +++ b/Aucma.Core.Palletiz/Views/MainWindow.xaml.cs @@ -17,6 +17,16 @@ namespace Aucma.Core.Palletiz.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 } + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); + } + } } diff --git a/Aucma.Core.PalletizCX1/Log/GlobalInfoLogs_20231127.log b/Aucma.Core.PalletizCX1/Log/GlobalInfoLogs_20231127.log new file mode 100644 index 00000000..2117e13b --- /dev/null +++ b/Aucma.Core.PalletizCX1/Log/GlobalInfoLogs_20231127.log @@ -0,0 +1,12 @@ +2023-11-27 08:57:46,721| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-27 08:57:46,865| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- +2023-11-27 09:02:12,789| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-27 09:02:12,930| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- diff --git a/Aucma.Core.PalletizCX1/Log/GlobalInfoLogs_20231129.log b/Aucma.Core.PalletizCX1/Log/GlobalInfoLogs_20231129.log new file mode 100644 index 00000000..c6259398 --- /dev/null +++ b/Aucma.Core.PalletizCX1/Log/GlobalInfoLogs_20231129.log @@ -0,0 +1,12 @@ +2023-11-29 13:11:31,986| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-29 13:11:32,166| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- +2023-11-29 13:13:17,129| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器设备列表,进入DeviceListAcq()方法 +-------------------------------- +2023-11-29 13:13:17,273| INFO Aucma.Core.Scanner.MvCodeHelper +获取扫码器数量为0，请检查扫码器连接: +-------------------------------- diff --git a/Aucma.Core.PalletizCX1/ViewModels/MainWindowViewModel.cs b/Aucma.Core.PalletizCX1/ViewModels/MainWindowViewModel.cs index 3d7faea9..2a325039 100644 --- a/Aucma.Core.PalletizCX1/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.PalletizCX1/ViewModels/MainWindowViewModel.cs @@ -475,7 +475,7 @@ namespace Aucma.Core.PalletizCX1.ViewModels { System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => { - TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account} 条码系统: {appConfig.BarCodeAccount}"; + TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account}"; CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); })); diff --git a/Aucma.Core.PalletizCX1/Views/MainWindow.xaml b/Aucma.Core.PalletizCX1/Views/MainWindow.xaml index a45f008a..087cb7aa 100644 --- a/Aucma.Core.PalletizCX1/Views/MainWindow.xaml +++ b/Aucma.Core.PalletizCX1/Views/MainWindow.xaml @@ -26,7 +26,7 @@ - + diff --git a/Aucma.Core.PalletizCX1/Views/MainWindow.xaml.cs b/Aucma.Core.PalletizCX1/Views/MainWindow.xaml.cs index 8ee68cef..25fa3fb9 100644 --- a/Aucma.Core.PalletizCX1/Views/MainWindow.xaml.cs +++ b/Aucma.Core.PalletizCX1/Views/MainWindow.xaml.cs @@ -17,6 +17,16 @@ namespace Aucma.Core.PalletizCX1.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 + } + + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); } } } diff --git a/Aucma.Core.PrintTo/Log/GlobalInfoLogs_20231129.log b/Aucma.Core.PrintTo/Log/GlobalInfoLogs_20231129.log new file mode 100644 index 00000000..e69de29b diff --git a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs index ed070efa..86e6e3b3 100644 --- a/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs +++ b/Aucma.Core.PrintTo/ViewModels/MainWindowViewModel.cs @@ -268,7 +268,7 @@ namespace Aucma.Core.PrintTo.ViewModels { System.Windows.Application.Current.Dispatcher.Invoke((Action)(() => { - TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account} 条码系统: {appConfig.BarCodeAccount}"; + TeamName = $"班组:{appConfig.TeamName} 用户:{appConfig.Account}"; CurrentDateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"); })); diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml b/Aucma.Core.PrintTo/Views/MainWindow.xaml index b50bb98e..4523f822 100644 --- a/Aucma.Core.PrintTo/Views/MainWindow.xaml +++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml @@ -33,7 +33,7 @@ - + diff --git a/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs b/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs index 51a5af59..88030a81 100644 --- a/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs +++ b/Aucma.Core.PrintTo/Views/MainWindow.xaml.cs @@ -19,9 +19,17 @@ namespace Aucma.Core.PrintTo.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 } - + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); + } } diff --git a/Aucma.Core.ProductOffLine/Views/LoginPageView.xaml.cs b/Aucma.Core.ProductOffLine/Views/LoginPageView.xaml.cs index a6c0c741..7b0dccb0 100644 --- a/Aucma.Core.ProductOffLine/Views/LoginPageView.xaml.cs +++ b/Aucma.Core.ProductOffLine/Views/LoginPageView.xaml.cs @@ -38,6 +38,7 @@ namespace Aucma.Core.ProductOffLine.Views Closing += LoginPageView_Closing; // 订阅窗口关闭事件 } + private void LoginPageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) { diff --git a/Aucma.Core.ProductOffLine/Views/MainWindow.xaml b/Aucma.Core.ProductOffLine/Views/MainWindow.xaml index a795bce1..80e48044 100644 --- a/Aucma.Core.ProductOffLine/Views/MainWindow.xaml +++ b/Aucma.Core.ProductOffLine/Views/MainWindow.xaml @@ -5,10 +5,10 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes" mc:Ignorable="d" - Name="window" + Name="window" Title="SCADA" Height="1080" Width="1920" Icon="/Assets/images/Icon.png" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen" - WindowState="Maximized" WindowStyle="SingleBorderWindow" ResizeMode="CanResize"> + WindowState="Maximized" WindowStyle="None" ResizeMode="CanResize"> @@ -29,7 +29,7 @@ - + diff --git a/Aucma.Core.ProductOffLine/Views/MainWindow.xaml.cs b/Aucma.Core.ProductOffLine/Views/MainWindow.xaml.cs index 62738df3..41707896 100644 --- a/Aucma.Core.ProductOffLine/Views/MainWindow.xaml.cs +++ b/Aucma.Core.ProductOffLine/Views/MainWindow.xaml.cs @@ -20,8 +20,19 @@ namespace Aucma.Core.ProductOffLine.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 } - + + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); + } + + } } diff --git a/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml b/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml index bb92dcc8..5660f0fd 100644 --- a/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml +++ b/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml @@ -7,7 +7,7 @@ mc:Ignorable="d" Name="window" Title="SCADA" Height="1080" Width="1920" Icon="/Assets/images/Icon.png" FontFamily="Microsoft YaHei" WindowStartupLocation="CenterScreen" - WindowState="Maximized" WindowStyle="SingleBorderWindow" ResizeMode="CanResize"> + WindowState="Maximized" WindowStyle="None" ResizeMode="CanResize"> @@ -28,7 +28,7 @@ - + diff --git a/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml.cs b/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml.cs index 666d08e7..ed451205 100644 --- a/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml.cs +++ b/Aucma.Core.ProductOffLineCX1/Views/MainWindow.xaml.cs @@ -17,9 +17,17 @@ namespace Aucma.Core.ProductOffLineCX1.Views { InitializeComponent(); this.DataContext = new MainWindowViewModel(); + Closing += PageView_Closing; // 订阅窗口关闭事件 } - + + private void PageView_Closing(object sender, System.ComponentModel.CancelEventArgs e) + { + this.Hide(); + //跳转到登录页 + LoginPageView login = LoginPageView.Instance; + login.Show(); + } private void Minimized_Click(object sender, RoutedEventArgs e) {