Merge branch 'master' of http://www.scserverddns.top:13000/sc/formula_manage

Login.xaml.cs

@@ -62,17 +62,19 @@ namespace formula_manage
 
         private void Button_Click_1(object sender, RoutedEventArgs e)  //登录按钮事件
         {
-          // if ((User.Text == "engineer" || User.Text == "ENGINEER") && (Pasword.Password == "engineer" || Pasword.Password == "ENGINEER"))
+           if ((User.Text == "engineer" || User.Text == "ENGINEER") && (Pasword.Password == "engineer" || Pasword.Password == "ENGINEER"))
             {
+                App.USER_Purview = "ENGINEER";//传入用户名
+
                 Window window = Window.GetWindow(this);
                 MainWindow Main = new MainWindow();
                 window.Close();
                 Main.ShowDialog();//实例化并置顶打开信息窗口
             }
-           /* else
+            else
             {
                 System.Windows.MessageBox.Show("账号或密码错误");
-            }*/
+            }
         }
 
         private void SearchBox_OnKeyDownd(object sender, System.Windows.Input.KeyEventArgs e)  //回车跳转功能