Merge branch 'master' of http://106.15.194.121:8083/lina/SO908-XLRStore

source/XLRStoreClient/useControl/EquipControl.Designer.cs

@@ -47,7 +47,7 @@
             this.lblShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblShelf.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblShelf.ForeColor = System.Drawing.Color.Black;
             this.lblShelf.ForeColor = System.Drawing.Color.Black;
             this.lblShelf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.lblShelf.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
-            this.lblShelf.Location = new System.Drawing.Point(180, 29);
+            this.lblShelf.Location = new System.Drawing.Point(75, 29);
             this.lblShelf.Name = "lblShelf";
             this.lblShelf.Name = "lblShelf";
             this.lblShelf.Size = new System.Drawing.Size(56, 17);
             this.lblShelf.Size = new System.Drawing.Size(56, 17);
             this.lblShelf.TabIndex = 0;
             this.lblShelf.TabIndex = 0;
@@ -155,6 +155,7 @@
             this.lblWarn.Size = new System.Drawing.Size(242, 42);
             this.lblWarn.Size = new System.Drawing.Size(242, 42);
             this.lblWarn.TabIndex = 8;
             this.lblWarn.TabIndex = 8;
             this.lblWarn.Text = "暂无报警";
             this.lblWarn.Text = "暂无报警";
+            this.lblWarn.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblWarn.DoubleClick += new System.EventHandler(this.panName_DoubleClick_1);
             this.lblWarn.DoubleClick += new System.EventHandler(this.panName_DoubleClick_1);
             this.lblWarn.MouseEnter += new System.EventHandler(this.lblDebug_MouseEnter);
             this.lblWarn.MouseEnter += new System.EventHandler(this.lblDebug_MouseEnter);
             this.lblWarn.MouseLeave += new System.EventHandler(this.lblDebug_MouseLeave);
             this.lblWarn.MouseLeave += new System.EventHandler(this.lblDebug_MouseLeave);

source/XLRStoreClient/useControl/ReelDataControl.Designer.cs

@@ -104,9 +104,9 @@
             this.lblSingle.ForeColor = System.Drawing.Color.Black;
             this.lblSingle.ForeColor = System.Drawing.Color.Black;
             this.lblSingle.Location = new System.Drawing.Point(3, 1);
             this.lblSingle.Location = new System.Drawing.Point(3, 1);
             this.lblSingle.Name = "lblSingle";
             this.lblSingle.Name = "lblSingle";
-            this.lblSingle.Size = new System.Drawing.Size(62, 23);
+            this.lblSingle.Size = new System.Drawing.Size(72, 23);
             this.lblSingle.TabIndex = 3;
             this.lblSingle.TabIndex = 3;
-            this.lblSingle.Text = "检测有料";
+            this.lblSingle.Text = "检测有料✔";
             this.lblSingle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.lblSingle.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             // 
             // 
             // ReelDataControl
             // ReelDataControl