diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 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 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index b2b07ba..f27f34e 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -151,6 +151,7 @@ MSBuild:Compile Designer + @@ -301,5 +302,13 @@ + + + + + + + + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index b2b07ba..f27f34e 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -151,6 +151,7 @@ MSBuild:Compile Designer + @@ -301,5 +302,13 @@ + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index 08b8103..7c9e3e8 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -1,7 +1,22 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class AdoptionPageViewModel + public class AdoptionPageViewModel : ViewModelBase { - + public ObservableCollection SurgeryModelList { get; set; } + + public AdoptionPageViewModel() + { + this.SurgeryModelList = new ObservableCollection + { + new SurgeryModel("赵新明", "妇科", "2022-8-29 12:42:58", "138909"), + new SurgeryModel("郭仕仕", "普外-耳鼻喉科", "2022-8-29 12:43:30", "138848"), + new SurgeryModel("李紫杰", "神经外科", "2022-8-30 12:43:35", "138849") + }; + } } } \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index b2b07ba..f27f34e 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -151,6 +151,7 @@ MSBuild:Compile Designer + @@ -301,5 +302,13 @@ + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index 08b8103..7c9e3e8 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -1,7 +1,22 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class AdoptionPageViewModel + public class AdoptionPageViewModel : ViewModelBase { - + public ObservableCollection SurgeryModelList { get; set; } + + public AdoptionPageViewModel() + { + this.SurgeryModelList = new ObservableCollection + { + new SurgeryModel("赵新明", "妇科", "2022-8-29 12:42:58", "138909"), + new SurgeryModel("郭仕仕", "普外-耳鼻喉科", "2022-8-29 12:43:30", "138848"), + new SurgeryModel("李紫杰", "神经外科", "2022-8-30 12:43:35", "138849") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 60bb559..9ebeb4f 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,8 +101,6 @@ this.MainTopImage = FunctionModelList[7].Image; this.MainTopTitle = FunctionModelList[7].Title; // TODO 显示默认功能项数据 - // INavigationService navigationService = ServiceLocator.Current.GetInstance(); - // navigationService.NavigateTo("CabinetMainPage"); } private void ShowCurTimer(object sender, EventArgs e) diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index b2b07ba..f27f34e 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -151,6 +151,7 @@ MSBuild:Compile Designer + @@ -301,5 +302,13 @@ + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index 08b8103..7c9e3e8 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -1,7 +1,22 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class AdoptionPageViewModel + public class AdoptionPageViewModel : ViewModelBase { - + public ObservableCollection SurgeryModelList { get; set; } + + public AdoptionPageViewModel() + { + this.SurgeryModelList = new ObservableCollection + { + new SurgeryModel("赵新明", "妇科", "2022-8-29 12:42:58", "138909"), + new SurgeryModel("郭仕仕", "普外-耳鼻喉科", "2022-8-29 12:43:30", "138848"), + new SurgeryModel("李紫杰", "神经外科", "2022-8-30 12:43:35", "138849") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 60bb559..9ebeb4f 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,8 +101,6 @@ this.MainTopImage = FunctionModelList[7].Image; this.MainTopTitle = FunctionModelList[7].Title; // TODO 显示默认功能项数据 - // INavigationService navigationService = ServiceLocator.Current.GetInstance(); - // navigationService.NavigateTo("CabinetMainPage"); } private void ShowCurTimer(object sender, EventArgs e) diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index fd6de2c..9369ce2 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -8,6 +8,215 @@ Title="AdoptionPage" d:DesignHeight="450" d:DesignWidth="800" + Background="White" mc:Ignorable="d"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index b2b07ba..f27f34e 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -151,6 +151,7 @@ MSBuild:Compile Designer + @@ -301,5 +302,13 @@ + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index 08b8103..7c9e3e8 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -1,7 +1,22 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class AdoptionPageViewModel + public class AdoptionPageViewModel : ViewModelBase { - + public ObservableCollection SurgeryModelList { get; set; } + + public AdoptionPageViewModel() + { + this.SurgeryModelList = new ObservableCollection + { + new SurgeryModel("赵新明", "妇科", "2022-8-29 12:42:58", "138909"), + new SurgeryModel("郭仕仕", "普外-耳鼻喉科", "2022-8-29 12:43:30", "138848"), + new SurgeryModel("李紫杰", "神经外科", "2022-8-30 12:43:35", "138849") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 60bb559..9ebeb4f 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,8 +101,6 @@ this.MainTopImage = FunctionModelList[7].Image; this.MainTopTitle = FunctionModelList[7].Title; // TODO 显示默认功能项数据 - // INavigationService navigationService = ServiceLocator.Current.GetInstance(); - // navigationService.NavigateTo("CabinetMainPage"); } private void ShowCurTimer(object sender, EventArgs e) diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index fd6de2c..9369ce2 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -8,6 +8,215 @@ Title="AdoptionPage" d:DesignHeight="450" d:DesignWidth="800" + Background="White" mc:Ignorable="d"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 3fd02d6..123bbd2 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" @@ -64,14 +62,11 @@ - - - - - + @@ -252,14 +247,9 @@ - - - - @@ -269,13 +259,15 @@ @@ -397,10 +389,9 @@ - + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index b2b07ba..f27f34e 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -151,6 +151,7 @@ MSBuild:Compile Designer + @@ -301,5 +302,13 @@ + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index 08b8103..7c9e3e8 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -1,7 +1,22 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class AdoptionPageViewModel + public class AdoptionPageViewModel : ViewModelBase { - + public ObservableCollection SurgeryModelList { get; set; } + + public AdoptionPageViewModel() + { + this.SurgeryModelList = new ObservableCollection + { + new SurgeryModel("赵新明", "妇科", "2022-8-29 12:42:58", "138909"), + new SurgeryModel("郭仕仕", "普外-耳鼻喉科", "2022-8-29 12:43:30", "138848"), + new SurgeryModel("李紫杰", "神经外科", "2022-8-30 12:43:35", "138849") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 60bb559..9ebeb4f 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,8 +101,6 @@ this.MainTopImage = FunctionModelList[7].Image; this.MainTopTitle = FunctionModelList[7].Title; // TODO 显示默认功能项数据 - // INavigationService navigationService = ServiceLocator.Current.GetInstance(); - // navigationService.NavigateTo("CabinetMainPage"); } private void ShowCurTimer(object sender, EventArgs e) diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index fd6de2c..9369ce2 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -8,6 +8,215 @@ Title="AdoptionPage" d:DesignHeight="450" d:DesignWidth="800" + Background="White" mc:Ignorable="d"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 3fd02d6..123bbd2 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" @@ -64,14 +62,11 @@ - - - - - + @@ -252,14 +247,9 @@ - - - - @@ -269,13 +259,15 @@ @@ -397,10 +389,9 @@ - + diff --git a/SubCabinetSolution/obj/Debug/App.g.i.cs b/SubCabinetSolution/obj/Debug/App.g.i.cs index 96dd186..3fbe105 100644 --- a/SubCabinetSolution/obj/Debug/App.g.i.cs +++ b/SubCabinetSolution/obj/Debug/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6244E858AE15D331C50E270641E5B514CFBAD0F3080FF98577C763E233FA2603" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "08233F290145B875E527F4E0A8BA35E9D0DA594BE8B40688C7D9FEAFF416DE2A" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -54,7 +54,7 @@ _contentLoaded = true; #line 9 "..\..\App.xaml" - this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative); + this.StartupUri = new System.Uri("/Views/CabinetWindow.xaml", System.UriKind.Relative); #line default #line hidden diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 90f7ade..34e7321 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index 8fcc52e..27c3448 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="MainWindow.xaml"> + StartupUri="/Views/CabinetWindow.xaml"> diff --git "a/SubCabinetSolution/Images/\344\277\235\345\255\230.png" "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" new file mode 100644 index 0000000..3cbbdc8 --- /dev/null +++ "b/SubCabinetSolution/Images/\344\277\235\345\255\230.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\263\351\227\250.png" "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" new file mode 100644 index 0000000..e297f90 --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\263\351\227\250.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\350\277\224\345\233\236.png" "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" new file mode 100644 index 0000000..f472248 --- /dev/null +++ "b/SubCabinetSolution/Images/\350\277\224\345\233\236.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" new file mode 100644 index 0000000..8d3383f --- /dev/null +++ "b/SubCabinetSolution/Images/\351\207\215\346\226\260\345\212\240\350\275\275.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 32899b1..c886cc1 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="#4381DF" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" diff --git a/SubCabinetSolution/Model/FunctionModel.cs b/SubCabinetSolution/Model/FunctionModel.cs index d26f89b..26182c8 100644 --- a/SubCabinetSolution/Model/FunctionModel.cs +++ b/SubCabinetSolution/Model/FunctionModel.cs @@ -11,4 +11,4 @@ public string Image { get; } public string Title { get; } } -} +} \ No newline at end of file diff --git a/SubCabinetSolution/Model/SurgeryModel.cs b/SubCabinetSolution/Model/SurgeryModel.cs new file mode 100644 index 0000000..0faf3b4 --- /dev/null +++ b/SubCabinetSolution/Model/SurgeryModel.cs @@ -0,0 +1,18 @@ +namespace SubCabinetSolution.Model +{ + public class SurgeryModel + { + public SurgeryModel(string doctorName, string deptName, string surgeryTime, string surgeryNum) + { + DoctorName = doctorName; + DeptName = deptName; + SurgeryTime = surgeryTime; + SurgeryNum = surgeryNum; + } + + public string DoctorName { get; } + public string DeptName { get; } + public string SurgeryTime { get; } + public string SurgeryNum { get; } + } +} \ No newline at end of file diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index b2b07ba..f27f34e 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -151,6 +151,7 @@ MSBuild:Compile Designer + @@ -301,5 +302,13 @@ + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs index 08b8103..7c9e3e8 100644 --- a/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs +++ b/SubCabinetSolution/ViewModel/AdoptionPageViewModel.cs @@ -1,7 +1,22 @@ -namespace SubCabinetSolution.ViewModel +using System.Collections.Generic; +using System.Collections.ObjectModel; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; + +namespace SubCabinetSolution.ViewModel { - public class AdoptionPageViewModel + public class AdoptionPageViewModel : ViewModelBase { - + public ObservableCollection SurgeryModelList { get; set; } + + public AdoptionPageViewModel() + { + this.SurgeryModelList = new ObservableCollection + { + new SurgeryModel("赵新明", "妇科", "2022-8-29 12:42:58", "138909"), + new SurgeryModel("郭仕仕", "普外-耳鼻喉科", "2022-8-29 12:43:30", "138848"), + new SurgeryModel("李紫杰", "神经外科", "2022-8-30 12:43:35", "138849") + }; + } } } \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 60bb559..9ebeb4f 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,8 +101,6 @@ this.MainTopImage = FunctionModelList[7].Image; this.MainTopTitle = FunctionModelList[7].Title; // TODO 显示默认功能项数据 - // INavigationService navigationService = ServiceLocator.Current.GetInstance(); - // navigationService.NavigateTo("CabinetMainPage"); } private void ShowCurTimer(object sender, EventArgs e) diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index fd6de2c..9369ce2 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -8,6 +8,215 @@ Title="AdoptionPage" d:DesignHeight="450" d:DesignWidth="800" + Background="White" mc:Ignorable="d"> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index 3fd02d6..123bbd2 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -8,8 +8,6 @@ Title="高值耗材柜（科室）" Width="1366" Height="768" - MinWidth="1366" - MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" @@ -64,14 +62,11 @@ - - - - - + @@ -252,14 +247,9 @@ - - - - @@ -269,13 +259,15 @@ @@ -397,10 +389,9 @@ - + diff --git a/SubCabinetSolution/obj/Debug/App.g.i.cs b/SubCabinetSolution/obj/Debug/App.g.i.cs index 96dd186..3fbe105 100644 --- a/SubCabinetSolution/obj/Debug/App.g.i.cs +++ b/SubCabinetSolution/obj/Debug/App.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "6244E858AE15D331C50E270641E5B514CFBAD0F3080FF98577C763E233FA2603" +#pragma checksum "..\..\App.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "08233F290145B875E527F4E0A8BA35E9D0DA594BE8B40688C7D9FEAFF416DE2A" //------------------------------------------------------------------------------ // // 此代码由工具生成。 @@ -54,7 +54,7 @@ _contentLoaded = true; #line 9 "..\..\App.xaml" - this.StartupUri = new System.Uri("MainWindow.xaml", System.UriKind.Relative); + this.StartupUri = new System.Uri("/Views/CabinetWindow.xaml", System.UriKind.Relative); #line default #line hidden diff --git a/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs b/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs index 456d525..22ccbb5 100644 --- a/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs +++ b/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs @@ -1,4 +1,4 @@ -#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "91826805651F13908C6E061CA3209C5B24DE6D60892B0F276DD62760381D6CD1" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "08CE010AE2B2ACC5C36CA0E4A3A1BABDC1EE2E638EE8A66F807AC5415600B755" //------------------------------------------------------------------------------ // // 此代码由工具生成。