Merge branch 'reconfiguration' of http://111.9.47.105:10244/bpa/BPASmartClient into reconfiguration

BPASmartClient.Tourism/View/AddRawMaterialView.xaml

@@ -0,0 +1,18 @@
+<UserControl
+    x:Class="BPASmartClient.TourismCollege.View.AddRawMaterialView"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:local="clr-namespace:BPASmartClient.TourismCollege.View"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    Width="800"
+    Height="450"
+    mc:Ignorable="d">
+    
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50" />
+            <RowDefinition Height="1*" />
+        </Grid.RowDefinitions>
+    </Grid>
+</UserControl>

BPASmartClient.Tourism/View/AddRawMaterialView.xaml.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace BPASmartClient.TourismCollege.View
+{
+    /// <summary>
+    /// AddRawMaterialView.xaml 的交互逻辑
+    /// </summary>
+    public partial class AddRawMaterialView : Window
+    {
+        public AddRawMaterialView()
+        {
+            InitializeComponent();
+            this.DataContext=new AddRawMaterialViewModel();
+        }
+    }
+}

BPASmartClient.Tourism/View/Monitor.xaml

@@ -12,7 +12,7 @@
     mc:Ignorable="d">
 
     <UserControl.DataContext>
-        <vm:MonitorViewModel />
+        <vm:MonitorViewModel/>
     </UserControl.DataContext>
 
     <UserControl.Resources>

BPASmartClient.Tourism/ViewModel/AddRawMaterialViewModel.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BPASmartClient.TourismCollege.ViewModel
+{
+    public class AddRawMaterialViewModel:NotifyBase
+    {
+
+    }
+}