diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 9f4b263..4a94037 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 9f4b263..4a94037 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index c21950f..c404cff 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="/Views/CabinetWindow.xaml"> + StartupUri="/MainWindow.xaml"> diff --git a/.vs/SubCabinetSolution/v17/.suo b/.vs/SubCabinetSolution/v17/.suo index 9f4b263..4a94037 100644 --- a/.vs/SubCabinetSolution/v17/.suo +++ b/.vs/SubCabinetSolution/v17/.suo Binary files differ diff --git a/SubCabinetSolution/App.xaml b/SubCabinetSolution/App.xaml index c21950f..c404cff 100644 --- a/SubCabinetSolution/App.xaml +++ b/SubCabinetSolution/App.xaml @@ -6,7 +6,7 @@ xmlns:d1P1="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:vm="clr-namespace:SubCabinetSolution.ViewModel" d1P1:Ignorable="d" - StartupUri="/Views/CabinetWindow.xaml"> + StartupUri="/MainWindow.xaml"> diff --git a/SubCabinetSolution/MainWindow.xaml b/SubCabinetSolution/MainWindow.xaml index 45b1928..0b75790 100644 --- a/SubCabinetSolution/MainWindow.xaml +++ b/SubCabinetSolution/MainWindow.xaml @@ -2,9 +2,12 @@ x:Class="SubCabinetSolution.MainWindow" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:aforge="clr-namespace:AForge.Controls;assembly=AForge.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" + xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:utils="clr-namespace:SubCabinetSolution.Utils" + xmlns:wfi="clr-namespace:System.Windows.Forms.Integration;assembly=WindowsFormsIntegration" xmlns:widgets="clr-namespace:CSharpToolkit.Widgets;assembly=CSharpToolkit" Title="高值耗材柜(科室)" Width="1366" @@ -19,6 +22,12 @@ + + + + + +