Merge branch 'master' of ssh://10.10.101.21/source/mes-client

UAS_KanBan/AutoSizeControl.cs

@@ -0,0 +1,104 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace UAS_KanBan
+{
+    class AutoSizeControl
+    {
+        /// <summary>
+        /// 记录所有控件
+        /// </summary>
+        List<Control> ctl = new List<Control>();
+        /// <summary>
+        /// 记录控件的初始化位置
+        /// </summary>
+        Dictionary<string, Point> CtlPoint = new Dictionary<string, Point>();
+        /// <summary>
+        /// 记录控件的初始化大小
+        /// </summary>
+        Dictionary<string, Size> CtlSize = new Dictionary<string, Size>();
+        /// <summary>
+        /// 初始化的窗体宽度
+        /// </summary>
+        int InitFormWidth = 0;
+        /// <summary>
+        /// 初始化的窗体高度
+        /// </summary>
+        int InitFormHeight = 0;
+        /// <summary>
+        /// 窗体调整时的宽度
+        /// </summary>
+        int AutoSizeFormWidth = 0;
+        /// <summary>
+        /// 窗体调整时的高度
+        /// </summary>
+        int AutoSizeFormHeight = 0;
+        /// <summary>
+        /// 自适应宽度比例
+        /// </summary>
+        float AutoSizeWidthRate;
+        /// <summary>
+        /// 
+        /// </summary>
+        float AutoSizeHeigthRate;
+
+        public void InitControl(Control control)
+        {
+            InitFormWidth = control.Width;
+            InitFormHeight = control.Height;
+            foreach (Control item in control.Controls)
+            {
+                ctl.Add(item);
+                CtlPoint.Add(item.Name, item.Location);
+                CtlSize.Add(item.Name, item.Size);
+                if (item.Controls.Count > 0)
+                {
+                    AddControl(item);
+                }
+            }
+        }
+
+        public void AddControl(Control control)
+        {
+            foreach (Control item in control.Controls)
+            {
+                ctl.Add(item);
+                if (!CtlPoint.ContainsKey(item.Name))
+                    CtlPoint.Add(item.Name, item.Location);
+                if (!CtlSize.ContainsKey(item.Name))
+                    CtlSize.Add(item.Name, item.Size);
+                if (item.Controls.Count > 0)
+                {
+                    AddControl(item);
+                }
+            }
+        }
+
+        public void AutoSize(Control control)
+        {
+            AutoSizeFormHeight = control.Height;
+            AutoSizeFormWidth = control.Width;
+            AutoSizeWidthRate = (float)(AutoSizeFormWidth * 1.0 / InitFormWidth);
+            AutoSizeHeigthRate = (float)(AutoSizeFormHeight * 1.0 / InitFormHeight);
+            for (int i = 0; i < ctl.Count; i++)
+            {
+                float AutoSizeWidthRate1 = (float)(CtlPoint[ctl[i].Name].X * 1.0 / InitFormWidth);
+                float AutoSizeHeigthRate1 = (float)(CtlPoint[ctl[i].Name].Y * 1.0 / InitFormHeight);
+                ctl[i].Location = new Point((int)(AutoSizeFormWidth * AutoSizeWidthRate1), (int)(AutoSizeFormHeight * AutoSizeHeigthRate1));
+                if (CtlPoint.ContainsKey(ctl[i].Name + "_label"))
+                {
+                    for (int j = 0; j < ctl.Count; j++)
+                    {
+                        if (ctl[j].Name == ctl[i].Name + "_label")
+                        {
+                            ctl[i].Location = new Point((int)(CtlPoint[ctl[i].Name + "_label"].X * AutoSizeWidthRate + ctl[j].Width + (CtlPoint[ctl[i].Name].X - CtlPoint[ctl[i].Name + "_label"].X - CtlSize[ctl[i].Name + "_label"].Width)), (int)(CtlPoint[ctl[i].Name + "_label"].Y * AutoSizeHeigthRate));
+                        }
+                    }
+                }
+                ctl[i].Size = new Size((int)(CtlSize[ctl[i].Name].Width * AutoSizeWidthRate), (int)(CtlSize[ctl[i].Name].Height * AutoSizeHeigthRate));
+            }
+        }
+    }
+}

UAS_KanBan/Process.Designer.cs

@@ -48,7 +48,6 @@
             this.Logo = new CCWin.SkinControl.SkinPictureBox();
             this.投入 = new CCWin.SkinControl.SkinLabel();
             this.产出 = new CCWin.SkinControl.SkinLabel();
-            this.机型 = new CCWin.SkinControl.SkinLabel();
             this.收益率 = new CCWin.SkinControl.SkinLabel();
             this.故障数 = new CCWin.SkinControl.SkinLabel();
             this.直通率 = new CCWin.SkinControl.SkinLabel();
@@ -56,6 +55,7 @@
             this.Line = new CCWin.SkinControl.SkinLabel();
             this.Title2 = new CCWin.SkinControl.SkinLabel();
             this.Refresh = new System.Windows.Forms.Timer(this.components);
+            this.机型 = new CCWin.SkinControl.SkinLabel();
             ((System.ComponentModel.ISupportInitialize)(this.Logo)).BeginInit();
             this.SuspendLayout();
             // 
@@ -82,7 +82,7 @@
             this.BottomLine.BorderStyle = System.Windows.Forms.BorderStyle.Fixed3D;
             this.BottomLine.ControlState = CCWin.SkinClass.ControlState.Normal;
             this.BottomLine.DownBack = null;
-            this.BottomLine.Location = new System.Drawing.Point(3, 146);
+            this.BottomLine.Location = new System.Drawing.Point(3, 143);
             this.BottomLine.MouseBack = null;
             this.BottomLine.Name = "BottomLine";
             this.BottomLine.NormlBack = null;
@@ -136,7 +136,7 @@
             // 
             // Title
             // 
-            this.Title.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.Title.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
             this.Title.AutoSize = true;
             this.Title.BackColor = System.Drawing.Color.Transparent;
             this.Title.BorderColor = System.Drawing.Color.White;
@@ -253,7 +253,7 @@
             this.LineCode_label.BackColor = System.Drawing.Color.Transparent;
             this.LineCode_label.BorderColor = System.Drawing.Color.White;
             this.LineCode_label.Font = new System.Drawing.Font("宋体", 30F);
-            this.LineCode_label.Location = new System.Drawing.Point(846, 45);
+            this.LineCode_label.Location = new System.Drawing.Point(847, 45);
             this.LineCode_label.Name = "LineCode_label";
             this.LineCode_label.Size = new System.Drawing.Size(97, 40);
             this.LineCode_label.TabIndex = 14;
@@ -266,7 +266,7 @@
             this.WorkShift_label.BackColor = System.Drawing.Color.Transparent;
             this.WorkShift_label.BorderColor = System.Drawing.Color.White;
             this.WorkShift_label.Font = new System.Drawing.Font("宋体", 30F);
-            this.WorkShift_label.Location = new System.Drawing.Point(848, 102);
+            this.WorkShift_label.Location = new System.Drawing.Point(849, 101);
             this.WorkShift_label.Name = "WorkShift_label";
             this.WorkShift_label.Size = new System.Drawing.Size(97, 40);
             this.WorkShift_label.TabIndex = 15;
@@ -275,10 +275,10 @@
             // Logo
             // 
             this.Logo.BackColor = System.Drawing.Color.Transparent;
-            this.Logo.Image = global::UAS_KanBan.Properties.Resources.malata_logo;
+            this.Logo.Image = global::UAS_KanBan.Properties.Resources.lo3;
             this.Logo.Location = new System.Drawing.Point(6, 42);
             this.Logo.Name = "Logo";
-            this.Logo.Size = new System.Drawing.Size(289, 71);
+            this.Logo.Size = new System.Drawing.Size(289, 95);
             this.Logo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.Logo.TabIndex = 16;
             this.Logo.TabStop = false;
@@ -289,13 +289,12 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.投入.AutoSize = true;
             this.投入.BackColor = System.Drawing.Color.Transparent;
-            this.投入.BorderColor = System.Drawing.Color.White;
-            this.投入.BorderSize = 0;
-            this.投入.Font = new System.Drawing.Font("微软雅黑", 52F, System.Drawing.FontStyle.Bold);
+            this.投入.BorderColor = System.Drawing.Color.Red;
+            this.投入.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.投入.ForeColor = System.Drawing.Color.Red;
-            this.投入.Location = new System.Drawing.Point(353, 370);
+            this.投入.Location = new System.Drawing.Point(377, 376);
             this.投入.Name = "投入";
-            this.投入.Size = new System.Drawing.Size(0, 93);
+            this.投入.Size = new System.Drawing.Size(0, 69);
             this.投入.TabIndex = 19;
             // 
             // 产出
@@ -304,43 +303,26 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.产出.AutoSize = true;
             this.产出.BackColor = System.Drawing.Color.Transparent;
-            this.产出.BorderColor = System.Drawing.Color.White;
-            this.产出.BorderSize = 0;
-            this.产出.Font = new System.Drawing.Font("微软雅黑", 52F, System.Drawing.FontStyle.Bold);
+            this.产出.BorderColor = System.Drawing.Color.Red;
+            this.产出.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.产出.ForeColor = System.Drawing.Color.Red;
-            this.产出.Location = new System.Drawing.Point(353, 482);
+            this.产出.Location = new System.Drawing.Point(377, 488);
             this.产出.Name = "产出";
-            this.产出.Size = new System.Drawing.Size(0, 93);
+            this.产出.Size = new System.Drawing.Size(0, 69);
             this.产出.TabIndex = 18;
             // 
-            // 机型
-            // 
-            this.机型.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left)));
-            this.机型.AutoSize = true;
-            this.机型.BackColor = System.Drawing.Color.Transparent;
-            this.机型.BorderColor = System.Drawing.Color.White;
-            this.机型.BorderSize = 0;
-            this.机型.Font = new System.Drawing.Font("微软雅黑", 52F, System.Drawing.FontStyle.Bold);
-            this.机型.ForeColor = System.Drawing.Color.Red;
-            this.机型.Location = new System.Drawing.Point(353, 259);
-            this.机型.Name = "机型";
-            this.机型.Size = new System.Drawing.Size(0, 93);
-            this.机型.TabIndex = 17;
-            // 
             // 收益率
             // 
             this.收益率.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
             this.收益率.AutoSize = true;
             this.收益率.BackColor = System.Drawing.Color.Transparent;
-            this.收益率.BorderColor = System.Drawing.Color.White;
-            this.收益率.BorderSize = 0;
-            this.收益率.Font = new System.Drawing.Font("微软雅黑", 52F, System.Drawing.FontStyle.Bold);
+            this.收益率.BorderColor = System.Drawing.Color.Red;
+            this.收益率.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.收益率.ForeColor = System.Drawing.Color.Red;
-            this.收益率.Location = new System.Drawing.Point(932, 370);
+            this.收益率.Location = new System.Drawing.Point(959, 376);
             this.收益率.Name = "收益率";
-            this.收益率.Size = new System.Drawing.Size(0, 93);
+            this.收益率.Size = new System.Drawing.Size(0, 69);
             this.收益率.TabIndex = 22;
             // 
             // 故障数
@@ -349,13 +331,12 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.故障数.AutoSize = true;
             this.故障数.BackColor = System.Drawing.Color.Transparent;
-            this.故障数.BorderColor = System.Drawing.Color.White;
-            this.故障数.BorderSize = 0;
-            this.故障数.Font = new System.Drawing.Font("微软雅黑", 52F, System.Drawing.FontStyle.Bold);
+            this.故障数.BorderColor = System.Drawing.Color.Red;
+            this.故障数.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.故障数.ForeColor = System.Drawing.Color.Red;
-            this.故障数.Location = new System.Drawing.Point(932, 482);
+            this.故障数.Location = new System.Drawing.Point(959, 488);
             this.故障数.Name = "故障数";
-            this.故障数.Size = new System.Drawing.Size(0, 93);
+            this.故障数.Size = new System.Drawing.Size(0, 69);
             this.故障数.TabIndex = 21;
             // 
             // 直通率
@@ -364,13 +345,12 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.直通率.AutoSize = true;
             this.直通率.BackColor = System.Drawing.Color.Transparent;
-            this.直通率.BorderColor = System.Drawing.Color.White;
-            this.直通率.BorderSize = 0;
-            this.直通率.Font = new System.Drawing.Font("微软雅黑", 52F, System.Drawing.FontStyle.Bold);
+            this.直通率.BorderColor = System.Drawing.Color.Red;
+            this.直通率.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.直通率.ForeColor = System.Drawing.Color.Red;
-            this.直通率.Location = new System.Drawing.Point(932, 259);
+            this.直通率.Location = new System.Drawing.Point(959, 265);
             this.直通率.Name = "直通率";
-            this.直通率.Size = new System.Drawing.Size(0, 93);
+            this.直通率.Size = new System.Drawing.Size(0, 69);
             this.直通率.TabIndex = 20;
             // 
             // 班制
@@ -414,6 +394,20 @@
             this.Title2.TabIndex = 25;
             this.Title2.Text = "投入\\产出实时统计";
             // 
+            // 机型
+            // 
+            this.机型.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.机型.AutoSize = true;
+            this.机型.BackColor = System.Drawing.Color.Transparent;
+            this.机型.BorderColor = System.Drawing.Color.Red;
+            this.机型.Font = new System.Drawing.Font("宋体", 51.75F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.机型.ForeColor = System.Drawing.Color.Red;
+            this.机型.Location = new System.Drawing.Point(377, 265);
+            this.机型.Name = "机型";
+            this.机型.Size = new System.Drawing.Size(0, 69);
+            this.机型.TabIndex = 17;
+            // 
             // Process
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
@@ -482,7 +476,6 @@
         private CCWin.SkinControl.SkinPictureBox Logo;
         private CCWin.SkinControl.SkinLabel 投入;
         private CCWin.SkinControl.SkinLabel 产出;
-        private CCWin.SkinControl.SkinLabel 机型;
         private CCWin.SkinControl.SkinLabel 收益率;
         private CCWin.SkinControl.SkinLabel 故障数;
         private CCWin.SkinControl.SkinLabel 直通率;
@@ -490,5 +483,6 @@
         private CCWin.SkinControl.SkinLabel Line;
         private CCWin.SkinControl.SkinLabel Title2;
         private System.Windows.Forms.Timer Refresh;
+        private CCWin.SkinControl.SkinLabel 机型;
     }
 }

UAS_KanBan/Process.cs

@@ -13,26 +13,20 @@ namespace UAS_KanBan
     public partial class Process : BaseForm
     {
 
-        AutoSizeFormClass asc = new AutoSizeFormClass();
+        AutoSizeControl asc = new AutoSizeControl();
 
         DataHelper dh = new DataHelper();
 
-        string Linecode;
-
-        string Wccode;
-
         public Process(string LineCode, string WcCode)
         {
             InitializeComponent();
-            Linecode = LineCode;
-            Wccode = WcCode;
             Line.Text = LineCode;
             班制.Text = WcCode;
         }
 
         private void Process_Load(object sender, EventArgs e)
         {
-            asc.controllInitializeSize(this);
+            asc.InitControl(this);
             Refresh_Tick(sender, e);
             Refresh.Tick += Refresh_Tick;
             Refresh.Interval = Setting.RefreshRate * 1000;
@@ -42,16 +36,20 @@ namespace UAS_KanBan
 
         private void Refresh_Tick(object sender, EventArgs e)
         {
-            DataTable dt = (DataTable)dh.ExecuteSql("select KBI_LINE_ZTL('" + Linecode + "','" + Wccode + "') from dual", "select");
+            DataTable dt = (DataTable)dh.ExecuteSql("select KBI_LINE_ZTL('" + Line.Text + "','" + 班制.Text + "') from dual", "select");
             string Data = dt.Rows[0][0].ToString();
             string[] Item = Data.Split(':');
             string[] ItemName = new string[Item.Length];
             string[] ItemData = new string[Item.Length];
-            for (int i = 0; i < Item.Length; i++)
+            try
             {
-                ItemName[i] = Item[i].Split('|')[0];
-                ItemData[i] = Item[i].Split('|')[1];
+                for (int i = 0; i < Item.Length; i++)
+                {
+                    ItemName[i] = Item[i].Split('|')[0];
+                    ItemData[i] = Item[i].Split('|')[1];
+                }
             }
+            catch (Exception) { }
             for (int i = 0; i < Item.Length; i++)
             {
                 for (int j = 0; j < Controls.Count; j++)
@@ -66,23 +64,20 @@ namespace UAS_KanBan
 
         private void Process_SizeChanged(object sender, EventArgs e)
         {
-            asc.controlAutoSize(this);
-            Line1.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
-            Line2.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
-            Line3.Size = new Size(2, BottomLine.Location.Y - TopLine.Location.Y);
+            asc.AutoSize(this);
             Title.Location = new Point(Line1.Location.X + (Line2.Location.X - Line1.Location.X - Title.Size.Width) / 2, TopLine.Location.Y + (BottomLine.Location.Y - TopLine.Location.Y - Title.Size.Height) / 2);
             Title2.Location = new Point(Title.Location.X, Title2.Location.Y);
-            Logo.Size = new Size(Line1.Location.X - 20, BottomLine.Location.Y - TopLine.Location.Y - 20);
             WorkShift_label.Location = new Point(Line2.Location.X + (Line3.Location.X - Line2.Location.X - WorkShift_label.Size.Width) / 2, MidLine.Location.Y + (BottomLine.Location.Y - MidLine.Location.Y - WorkShift_label.Size.Height) / 2);
             LineCode_label.Location = new Point(Line2.Location.X + (Line3.Location.X - Line2.Location.X - LineCode_label.Size.Width) / 2, TopLine.Location.Y + (MidLine.Location.Y - TopLine.Location.Y - LineCode_label.Size.Height) / 2);
             Line.Location = new Point(Line.Location.X, TopLine.Location.Y + (MidLine.Location.Y - TopLine.Location.Y - LineCode_label.Size.Height) / 2);
             班制.Location = new Point(班制.Location.X, MidLine.Location.Y + (BottomLine.Location.Y - MidLine.Location.Y - WorkShift_label.Size.Height) / 2);
-            机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 20, 机型_label.Location.Y-10);
-            投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 20, 投入_label.Location.Y-10);
-            产出.Location = new Point(产出_label.Location.X + 机型_label.Width + 20, 产出_label.Location.Y-10);
-            直通率.Location = new Point(直通率_label.Location.X + 直通率_label.Width + 20, 直通率_label.Location.Y-10);
-            收益率.Location = new Point(收益率_label.Location.X + 收益率_label.Width + 20, 收益率_label.Location.Y-10);
-            故障数.Location = new Point(故障数_label.Location.X + 故障数_label.Width + 20, 故障数_label.Location.Y-10);
+            Logo.Size = new Size(Line1.Location.X - 20, BottomLine.Location.Y - TopLine.Location.Y - 20);
+            //机型.Location = new Point(机型_label.Location.X + 机型_label.Width + 30, 机型_label.Location.Y);
+            //投入.Location = new Point(投入_label.Location.X + 机型_label.Width + 30, 投入_label.Location.Y);
+            //产出.Location = new Point(产出_label.Location.X + 机型_label.Width + 30, 产出_label.Location.Y);
+            //直通率.Location = new Point(直通率_label.Location.X + 直通率_label.Width + 30, 直通率_label.Location.Y);
+            //收益率.Location = new Point(收益率_label.Location.X + 收益率_label.Width + 30, 收益率_label.Location.Y);
+            //故障数.Location = new Point(故障数_label.Location.X + 故障数_label.Width + 30, 故障数_label.Location.Y);
         }
 
         private void Process_FormClosing(object sender, FormClosingEventArgs e)
@@ -94,9 +89,6 @@ namespace UAS_KanBan
         {
             if (e.KeyCode == Keys.Escape)
             {
-                Hide();
-                Setting set = new Setting();
-                set.ShowDialog();
                 Close();
             }
         }

UAS_KanBan/Program.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Security.Principal;
 using System.Windows.Forms;
 
 namespace UAS_KanBan
@@ -11,9 +12,23 @@ namespace UAS_KanBan
         [STAThread]
         static void Main()
         {
+            WindowsIdentity identity = WindowsIdentity.GetCurrent();
+            WindowsPrincipal principal = new WindowsPrincipal(identity);
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
-            Application.Run(new Setting());
+            if (principal.IsInRole(WindowsBuiltInRole.Administrator))
+                Application.Run(new Setting());
+            else
+            {
+                //创建启动对象
+                System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
+                // 设置运行文件
+                startInfo.FileName = Application.ExecutablePath;
+                //设置启动动作,确保以管理员身份运行
+                startInfo.Verb = "runas";
+                //如果不是管理员，则启动UAC
+                System.Diagnostics.Process.Start(startInfo);
+            }
         }
     }
 }

UAS_KanBan/Properties/Resources.Designer.cs

@@ -70,6 +70,16 @@ namespace UAS_KanBan.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap lo3 {
+            get {
+                object obj = ResourceManager.GetObject("lo3", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>

UAS_KanBan/Properties/Resources.resx

@@ -127,4 +127,7 @@
   <data name="U_Icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\U_Icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="lo3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\lo3.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

UAS_KanBan/Setting.Designer.cs

@@ -29,6 +29,7 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Setting));
             this.WorkCenter_Label = new CCWin.SkinControl.SkinLabel();
             this.Line_Label = new CCWin.SkinControl.SkinLabel();
             this.Span_Label = new CCWin.SkinControl.SkinLabel();
@@ -201,7 +202,8 @@
             this.TimeSpan.IconMouseState = CCWin.SkinClass.ControlState.Normal;
             this.TimeSpan.IsPasswordChat = '\0';
             this.TimeSpan.IsSystemPasswordChar = false;
-            this.TimeSpan.Lines = new string[0];
+            this.TimeSpan.Lines = new string[] {
+        "5"};
             this.TimeSpan.Location = new System.Drawing.Point(103, 164);
             this.TimeSpan.Margin = new System.Windows.Forms.Padding(0);
             this.TimeSpan.MaxLength = 32767;
@@ -225,9 +227,11 @@
             this.TimeSpan.SkinTxt.Name = "BaseText";
             this.TimeSpan.SkinTxt.Size = new System.Drawing.Size(115, 18);
             this.TimeSpan.SkinTxt.TabIndex = 0;
+            this.TimeSpan.SkinTxt.Text = "5";
             this.TimeSpan.SkinTxt.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
             this.TimeSpan.SkinTxt.WaterText = "";
             this.TimeSpan.TabIndex = 13;
+            this.TimeSpan.Text = "5";
             this.TimeSpan.TextAlign = System.Windows.Forms.HorizontalAlignment.Left;
             this.TimeSpan.WaterColor = System.Drawing.Color.FromArgb(((int)(((byte)(127)))), ((int)(((byte)(127)))), ((int)(((byte)(127)))));
             this.TimeSpan.WaterText = "";
@@ -277,8 +281,6 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.SystemColors.Menu;
             this.ClientSize = new System.Drawing.Size(677, 401);
-            this.ControlBoxActive = System.Drawing.Color.DeepSkyBlue;
-            this.ControlBoxDeactive = System.Drawing.Color.DeepSkyBlue;
             this.Controls.Add(this.Start);
             this.Controls.Add(this.MasterCombo);
             this.Controls.Add(this.MasterCombo_Label);
@@ -294,6 +296,7 @@
             this.Controls.Add(this.Span_Label);
             this.Controls.Add(this.Line_Label);
             this.Controls.Add(this.WorkCenter_Label);
+            this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;
             this.Name = "Setting";
             this.Text = "看板设置";

UAS_KanBan/Setting.cs

@@ -31,7 +31,7 @@ namespace UAS_KanBan
         {
             MasterCombo.DisplayMember = "ma_user";
             MasterCombo.ValueMember = "ma_user";
-            dt =(DataTable) dh.ExecuteSql("select ms_pwd,ma_user,ma_address from master", "select");
+            dt = (DataTable)dh.ExecuteSql("select ms_pwd,ma_user,ma_address from master", "select");
             MasterCombo.DataSource = dt;
             MasterCombo.Text = Properties.Settings.Default.Master;
             WorkCenter.Text = Properties.Settings.Default.WorkCenter;
@@ -49,22 +49,20 @@ namespace UAS_KanBan
                 MessageBox.Show("刷新时间必须是正整数");
                 return;
             }
-            Hide();
             Properties.Settings.Default.Master = MasterCombo.Text;
             Properties.Settings.Default.LineCode = Line.Text;
             Properties.Settings.Default.WorkCenter = WorkCenter.Text;
             Properties.Settings.Default.TimeSpan = TimeSpan.Text;
             Properties.Settings.Default.Save();
-            Process pr = new Process(Line.SelectedValue.ToString(),WorkCenter.SelectedValue.ToString());
+            Process pr = new Process(Line.SelectedValue.ToString(), WorkCenter.SelectedValue.ToString());
             pr.ShowDialog();
-            Close();
         }
 
         private void WorkCenter_SelectedIndexChanged(object sender, EventArgs e)
         {
             Line.DisplayMember = "li_name";
             Line.ValueMember = "li_code";
-            Line.DataSource = dh.ExecuteSql("select li_code,li_name from line where li_wccode='"+WorkCenter.SelectedValue.ToString()+"'", "select");
+            Line.DataSource = dh.ExecuteSql("select li_code,li_name from line where li_wccode='" + WorkCenter.SelectedValue.ToString() + "' order by li_code ", "select");
             Line.Text = Properties.Settings.Default.LineCode;
         }
 

UAS_KanBan/Setting.resx

@@ -117,4 +117,171 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAEAMDAAAAEAIACoJQAAFgAAACgAAAAwAAAAYAAAAAEAIAAAAAAAACQAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAgQGAAAAAAUAAAAOAAAADwAAAAkAAAAEAAAAAgAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgMEBx0NFB9TBAgMWgAAAEYAAAAzAAAAJQAA
+        ABkAAAAQAAAACQAAAAUAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABSc8W09HbqfZQWSZ4TRR
+        e8goPl+uGSg+kA4WInUDBQhcAAAARwAAADUAAAAmAAAAGgAAABAAAAAJAAAABQAAAAIAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACj5f
+        jnpbic7+XIzS/1yN1P9ZiM7/VIHC+kx1sPBDZprgOFaAyylAYLAbK0KUDhckdwQIDV4AAABHAAAANgAA
+        ACcAAAAbAAAAEQAAAAoAAAAFAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAbKj4AAAAAE0lto55ejNH/XYzQ/1+O1f9hkdr/YZLa/2GS2v9klNr/ZpTY/2SR0v9ch8X7S3Wy8kBl
+        muE1VIDLKEBishwtRZYPGCd6BQgOYAAAAEoAAAA2AAAAJwAAABwAAAASAAAACwAAAAUAAAACAAAAAQAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAABBwsQIlV9ucFfjM//YZDW/2KSyP92p8P/dqTQ/3Ce2P9ql9v/Y5La/1+P
+        2P9djtf/W43X/1qM1f9Zi9P/VobM/1F/wvxJc7DyQGad4zVUgs0oQWWzGyxFlxAbKnwGChFiAAAASwAA
+        ADgAAAAoAAAAHAAAABIAAAALAAAABgAAAAIAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACHy5DOFyHxtxgjc//ZZPb/1uYov9ZqF3/Zq5v/2+x
+        gv92spn/fLGv/3qqwP92o83/b5zV/2eV1/9hj9f/XIvV/1mJ0v9XiM//V4fP/1WFzP9Sgsf/Tnu9/Ehy
+        sPM/ZJvlNVWE0ClCZ7UcLkiZEBoqfAYKEWMAAABNAAAAOgAAACoAAAAdAAAAEwAAAAsAAAAGAAAAAwAA
+        AAEAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEM0psU2SQ0fBhjc3/Z5bZ/12g
+        jf9XqFf/WKhY/1eoV/9YqFf/Wqpa/1+sYv9nr3D/cLGD/3izmf99srD/fa3D/3mm0f9wndf/aJbZ/2CQ
+        2P9cjdb/WYvW/1mL1v9ZjNb/WIvV/1WHz/9Qgcb8SXe39EBrpOU1XIzRKUluuRwzTpsQHS6ABQoRZAAA
+        AE4AAAA6AAAAKwAAAB4AAAAVAAAAGAAAABcAAAAJAQMGAAAAAAAAAAAAAAAAAAAAAAAAAAAJQmCKdmeV
+        1vtjjs3/a5rX/1ujev9aqln/Wqlb/1qpW/9aqVv/Wala/1mpWf9YqFj/V6hX/1ioV/9aqlr/YK1i/2ev
+        cP9xsoP/ebOZ/32yr/9+rcP/eabQ/3Ge2P9dicj/WIbK/1aGzf9WiNH/V4zW/1qR3P9cld7/WpLZ/1WM
+        z/1Oe7n1Rmui5zlZiNIuSG26HjFNnxIeLoIHDBNqBxIicA0iQ3UAAQUrAAAABQAAAAAAAAAAAAAAAAgN
+        EwAAAAASUnWnm2qY2P9lktH/ap3L/1ynbP9cq1z/XKpd/1yqXf9bqlz/W6pc/1mpWv9ZqVr/Wqlb/1qp
+        W/9ZqVr/WahZ/1ioWP9XqFf/WKhX/1uqW/9grGL/Z7Bv/5zGrf+xvsv/lKnA/4KjxP90ncr/bJrR/2aW
+        2P9iktr/YJDa/1+Q2v9fkNn/X5DZ/16P1f9ais//VILF/U95uPY1XJboLVia6z9rre4rPVh3AAAAGAME
+        BAIAAAAAAAAAAAAAAAAKDhQhXIO5vmya2f9pldX/bKG//1ypYv9eq1//Xqtf/16rX/9dq17/YK1h/5jK
+        mf+Dv4T/W6pc/1mpWv9aqVv/W6pc/1qpW/9aqVv/Wqlb/1ioWf9Wp1f/VadW/22ybf+dyp3/u9a6/8TV
+        xv+4yL//ormy/4ytqf98qq3/eay9/3WkzP9tm9T/X4zM/1SAwv9Rf8L/UIDH/0d5wv9HeMP/Yo/V/4Go
+        4P9xjLHUGR4lSgAAAA0AAAAAAAAAAAAAAAIgLT41ZpDK226b2v9tmdf/aaSq/1+sYf9grWH/YKxh/1+s
+        YP9eq1//a7Js/8rlyv/B4ML/msyb/4rEi/9vtXD/Xqxf/1uqXP9aqVv/W6pc/3m6ev+UyZT/iMKJ/5HH
+        kf+Pxo//cbZy/2+1cP+Lw4z/q9Gr/77Vvf+DuIL/XKte/2Kraf9clWv/WIhw/16Khf9agqv/SXe7/1eG
+        y/92n93/j7Pl/5q65/+atdv+a36YoQADCiEAAAAAAAAAAAAAAAQ4T21TbZjT73Gd2v9wnNj/aKiX/2Cu
+        YP9ir2P/Ya9i/2GuYv9grmH/a7Nr/7fbt/+EwIX/n8+g/6/YsP/J5cr/r9ew/6/WsP+hz6L/k8iT/8jk
+        yP+t1q3/pdKl/53Onf+43Ln/wODA/57Nnv9lr2b/WKlZ/2OvZP9grWH/Wala/0+YT/84bzf/O3JB/0d6
+        ef9XhLv/bJfX/4et4/+au+n/o8Hr/6rF6f+gvuj/c5vV2jhXgzEAAAAAAAAAAAAAAAlKZoxydJ/b/HKe
+        2v9zn9X/Z6uF/2OwY/9jsGT/Y7Bk/2OwZP9ir2P/aLJp/8PixP+DwYT/Xq1f/2WwZv+KxIv/m82c/7DX
+        sf+/37//ut26/7HYsf9osWn/Xate/16rX/9nsGj/h8KI/8rlyv/A38D/drh3/1uqXP9bqlz/W6pc/0iI
+        Sf88aVP/Un2a/2iSzv+Ap+D/l7no/6LB6/+pxer/rsns/5i66P91n9rXXorJYDtZggoAAAAAAAAAAAAA
+        ABFZeaaYeaTf/3Wf2/91os7/Zq12/2WxZv9lsWb/ZbFm/2SwZv9ksGX/ZrJn/77fvv+KxIr/Ya9i/2Kv
+        Y/9hr2L/Ya9i/1+tYP+Hwoj/qtWq/7/fwP90t3T/Xqxf/1+sYP9frGD/Xate/2myav+x2LL/stiy/16r
+        X/9dq13/Xqll/1aIgf9ljbz/faTd/5Cz5f+cvOf/ob7m/6vE5/+qxer/j7Pl/2+Y0dRObpo4////AF2K
+        xwAAAAAAAAAAAAMFBh9lh7i6gKnj/3mi3v91psL/Z7Bu/2iyaf9osmn/Z7Jp/2exaP9msWf/abNr/8Ti
+        xP+Iw4n/Y7Bk/2SwZf9ksGX/Y7Bk/2GvYv+SyJL/ptOn/8DgwP96vHv/YK5h/2GuYv9hrmL/YK1h/16r
+        X/+EwIT/o9Cj/12rXv9erF7/bqyM/36k1/+CqeD/krXj/5285f+nw+j/ssvt/6jF7P+Os+X/c5/e/1R+
+        u6EAAAAKBgwUAAAAAAAAAAAAAAAAASQwQTRulMfZg6zk/3uj3v90qbH/Z7Jq/2qza/9qs2v/abJq/2my
+        av9osmn/bbVu/8fjx/+KxIv/ZbBm/2axaP9msWf/ZbFn/2SwZf+i0aL/ptOn/8TixP95vHr/Yq9j/2Ow
+        ZP9isGP/Yq9j/2CuYf9/voD/n86f/1+tYP9grWH/Zq5w/423yf+buuf/pMLp/7PN7/+40PL/p8Xs/4et
+        4/9vnNz/a5ja/0txqnkAAAAEAAAAAAAAAAAAAAAAAAAABDxPak93ndLugani/4Co4v9xrZ7/arRr/2u0
+        bf9rtGz/arNs/2qzbP9qs2v/cLdy/8vlzP+TyJT/Z7Fo/2iyaf9osmn/aLJp/2exaP+p1ar/rteu/8nl
+        yf93unj/Y7Bk/2SwZf9ksGX/ZLBl/2KvY/+Wy5f/otCi/2CuYf9ir2P/Ya9h/3m3i/+wzeb/vNPz/7vT
+        8/+jx9b/frC7/2iX2f9rmdz/bJjY9kVnmFYAAAAAAAAAAAAAAAAAAAAAAAAACFFqjXF8otj6gqni/4Kr
+        3/9wsI3/bLVs/2y2bv9stW7/bLVu/2u1bf9rtG3/bLVu/6jUqv/U69X/l8uY/2+1cP9osmn/abJq/2iy
+        af+Bv4L/ud26/9Lp0v+MxY3/d7p4/3G3c/9lsWf/ZbBm/2WxZv+l06b/m82b/2KvY/9ksGX/Y7Bk/2Sw
+        Zv+byLL/v9bu/5rGvf9utHj/ZaOf/2iV2f9pmNr/ZZHS5DZRdjX///8AAAAAAAAAAAAJDA8AAAAAEGF9
+        pZSCqN7/hKvk/4Ot1/9usn//brdw/262cf9utnD/brZw/222b/9ttm//bbZv/6PSpf+n1Kj/x+TI/8Dg
+        wf+Qx5H/dLl2/221bv95vHv/rNet/93v3v/q9er/3e/d/9Xr1f+u1q//e7x8/2axaP+dzp7/nM6d/2Wx
+        Z/9msWf/ZbFn/2SwZf9ttHL/fruM/2iya/9hrmX/aqG2/2eU2P9pl9n/YYzKySMzShxxpfEAAAAAAAAA
+        AAAAAAAAAwMFHG+PuriEq+D/h67m/4Gvyv9utXf/cbhz/3C3c/9wt3P/b7dy/2+3cv9vt3H/bbZw/5XL
+        l/+i0aP/drt4/53Onv+/4MD/xePG/7/gwP/I5Mj/xuPH/9zv3f+43Ln/tNu1/6/Xr//J5cn/1evV/6vV
+        rP+LxYz/qNSp/2uzbP9osmn/aLJp/2eyaf9msWf/ZbFm/2axZv9krm//baDI/2iV1v9qmNn/XIW/pAAA
+        AA0iMUgAAAAAAAAAAAAAAAACIis5MXucy9aHruH/irLo/36xt/9wtnP/c7h1/3O4df9yuHT/crh0/3G4
+        dP9xt3P/b7Zx/5DIkv+73rz/crh0/2y1b/9xuHT/hMKG/47Gj/+g0KL/4vLj/9bs1/95vHv/a7Vt/2u1
+        bf92u3j/mc2a/8/oz//Q6ND/n8+g/2u0bf9qs2v/arNr/2myav9psmr/abJq/2iyaP9orX7/cJ/U/2mV
+        1P9rmNj/V32xfgAAAAQAAAAAAAAAAAAAAAAAAAAEQVJqTIKl1eyIsOP/jLXp/3qzpP9zuXT/dbp3/3S5
+        dv90uXb/dLl2/3O4df9zuHX/cbdz/5bLl/+43Ln/crh0/3G3c/9wt3P/b7Zx/222cP96vX3/0OnR/9Pq
+        0/+Ewob/bLVu/222b/9stW7/a7Vt/3W6d/+y2rP/vN69/222b/9rtG3/a7Rt/2q0bP9qs2z/arNs/2qz
+        af9qqo7/cZ/b/2qV0v9smdb3TG2ZVgAAAAEAAAAAAAAAAAAAAAAAAAAJV22MbYir2/qLtOX/j7jo/3Wz
+        kP92u3f/d7t5/3a7eP92unj/drp4/3W6d/91uXf/c7h1/5bLmP+l0qb/crh0/3O4df9zuHX/crh0/3G3
+        c/+BwIP/0+rU/9Xr1f+Mxo7/brZx/2+3cv9vt3H/brZx/2y1bv+Fwof/rtiw/263cP9stW7/bLVu/2y1
+        bv9stW7/a7Vt/2m0a/9uqKL/cp7b/2yW0f9rltHmQVyAOP///wAAAAAAAAAAAAAAAAAAAAARa4aqkIyu
+        3v+Ot+f/jbnd/3W2hf94vHr/eLx6/3i8ev94vHr/d7t5/3e7ef93u3n/dbp3/5TKlv+u16//dbp3/3W5
+        d/91uXf/dLl2/3O4df+FwYf/0+rU/9fs2P+Ox5D/cLdz/3G4dP9xt3P/cLdz/2+3cv+DwYb/rdau/3C3
+        c/9utnH/brZw/262cP9ttm//bbZv/2y0cP9xprX/dJ7c/26Y0v9rlM3LJzdMHnen6QAAAAAAAAAAAAAA
+        AAABAgMgeZa9s5Cy4f+Ruen/i7nQ/3W4ff97vn3/er19/3q9fP95vHv/ebx7/3m8e/94vHr/drt4/5nM
+        mv/M583/gsGE/3W6d/92u3j/drp4/3W6d/+EwYX/1OvV/97v3v+KxIz/crh0/3O4df9zuHX/c7h1/3G3
+        c/+azZz/stmz/3C3c/9wt3P/cLdz/2+3cv9vt3L/b7dx/22zd/92pcb/dqDc/3Ga1P9njcKoAAAADREX
+        HwAAAAAAAAAAAAAAAAAkLDc1iKbR05O14/+VuOj/g7K4/3Gwdf94t3v/erp9/3u8fv97vX//e75+/3u9
+        fv96vX3/ebx7/4bDiP/H5Mf/0OjQ/5XLl/99v3//drt4/3a7eP97vn3/y+fM/+Tz5f+ez5//g8GF/3+/
+        gf92unj/dLl2/3O4df+o1ar/rNau/3G3dP9zuHX/crh1/3K4dP9xuHT/cbhy/3CyhP94pNL/d6Hd/3We
+        2P9ihbaAAAAABAQGCQAAAAAAAAAAAAAAAABCUWVTkbHb6Za35P+Yuej/eKie/2efZ/9tpG7/b6dx/3Gr
+        c/9zr3X/drN4/3i3e/96un3/e7x+/3q9fv+Ewof/vN++/8rmy//E48X/ntCf/6rWrP+q1az/4vHi/9jt
+        2f/M583/x+TI/8fkyP+02rX/icWL/3S6dv+azpz/rNet/3a6eP90uXb/dLl2/3S5dv90uXb/crhz/3Ox
+        lf97pdv/eaTe/3We1vZXdaBaAAAAAQAAAAAAAAAAAAAAAAAAAABhdZF2mbnk+Jq65v+WtuL/dqCo/2CN
+        cv9gj2r/YpNm/2WZZ/9onWn/a6Fs/22kbv9vp3D/capz/3Oudf91snj/eLd7/43Ej/+22rj/u9+9/63X
+        r/+y2rT/pNKm/4LBhP+AwIL/g8GF/4vGjP+j0qT/ut67/6HRo/+QyJL/tNu2/3y+fv92u3j/drt4/3a6
+        eP91unf/dLl1/3avpf99pN3/fajg/3ed1OhIYII5////AAAAAAAAAAAAAAAAAAAAAAB7k7WYm7rm/5i3
+        4f+ZuOT/m7vn/5O03P+Jq8v/fqK3/3KXn/9qkon/Y452/2KQbP9ik2b/ZZln/2ieaf9roWv/bKRu/22m
+        b/9vqnH/dK92/3Syd/92tnn/eLl7/3q8ff97vX7/er1+/3q9ff95vHv/f8CC/6HQo//A4cL/n9Ch/3u9
+        ff94vHr/eLx6/3e7ef93u3n/c7l2/3yuuf9+pd3/f6zj/3SYy841Rl4hmsv/AAAAAAAAAAAAAAAAAAAA
+        AACTrdCPp8Lm9qjE6/+pxu3/pMPs/6XD7P+kw+3/o8Lt/6HB7P+cvOf/lbbe/4uszf9/orn/dJih/2qQ
+        iv9ljnn/Yo9t/2OUaP9lmGb/aJ1p/2qha/9spG7/bqZw/3Cqcv9zrnX/dbJ4/3e2ev95uXz/ert+/3q8
+        ff+Typb/lsyY/3y+f/96vXz/erx8/3m8e/95vHv/drl+/3+syP+Ap93/ga/l/2+SwawDBAYOICs6AAAA
+        AAAAAAAAAAAAAAAAAACTqccaqsHgTLHI5nW0y+qhs8vsxbLL7eKuye72q8bt/6bH7/+kyPD/osbw/6DE
+        8P+cwO7/l7nn/5Gy3v+KqtH/h6fK/3+huv92mqb/bJKN/2aPfP9jkG//Y5No/2aZZ/9nnGj/aqFr/2yj
+        bf9upnD/cKly/3KtdP90sXf/d7Z6/3m5ff96vH7/e71+/3u+fv97vn3/draH/4Wt1/+Cqt7/hLHm/2mH
+        soUAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAACiudsAwtv9AP///wAdM04DjqK8EKG41ieswt9IrsXlcrDK
+        6pyvzO7Frsvw4avK7/Wnxu3/o8Ps/57A6/+cven/m7zq/5q86v+Zuun/lrfl/5Gy3v+Jqc7/gKK9/3SY
+        pf9skpD/ZY98/2KPb/9jk2j/ZJdm/2idaf9qoGv/bKNt/26mcP9wqXL/cq10/3Wxd/92tXj/d7KV/4eu
+        3f+Erd//hrLl+WB8olwAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADQ/TQBNWmsAg5u6AKfA
+        4wDM4v8A8f//ACk4UwOOoLwPobTTKKvA30WuxeRur8jpma/I6sCsx+vgqcXq9KLA5/+du+T/mLji/5S1
+        4P+Ts+D/k7Pg/5O04v+Ss+H/jq/b/4anzP98nrn/cpaj/2iPjP9jjHr/YI1u/2GSaP9klmb/Z5xo/2qg
+        av9qomn/d6mh/4yw5P+IruH/hqzf6FFnhzz///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAEhccAHOKqQCTqcgApb3gAL3W+QD///8AAAAAAYadvQ+httUjp77dRq3F
+        5GyuxuaVrsjqvazH6tyoxevzpMLq/p6+6P+bu+f/mbrn/5e55/+Xuej/lrjo/5S25f+OsNz/h6vS/3yh
+        vP9ymKf/aZGQ/2GMev9gkXH/e6i2/46y5v+MsOL/hafY0TZFWSG87f8AAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAASVZsAIeh
+        xgCqwuMAvNT3AOb//wAAAAABhpu0DJqz0SKnv91BqsPjaq3G6JWtxum8rMfr2qjF6/Kjwuv+pMLs/6nG
+        7f+oxe3/pMPt/56/7P+Zu+v/lbjn/46y4P+GrNP/iq3a/46y4/+OsuP/fp/MrxAVGxFFV3EAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAADA6SAA/S1kAeZGwAJq43ADA2foA4Pv/AAAAAAGCmLYMnLLPH6O7
+        3D+qwuJlrMXnkq/I6rityOvbq8bs76XD6/2gv+r/nLzq/5e56f+Wuen/krXl/42w3v+QteX/eZfAiAAA
+        AAYEBQcAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGh/
+        nwCKosIAoLjZALPO9ADq//8A////AHqSsguZsNEepbzbO6nC4mGrxOaNqsXptqnE6telw+rwosDr/Jq6
+        5f+Ss+D7c4+0WgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALDZEAH2YvQChut4At8/vANDt/wAAAAAAdYihCJSt
+        zh6juto6p7/hYKzF54mduN6ScIuuHv///wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABsh
+        KgA9SlsAaHyZAJCt1AC20PMA1O7/AP///wBQaIQD////AIGdyAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGF3lAB3krUAMj5MAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///////8AAP///////wAA////////
+        AADgH/////8AAOAB/////wAA4AAH////AADAAAAf//8AAMAAAAP//wAAwAAAAA//AADAAAAAAD8AAMAA
+        AAAAAAAAwAAAAAAAAACAAAAAAAAAAIAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAA
+        AAAAAQAAAAAAAAABAAAAAAAAAAEAAAAAAAAAAwAAAAAAAAADAAAAAAAAAAMAAAAAAAAAAwAAAAAAAAAD
+        AAAAAAAAAAcAAAAAAAAABwAAAAAAAAAHAAAAAAAAAAcAAAAAAAAABwAAAAAAAAAHAADwAAAAAA8AAP+A
+        AAAADwAA//gAAAAPAAD//+AAAA8AAP///wAAHwAA////+AAfAAD/////wB8AAP///////wAA////////
+        AAA=
+</value>
+  </data>
 </root>

UAS_KanBan/UAS_KanBan.csproj

@@ -30,8 +30,7 @@
     <SuiteName>UAS看板</SuiteName>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <OpenBrowserOnPublish>false</OpenBrowserOnPublish>
-    <ApplicationRevision>9</ApplicationRevision>
+    <ApplicationRevision>12</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -81,6 +80,7 @@
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Web.Mvc, Version=4.0.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -92,6 +92,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="AutoSizeControl.cs" />
     <Compile Include="AutoSizeFormClass.cs" />
     <Compile Include="BaseForm.cs">
       <SubType>Form</SubType>
@@ -160,6 +161,9 @@
   <ItemGroup>
     <None Include="Resources\U_Icon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\lo3.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

UAS_XmlAnalysor/App.config

@@ -11,7 +11,7 @@
     <userSettings>
         <UAS_XmlAnalysor.Properties.Settings>
             <setting name="MES" serializeAs="String">
-                <value>Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</value>
+                <value>Data Source=117.25.180.218/orcl;User ID=MES;PassWord=select!#%*(</value>
             </setting>
             <setting name="FolderPath" serializeAs="String">
                 <value />

UAS_XmlAnalysor/Form1.cs

@@ -38,6 +38,7 @@ namespace UAS_XmlAnalysor
                 if (Master.Text == dt.Rows[i]["ma_user"].ToString())
                 {
                     DataHelper.DBConnectionString = "Data Source=" + dt.Rows[i]["ma_address"] + ";User ID=" + dt.Rows[i]["ma_user"] + ";PassWord=" + dt.Rows[i]["ms_pwd"]; ;
+                    Console.WriteLine(DataHelper.DBConnectionString);
                     dh = new DataHelper();
                 }
             }

UAS_XmlAnalysor/Login.cs

@@ -1,32 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Windows.Forms;
-
-namespace UAS_XmlAnalysor
-{
-    public partial class Login : Form
-    {
-        public Login()
-        {
-            InitializeComponent();
-        }
-
-        private void LoginButton_Click(object sender, EventArgs e)
-        {
-            string ErrorMessage = "";
-            if (LogicHandler.CheckUserLogin(UserName.Text, PassWord.Text, out ErrorMessage))
-            {
-
-            }
-            else
-            {
-                MessageBox.Show(ErrorMessage);
-            }
-        }
-    }
-}

UAS_XmlAnalysor/Login.resx

@@ -1,120 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

UAS_XmlAnalysor/Program.cs

@@ -2,6 +2,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Security.Principal;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -15,10 +16,30 @@ namespace UAS_XmlAnalysor
         [STAThread]
         static void Main()
         {
-            Application.EnableVisualStyles();
-            Application.SetCompatibleTextRenderingDefault(false);
-            SetAutoRun(Application.StartupPath+@"\"+ "UAS_XML解析器.exe", true);
-            Application.Run(new Form1());
+            try
+            {
+                WindowsIdentity identity = WindowsIdentity.GetCurrent();
+                WindowsPrincipal principal = new WindowsPrincipal(identity);
+                Application.EnableVisualStyles();
+                Application.SetCompatibleTextRenderingDefault(false);
+                if (principal.IsInRole(WindowsBuiltInRole.Administrator))
+                    Application.Run(new Form1());
+                else
+                {
+                    //创建启动对象
+                    System.Diagnostics.ProcessStartInfo startInfo = new System.Diagnostics.ProcessStartInfo();
+                    // 设置运行文件
+                    startInfo.FileName = Application.ExecutablePath;
+                    //设置启动动作,确保以管理员身份运行
+                    startInfo.Verb = "runas";
+                    //如果不是管理员，则启动UAC
+                    System.Diagnostics.Process.Start(startInfo);
+                }
+            }
+            catch (Exception)
+            {
+
+            }
         }
 
         public static void SetAutoRun(string fileName, bool isAutoRun)
@@ -46,7 +67,6 @@ namespace UAS_XmlAnalysor
                 if (reg != null)
                     reg.Close();
             }
-
         }
     }
 }

UAS_XmlAnalysor/Properties/Settings.Designer.cs

@@ -25,9 +25,7 @@ namespace UAS_XmlAnalysor.Properties {
         
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_" +
-            "LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SER" +
-            "VER=DEDICATED)(SERVICE_NAME=orcl)));")]
+        [global::System.Configuration.DefaultSettingValueAttribute("Data Source=117.25.180.218/orcl;User ID=MES;PassWord=select!#%*(")]
         public string MES {
             get {
                 return ((string)(this["MES"]));

UAS_XmlAnalysor/Properties/Settings.settings

@@ -3,7 +3,7 @@
   <Profiles />
   <Settings>
     <Setting Name="MES" Type="System.String" Scope="User">
-      <Value Profile="(Default)">Password=select!#%*(;User ID=MES;Pooling=false;Data Source=(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST=117.25.180.218)(PORT=1521)))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=orcl)));</Value>
+      <Value Profile="(Default)">Data Source=117.25.180.218/orcl;User ID=MES;PassWord=select!#%*(</Value>
     </Setting>
     <Setting Name="FolderPath" Type="System.String" Scope="User">
       <Value Profile="(Default)" />

UAS_XmlAnalysor/UAS_XmlAnalysor.csproj

@@ -22,15 +22,16 @@
     <UpdateInterval>7</UpdateInterval>
     <UpdateIntervalUnits>Days</UpdateIntervalUnits>
     <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
+    <UpdateRequired>true</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
     <InstallUrl>http://218.17.158.219:8888/Xml/</InstallUrl>
     <ProductName>UAS_XML解析器</ProductName>
     <PublisherName>深圳市优软科技有限公司</PublisherName>
     <SuiteName>UAS_XML解析器</SuiteName>
+    <MinimumRequiredVersion>1.0.0.5</MinimumRequiredVersion>
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>publish.htm</WebPage>
-    <ApplicationRevision>4</ApplicationRevision>
+    <ApplicationRevision>8</ApplicationRevision>
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -96,20 +97,11 @@
       <DependentUpon>Form1.cs</DependentUpon>
     </Compile>
     <Compile Include="LogicHandler.cs" />
-    <Compile Include="Login.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Login.Designer.cs">
-      <DependentUpon>Login.cs</DependentUpon>
-    </Compile>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <EmbeddedResource Include="Form1.resx">
       <DependentUpon>Form1.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Login.resx">
-      <DependentUpon>Login.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>