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

App.xaml.cs

@@ -12,7 +12,11 @@ namespace formula_manage
     /// App.xaml 的交互逻辑
     /// </summary>
     public partial class App : Application
-    {
+    {    /// <summary>
+         ///公共变量来自Login的用户名
+         /// </summary>
+        public static string USER_Purview { get; set; }
+
         public App()
         {
             this.Startup += new StartupEventHandler(App_Startup);

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)  //回车跳转功能

MainWindow.xaml

@@ -9,15 +9,17 @@
         BorderBrush="White" Background="#FFE0E0E0">
     <Grid>
         <Menu IsTabStop="False">
-            <MenuItem x:Name="tab" Header="_设置" FontSize="16" Focusable ="False" >
+            <MenuItem x:Name="tab" Header="_文件" FontSize="16" Focusable ="False" >
+                <MenuItem Header="_许可证" FontSize="16"/>
+                <Separator/>
+                <MenuItem Header="_注销" FontSize="16"/>
+            </MenuItem>
+            <MenuItem Header="_设置" FontSize="16" Focusable ="False" >
                 <MenuItem Header="_数据库设置" FontSize="16" Click="SQL"/>
                 <MenuItem Header="_备份/还原" FontSize="16" Click="SQLBAK"/>
                 <Separator/>
                 <MenuItem Header="_软件设置" FontSize="16" Click="SOFTWARE_SET"/>
                 <MenuItem Header="_用户设置" FontSize="16" Click="USER_SET"/>
-                <Separator/>
-                <MenuItem Header="_许可证" FontSize="16"/>
-                <MenuItem Header="_帮助" FontSize="16" Click="HELP"/>
             </MenuItem>
             <MenuItem Header="_管理" FontSize="16" Focusable ="False">
                 <MenuItem Header="_染色机管理" FontSize="16" Click="MAC_SET"/>
@@ -40,10 +42,16 @@
                 <MenuItem Header="_历史查询" FontSize="16"/>
                 <MenuItem Header="_统计" FontSize="16"/>
             </MenuItem>
+            <MenuItem Header="_帮助" FontSize="16" Focusable ="False">
+                <MenuItem Header="_帮助" FontSize="16" Click="HELP"/>
+            </MenuItem>
         </Menu>
 
         <TextBox x:Name="USERTIME" HorizontalAlignment="Right" Height="30" Margin="0,0,5,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="150" FontSize="14" 
                  Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
+        <TextBox x:Name="USER" HorizontalAlignment="Right" Height="30" Margin="0,0,155,0" TextWrapping="Wrap" VerticalAlignment="Top" Width="100" FontSize="14" 
+          Background="{x:Null}" BorderBrush="{x:Null}" SelectionBrush="{x:Null}" IsReadOnly="True" IsUndoEnabled="False" MaxLines="1" IsEnabled="False"/>
+
 
         <Button Content="新工单" HorizontalAlignment="Left" Margin="335,35,0,0" Height="30" VerticalAlignment="Top" Width="70" Background="#FFF9F9F9" FontSize="20" Click="Button_NewOrder" Focusable ="False"/>
         <Button Content="归属订单" HorizontalAlignment="Left" Margin="300,70,0,0" Height="30" VerticalAlignment="Top" Width="105" Background="#FFF9F9F9" FontSize="20" Focusable ="False" Click="Button_Technology"/>

MainWindow.xaml.cs

@@ -27,7 +27,8 @@ namespace formula_manage
     /// MainWindow.xaml 的交互逻辑
     /// </summary>
     public partial class MainWindow : Window
-    {
+    {       
+
         DataTable STUFFdataTable = new DataTable();   //建立STUFF缓存
 
         public MainWindow()
@@ -38,6 +39,8 @@ namespace formula_manage
             InitializeComponent();
             this.Closing += Window_Closing;   //添加窗口关闭事件
 
+            USER.Text = App.USER_Purview;
+
             CountDown();//执行循环方法
 
             DataTable dataTable = new DataTable();