diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index a3bc06a..a0bac4c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index a3bc06a..a0bac4c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.config b/SubCabinetSolution/App.config index 193aecc..857d30d 100644 --- a/SubCabinetSolution/App.config +++ b/SubCabinetSolution/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index a3bc06a..a0bac4c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.config b/SubCabinetSolution/App.config index 193aecc..857d30d 100644 --- a/SubCabinetSolution/App.config +++ b/SubCabinetSolution/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 8eda694..a41311f 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -84,22 +84,6 @@ ..\packages\Newtonsoft.Json.13.0.2-beta1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll - True - - - ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll - True - - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll - True - - - ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - True - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -258,11 +242,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - - \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index a3bc06a..a0bac4c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.config b/SubCabinetSolution/App.config index 193aecc..857d30d 100644 --- a/SubCabinetSolution/App.config +++ b/SubCabinetSolution/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 8eda694..a41311f 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -84,22 +84,6 @@ ..\packages\Newtonsoft.Json.13.0.2-beta1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll - True - - - ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll - True - - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll - True - - - ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - True - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -258,11 +242,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - - \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index fbacd2e..5ce8b04 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows; using System.Windows.Threading; using GalaSoft.MvvmLight; @@ -27,6 +28,27 @@ public List FunctionModelList { get; set; } public List SettingsModelList { get; set; } + public RelayCommand FuncSelectedCommand { get; set; } + + public string MainTopTitle { + get { return _mainTopTitle; } + set + { + _mainTopTitle = value; + RaisePropertyChanged(() => MainTopTitle); + } + } + private string _mainTopTitle; + + public string MainTopImage { + get { return _mainTopImage; } + set + { + _mainTopImage = value; + RaisePropertyChanged(() => MainTopImage); + } + } + private string _mainTopImage; public CabinetViewModel() { @@ -55,6 +77,7 @@ new FunctionModel("/Images/灯泡.png", "灯光"), new FunctionModel("/Images/近消耗品.png", "近消耗品") }; + this.FuncSelectedCommand = new RelayCommand(ItemSelectionChanged); } private void ShowCurTimer(object sender, EventArgs e) @@ -72,5 +95,16 @@ mainWindow.Show(); window.Close(); } + + private void ItemSelectionChanged(object sender) + { + if (!(sender is FunctionModel functionModel)) + { + return; + } + + this.MainTopImage = functionModel.Image; + this.MainTopTitle = functionModel.Title; + } } } \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index a3bc06a..a0bac4c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.config b/SubCabinetSolution/App.config index 193aecc..857d30d 100644 --- a/SubCabinetSolution/App.config +++ b/SubCabinetSolution/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 8eda694..a41311f 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -84,22 +84,6 @@ ..\packages\Newtonsoft.Json.13.0.2-beta1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll - True - - - ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll - True - - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll - True - - - ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - True - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -258,11 +242,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - - \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index fbacd2e..5ce8b04 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows; using System.Windows.Threading; using GalaSoft.MvvmLight; @@ -27,6 +28,27 @@ public List FunctionModelList { get; set; } public List SettingsModelList { get; set; } + public RelayCommand FuncSelectedCommand { get; set; } + + public string MainTopTitle { + get { return _mainTopTitle; } + set + { + _mainTopTitle = value; + RaisePropertyChanged(() => MainTopTitle); + } + } + private string _mainTopTitle; + + public string MainTopImage { + get { return _mainTopImage; } + set + { + _mainTopImage = value; + RaisePropertyChanged(() => MainTopImage); + } + } + private string _mainTopImage; public CabinetViewModel() { @@ -55,6 +77,7 @@ new FunctionModel("/Images/灯泡.png", "灯光"), new FunctionModel("/Images/近消耗品.png", "近消耗品") }; + this.FuncSelectedCommand = new RelayCommand(ItemSelectionChanged); } private void ShowCurTimer(object sender, EventArgs e) @@ -72,5 +95,16 @@ mainWindow.Show(); window.Close(); } + + private void ItemSelectionChanged(object sender) + { + if (!(sender is FunctionModel functionModel)) + { + return; + } + + this.MainTopImage = functionModel.Image; + this.MainTopTitle = functionModel.Title; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 320ad9e..7051f8d 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" MinWidth="600" @@ -55,8 +56,8 @@ - - + + @@ -86,11 +87,18 @@ TextAlignment="Center" /> + + + + + + @@ -136,10 +144,8 @@ - - + + @@ -193,8 +199,7 @@ - + @@ -239,11 +244,18 @@ - + + + + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index a3bc06a..a0bac4c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.config b/SubCabinetSolution/App.config index 193aecc..857d30d 100644 --- a/SubCabinetSolution/App.config +++ b/SubCabinetSolution/App.config @@ -1,6 +1,14 @@ - + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 8eda694..a41311f 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -84,22 +84,6 @@ ..\packages\Newtonsoft.Json.13.0.2-beta1\lib\net45\Newtonsoft.Json.dll True - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.batteries_v2.dll - True - - - ..\packages\SQLitePCLRaw.core.2.0.4\lib\netstandard2.0\SQLitePCLRaw.core.dll - True - - - ..\packages\SQLitePCLRaw.bundle_green.2.0.4\lib\net461\SQLitePCLRaw.nativelibrary.dll - True - - - ..\packages\SQLitePCLRaw.provider.dynamic_cdecl.2.0.4\lib\netstandard2.0\SQLitePCLRaw.provider.dynamic_cdecl.dll - True - ..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll @@ -258,11 +242,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}. - - - \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index fbacd2e..5ce8b04 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics; using System.Windows; using System.Windows.Threading; using GalaSoft.MvvmLight; @@ -27,6 +28,27 @@ public List FunctionModelList { get; set; } public List SettingsModelList { get; set; } + public RelayCommand FuncSelectedCommand { get; set; } + + public string MainTopTitle { + get { return _mainTopTitle; } + set + { + _mainTopTitle = value; + RaisePropertyChanged(() => MainTopTitle); + } + } + private string _mainTopTitle; + + public string MainTopImage { + get { return _mainTopImage; } + set + { + _mainTopImage = value; + RaisePropertyChanged(() => MainTopImage); + } + } + private string _mainTopImage; public CabinetViewModel() { @@ -55,6 +77,7 @@ new FunctionModel("/Images/灯泡.png", "灯光"), new FunctionModel("/Images/近消耗品.png", "近消耗品") }; + this.FuncSelectedCommand = new RelayCommand(ItemSelectionChanged); } private void ShowCurTimer(object sender, EventArgs e) @@ -72,5 +95,16 @@ mainWindow.Show(); window.Close(); } + + private void ItemSelectionChanged(object sender) + { + if (!(sender is FunctionModel functionModel)) + { + return; + } + + this.MainTopImage = functionModel.Image; + this.MainTopTitle = functionModel.Title; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 320ad9e..7051f8d 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -3,6 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" MinWidth="600" @@ -55,8 +56,8 @@ - - + + @@ -86,11 +87,18 @@ TextAlignment="Center" /> + + + + + + @@ -136,10 +144,8 @@ - - + + @@ -193,8 +199,7 @@ - + @@ -239,11 +244,18 @@ - + + + + diff --git a/SubCabinetSolution/packages.config b/SubCabinetSolution/packages.config index 30fa433..9d8bba9 100644 --- a/SubCabinetSolution/packages.config +++ b/SubCabinetSolution/packages.config @@ -11,10 +11,6 @@ - - - -