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

Login.xaml.cs

@@ -156,6 +156,7 @@ namespace formula_manage
             if (Boolean.Parse(Configini.IniReadvalue("SOFTWARE_SET", "L6")))
             {
                 EXLINK.Background = Brushes.Red;
+                System.Windows.MessageBox.Show("扩展程序未启动");
             }
 
             TEXT_SQLIP = Configini.IniReadvalue("SQL_SERVER", "SQL1");    //读配置文件
@@ -181,6 +182,7 @@ namespace formula_manage
             }catch (Exception) 
             {
                 DISPENLINK.Background = Brushes.Red; //连接失败红色
+                DBCLINK.Background = Brushes.Red;
                 System.Windows.MessageBox.Show("连接数据库失败");
                 //Windows.Sql sql = new Windows.Sql();
                 //sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
@@ -213,8 +215,8 @@ namespace formula_manage
                 {
                     DBCLINK.Background = Brushes.Red; //连接失败红色
                     System.Windows.MessageBox.Show("连接数据库失败");
-                    Windows.Sql sql = new Windows.Sql();
+                    //Windows.Sql sql = new Windows.Sql();
-                    sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
+                    //sql.ShowDialog();//实例化并置顶打开数据库设置窗口 
                     return;
                 }
                 DBCLINK.Background = Brushes.Green; //连接成功绿色