Merge branch 'master' of http://192.168.0.12:13000/sc/formula_manage

Login.xaml.cs

@@ -71,15 +71,14 @@ namespace formula_manage
         string Connstr_SC;
         string Connstr_DBC;
         bool SQL2;
-        bool Login_link;
+
         private async void Window_Loaded(object sender, RoutedEventArgs e)
         {
             logon.IsEnabled = false;  //关闭登录按钮
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
 
-            // Login_link = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
-            if ( !Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1")))//连接状态显示是否生效
+            if (!Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1")))//连接状态显示是否生效 1有效
             {
                 DISPENLINK.Visibility = Visibility.Hidden;  //不显示
                 DBCLINK.Visibility = Visibility.Hidden;

Windows/APP_set.xaml.cs

@@ -26,20 +26,20 @@ namespace formula_manage.Windows
         }
         public string INIPath = Convert.ToString(System.AppDomain.CurrentDomain.BaseDirectory) + "formula.ini";
 
-        bool Login_link;
+        bool Loginlink;
         private void Window_SET(object sender, RoutedEventArgs e)
         {
 
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);
 
-            Login_link = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
+            Login_LINK.IsChecked = Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L1"));  //连接状态显示是否生效
 
         }
         private void Login_LINK_Checked(object sender, RoutedEventArgs e)
         {
-            Login_link = Login_LINK.IsChecked.GetValueOrDefault();    //显示是否生效
+            Loginlink = Login_LINK.IsChecked.GetValueOrDefault();    //显示是否生效
             UserClass.IniFile.IniFiles Configini = new UserClass.IniFile.IniFiles(INIPath);   //配置文件
-            Configini.IniWritevalue("SOFTWARE_SET", " L1", Login_link.ToString());
+            Configini.IniWritevalue("SOFTWARE_SET", " L1", Loginlink.ToString());
         }
     }
 }