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

App.xaml

@@ -1,8 +1,8 @@
 <Application x:Class="formula_manage.App"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:local="clr-namespace:formula_manage"
+             xmlns:local="clr-namespace:formula_manage"            
-             StartupUri="Login.xaml"
+             Startup="Application_Startup"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
              d1p1:Ignorable="d" xmlns:d1p1="http://schemas.openxmlformats.org/markup-compatibility/2006"
              >

App.xaml.cs

@@ -64,5 +64,15 @@ namespace formula_manage
                                 );
             }
         }
+
+        /// <summary>
+        /// 启动初始页面
+        /// </summary>
+        private void Application_Startup(object sender, StartupEventArgs e)
+        {
+            Application.Current.StartupUri = new Uri("Login.xaml", UriKind.Relative);//和MainWindwo同一目录
+            //Application.Current.StartupUri = new Uri("", UriKind.Relative);//在目录下
+        }
+
     }
 }

ViewModel/MainWindowViewModel.cs

@@ -236,6 +236,7 @@ namespace formula_manage.ViewModel
             }
             return lst;
         } //DataTable FOR ObservableCollection转换器
+
         /// <summary>
         /// 循环事件设定
         /// </summary>