diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 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 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index 2fcfa51..4a581f9 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index 2fcfa51..4a581f9 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml index 135dffb..9a07974 100644 --- a/SubCabinetSolution/Views/InquirePage.xaml +++ b/SubCabinetSolution/Views/InquirePage.xaml @@ -11,5 +11,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index 2fcfa51..4a581f9 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml index 135dffb..9a07974 100644 --- a/SubCabinetSolution/Views/InquirePage.xaml +++ b/SubCabinetSolution/Views/InquirePage.xaml @@ -11,5 +11,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml index 94ac208..7783927 100644 --- a/SubCabinetSolution/Views/InventoryPage.xaml +++ b/SubCabinetSolution/Views/InventoryPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index 2fcfa51..4a581f9 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml index 135dffb..9a07974 100644 --- a/SubCabinetSolution/Views/InquirePage.xaml +++ b/SubCabinetSolution/Views/InquirePage.xaml @@ -11,5 +11,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml index 94ac208..7783927 100644 --- a/SubCabinetSolution/Views/InventoryPage.xaml +++ b/SubCabinetSolution/Views/InventoryPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml index 5c41952..c9ea2d5 100644 --- a/SubCabinetSolution/Views/PutGoodsPage.xaml +++ b/SubCabinetSolution/Views/PutGoodsPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index 2fcfa51..4a581f9 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml index 135dffb..9a07974 100644 --- a/SubCabinetSolution/Views/InquirePage.xaml +++ b/SubCabinetSolution/Views/InquirePage.xaml @@ -11,5 +11,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml index 94ac208..7783927 100644 --- a/SubCabinetSolution/Views/InventoryPage.xaml +++ b/SubCabinetSolution/Views/InventoryPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml index 5c41952..c9ea2d5 100644 --- a/SubCabinetSolution/Views/PutGoodsPage.xaml +++ b/SubCabinetSolution/Views/PutGoodsPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index a495985..ab58e89 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index 2fcfa51..4a581f9 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml index 135dffb..9a07974 100644 --- a/SubCabinetSolution/Views/InquirePage.xaml +++ b/SubCabinetSolution/Views/InquirePage.xaml @@ -11,5 +11,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml index 94ac208..7783927 100644 --- a/SubCabinetSolution/Views/InventoryPage.xaml +++ b/SubCabinetSolution/Views/InventoryPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml index 5c41952..c9ea2d5 100644 --- a/SubCabinetSolution/Views/PutGoodsPage.xaml +++ b/SubCabinetSolution/Views/PutGoodsPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index a495985..ab58e89 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml index b15326b..58c41ef 100644 --- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml +++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml @@ -1,12 +1,12 @@ - - - - - + + + \ No newline at end of file diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 19581c4..e21c62c 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git "a/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" new file mode 100644 index 0000000..04ba87f --- /dev/null +++ "b/SubCabinetSolution/Images/\345\205\245\346\237\234\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2791cba --- /dev/null +++ "b/SubCabinetSolution/Images/\345\272\223\345\255\230\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" new file mode 100644 index 0000000..a5c3239 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\214\207\345\256\232\350\200\227\346\235\220\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" new file mode 100644 index 0000000..2f04ea3 --- /dev/null +++ "b/SubCabinetSolution/Images/\346\266\210\350\200\227\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0737ce0 --- /dev/null +++ "b/SubCabinetSolution/Images/\347\233\221\346\216\247\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" new file mode 100644 index 0000000..0eba0cd --- /dev/null +++ "b/SubCabinetSolution/Images/\347\273\274\345\220\210\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" new file mode 100644 index 0000000..75cf415 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\200\200SPD\346\237\245\350\257\242.png" Binary files differ diff --git "a/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" new file mode 100644 index 0000000..4706425 --- /dev/null +++ "b/SubCabinetSolution/Images/\351\242\206\347\224\250\346\234\252\345\275\222\350\277\230.png" Binary files differ diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 0e5725f..76890a6 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -6,13 +6,13 @@ xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="#4381DF" - ResizeMode="NoResize" + ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> diff --git a/SubCabinetSolution/SubCabinetSolution.csproj b/SubCabinetSolution/SubCabinetSolution.csproj index 2601c56..b2b07ba 100644 --- a/SubCabinetSolution/SubCabinetSolution.csproj +++ b/SubCabinetSolution/SubCabinetSolution.csproj @@ -285,5 +285,21 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/ViewModel/CabinetViewModel.cs b/SubCabinetSolution/ViewModel/CabinetViewModel.cs index 9ebeb4f..60bb559 100644 --- a/SubCabinetSolution/ViewModel/CabinetViewModel.cs +++ b/SubCabinetSolution/ViewModel/CabinetViewModel.cs @@ -101,6 +101,8 @@ 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/ViewModel/InquirePageViewModel.cs b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs index 23b0856..301e1aa 100644 --- a/SubCabinetSolution/ViewModel/InquirePageViewModel.cs +++ b/SubCabinetSolution/ViewModel/InquirePageViewModel.cs @@ -1,12 +1,26 @@ -using GalaSoft.MvvmLight; +using System.Collections.Generic; +using GalaSoft.MvvmLight; +using SubCabinetSolution.Model; namespace SubCabinetSolution.ViewModel { public class InquirePageViewModel : ViewModelBase { + public List InquireModelList { get; set; } + public InquirePageViewModel() { - + this.InquireModelList = new List + { + new FunctionModel("/Images/库存查询.png", "库存查询"), + new FunctionModel("/Images/领用未归还.png", "领用未归还"), + new FunctionModel("/Images/入柜查询.png", "入柜查询"), + new FunctionModel("/Images/退SPD查询.png", "退SPD查询"), + new FunctionModel("/Images/指定耗材查询.png", "指定耗材查询"), + new FunctionModel("/Images/消耗查询.png", "消耗查询"), + new FunctionModel("/Images/监控查询.png", "监控查询"), + new FunctionModel("/Images/综合查询.png", "综合查询") + }; } } } \ No newline at end of file diff --git a/SubCabinetSolution/Views/AdoptionPage.xaml b/SubCabinetSolution/Views/AdoptionPage.xaml index a7ec821..fd6de2c 100644 --- a/SubCabinetSolution/Views/AdoptionPage.xaml +++ b/SubCabinetSolution/Views/AdoptionPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/CabinetMainPage.xaml b/SubCabinetSolution/Views/CabinetMainPage.xaml index c68ac2d..978c121 100644 --- a/SubCabinetSolution/Views/CabinetMainPage.xaml +++ b/SubCabinetSolution/Views/CabinetMainPage.xaml @@ -1,10 +1,13 @@ - + diff --git a/SubCabinetSolution/Views/CabinetWindow.xaml b/SubCabinetSolution/Views/CabinetWindow.xaml index d4ec8cc..1a004d5 100644 --- a/SubCabinetSolution/Views/CabinetWindow.xaml +++ b/SubCabinetSolution/Views/CabinetWindow.xaml @@ -6,13 +6,13 @@ xmlns:interactivity="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" Title="高值耗材柜（科室）" - MinWidth="600" - MinHeight="500" + Width="1399" + Height="768" + MinWidth="1399" + MinHeight="768" Background="White" ResizeMode="CanResize" WindowStartupLocation="CenterScreen" - WindowState="Maximized" - WindowStyle="None" mc:Ignorable="d"> @@ -380,35 +380,14 @@ - - - - - - - + + - - - - - + Background="#ECF1FB" + NavigationUIVisibility="Hidden" /> + \ No newline at end of file diff --git a/SubCabinetSolution/Views/EmergencyPage.xaml b/SubCabinetSolution/Views/EmergencyPage.xaml index 2fcfa51..4a581f9 100644 --- a/SubCabinetSolution/Views/EmergencyPage.xaml +++ b/SubCabinetSolution/Views/EmergencyPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/InquirePage.xaml b/SubCabinetSolution/Views/InquirePage.xaml index 135dffb..9a07974 100644 --- a/SubCabinetSolution/Views/InquirePage.xaml +++ b/SubCabinetSolution/Views/InquirePage.xaml @@ -11,5 +11,105 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/SubCabinetSolution/Views/InventoryPage.xaml b/SubCabinetSolution/Views/InventoryPage.xaml index 94ac208..7783927 100644 --- a/SubCabinetSolution/Views/InventoryPage.xaml +++ b/SubCabinetSolution/Views/InventoryPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/PutGoodsPage.xaml b/SubCabinetSolution/Views/PutGoodsPage.xaml index 5c41952..c9ea2d5 100644 --- a/SubCabinetSolution/Views/PutGoodsPage.xaml +++ b/SubCabinetSolution/Views/PutGoodsPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/RefundSpdPage.xaml b/SubCabinetSolution/Views/RefundSpdPage.xaml index a495985..ab58e89 100644 --- a/SubCabinetSolution/Views/RefundSpdPage.xaml +++ b/SubCabinetSolution/Views/RefundSpdPage.xaml @@ -1,12 +1,13 @@ - - - - + + diff --git a/SubCabinetSolution/Views/ReturnGoodsPage.xaml b/SubCabinetSolution/Views/ReturnGoodsPage.xaml index b15326b..58c41ef 100644 --- a/SubCabinetSolution/Views/ReturnGoodsPage.xaml +++ b/SubCabinetSolution/Views/ReturnGoodsPage.xaml @@ -1,12 +1,12 @@ - - - - - + + + \ No newline at end of file diff --git a/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs b/SubCabinetSolution/obj/Debug/MainWindow.g.i.cs index d269d19..facf967 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}" "20EC3CEC11B9A69103A1E08FEEF7C98751959B047C2FEA8DDDAA9D23639F2572" +#pragma checksum "..\..\MainWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "61494B3DD198856CFC5A4796D2F98B2318DF8232FCB7AFD7670BDFBFF9391293" //------------------------------------------------------------------------------ // // 此代码由工具生成。