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

UAS_KanBan/Process.Designer.cs

@@ -223,7 +223,7 @@
             this.收益率_label.BackColor = System.Drawing.Color.Transparent;
             this.收益率_label.BorderColor = System.Drawing.Color.White;
             this.收益率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
-            this.收益率_label.Location = new System.Drawing.Point(803, 491);
+            this.收益率_label.Location = new System.Drawing.Point(829, 491);
             this.收益率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率_label.Name = "收益率_label";
             this.收益率_label.Size = new System.Drawing.Size(290, 84);
@@ -239,7 +239,7 @@
             this.故障数_label.BackColor = System.Drawing.Color.Transparent;
             this.故障数_label.BorderColor = System.Drawing.Color.White;
             this.故障数_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
-            this.故障数_label.Location = new System.Drawing.Point(803, 648);
+            this.故障数_label.Location = new System.Drawing.Point(829, 648);
             this.故障数_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数_label.Name = "故障数_label";
             this.故障数_label.Size = new System.Drawing.Size(290, 84);
@@ -255,7 +255,7 @@
             this.直通率_label.BackColor = System.Drawing.Color.Transparent;
             this.直通率_label.BorderColor = System.Drawing.Color.White;
             this.直通率_label.Font = new System.Drawing.Font("宋体", 50F, System.Drawing.FontStyle.Bold);
-            this.直通率_label.Location = new System.Drawing.Point(803, 331);
+            this.直通率_label.Location = new System.Drawing.Point(829, 331);
             this.直通率_label.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率_label.Name = "直通率_label";
             this.直通率_label.Size = new System.Drawing.Size(460, 84);
@@ -348,7 +348,7 @@
             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(1149, 491);
+            this.收益率.Location = new System.Drawing.Point(1175, 491);
             this.收益率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.收益率.Name = "收益率";
             this.收益率.Size = new System.Drawing.Size(0, 87);
@@ -365,7 +365,7 @@
             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(1149, 648);
+            this.故障数.Location = new System.Drawing.Point(1175, 648);
             this.故障数.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.故障数.Name = "故障数";
             this.故障数.Size = new System.Drawing.Size(0, 87);
@@ -382,7 +382,7 @@
             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(1149, 331);
+            this.直通率.Location = new System.Drawing.Point(1175, 331);
             this.直通率.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.直通率.Name = "直通率";
             this.直通率.Size = new System.Drawing.Size(0, 87);
@@ -501,7 +501,7 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.Black;
-            this.ClientSize = new System.Drawing.Size(1313, 859);
+            this.ClientSize = new System.Drawing.Size(1292, 859);
             this.Controls.Add(this.wccode);
             this.Controls.Add(this.Dash);
             this.Controls.Add(this.产出);

UAS_KanBan/Process.cs

@@ -26,7 +26,7 @@ namespace UAS_KanBan
                     if (Controls[i] is Label || Controls[i] is ValueLabel)
                     {
                         if (Controls[i].Tag != null && Controls[i].Tag.ToString() == "AutoFont")
-                            Controls[i].Font = new Font("宋体", Controls[i].Font.Size - 10, FontStyle.Bold);
+                            Controls[i].Font = new Font("宋体", Controls[i].Font.Size - 15, FontStyle.Bold);
                         else
                             Controls[i].Font = new Font("宋体", Controls[i].Font.Size - 8, FontStyle.Bold);
                     }