diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx deleted file mode 100644 index 210e33e..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx deleted file mode 100644 index 210e33e..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx deleted file mode 100644 index a2156c1..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx deleted file mode 100644 index 210e33e..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx deleted file mode 100644 index a2156c1..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 2761683..fe7c2c3 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx deleted file mode 100644 index 210e33e..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx deleted file mode 100644 index a2156c1..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 2761683..fe7c2c3 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 8ed9410..b8c446b 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -1,8 +1,8 @@ -using System; -using System.Windows; -using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using SubCabinetSolution.Views; +using System; +using System.Windows; namespace SubCabinetSolution.ViewModel { @@ -28,7 +28,7 @@ // showTimer.Tick += ShowCurTimer; //起个Timer一直获取当前时间 // showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0); // showTimer.Start(); - _currentTime = "2022/8/25 23:25:50"; + _currentTime = "2022/08/25 23:25:50"; this.LoginOutCommand = new RelayCommand(LoginOut); } @@ -44,7 +44,7 @@ private void LoginOut(CabinetWindow window) { MessageBoxResult result = - MessageBox.Show("确定退出吗?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); + MessageBox.Show("确定退出吗?", "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); if (result != MessageBoxResult.OK) return; //退出 MainWindow mainWindow = new MainWindow(); diff --git a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx b/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx deleted file mode 100644 index 210e33e..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/8a33b672-1934-4548-858b-e9e447dad88d.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx b/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx deleted file mode 100644 index a2156c1..0000000 --- a/.vs/SubCabinetSolution/FileContentIndex/c3ba9f72-5f11-46e8-a897-0dbceab1fafd.vsidx +++ /dev/null Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 2761683..fe7c2c3 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 8ed9410..b8c446b 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -1,8 +1,8 @@ -using System; -using System.Windows; -using GalaSoft.MvvmLight; +using GalaSoft.MvvmLight; using GalaSoft.MvvmLight.Command; using SubCabinetSolution.Views; +using System; +using System.Windows; namespace SubCabinetSolution.ViewModel { @@ -28,7 +28,7 @@ // showTimer.Tick += ShowCurTimer; //起个Timer一直获取当前时间 // showTimer.Interval = new TimeSpan(0, 0, 0, 1, 0); // showTimer.Start(); - _currentTime = "2022/8/25 23:25:50"; + _currentTime = "2022/08/25 23:25:50"; this.LoginOutCommand = new RelayCommand(LoginOut); } @@ -44,7 +44,7 @@ private void LoginOut(CabinetWindow window) { MessageBoxResult result = - MessageBox.Show("确定退出吗?", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); + MessageBox.Show("确定退出吗?", "温馨提示", MessageBoxButton.OKCancel, MessageBoxImage.Question); if (result != MessageBoxResult.OK) return; //退出 MainWindow mainWindow = new MainWindow(); diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 5f57b85..10a8937 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -142,11 +142,36 @@ Padding="3,0" VerticalContentAlignment="Center"> + + + + + + + +