From c0ea121256e4c23dba0efda571269c706766126a Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期三, 08 十二月 2021 19:13:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BLL/公用模块/Gy_DataInTmp.designer.cs | 38 +++++++++++++++++++-------------------
1 files changed, 19 insertions(+), 19 deletions(-)
diff --git "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs" "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
index d757a54..0e5ecbf 100644
--- "a/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
+++ "b/BLL/\345\205\254\347\224\250\346\250\241\345\235\227/Gy_DataInTmp.designer.cs"
@@ -50,6 +50,7 @@
this.tc = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.pPic = new System.Windows.Forms.Panel();
+ this.pb1 = new System.Windows.Forms.ProgressBar();
this.txtHDataInTmp = new System.Windows.Forms.TextBox();
this.cmdHDataInTmp = new System.Windows.Forms.Button();
this.label5 = new System.Windows.Forms.Label();
@@ -64,7 +65,6 @@
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.grdPrint = new System.Windows.Forms.DataGridView();
this.panel1 = new System.Windows.Forms.Panel();
- this.pb1 = new System.Windows.Forms.ProgressBar();
this.Tool.SuspendLayout();
this.pPic.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
@@ -293,15 +293,22 @@
this.pPic.Controls.Add(this.lbldj);
this.pPic.Dock = System.Windows.Forms.DockStyle.Top;
this.pPic.Location = new System.Drawing.Point(0, 59);
- this.pPic.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.pPic.Margin = new System.Windows.Forms.Padding(4);
this.pPic.Name = "pPic";
this.pPic.Size = new System.Drawing.Size(1460, 56);
this.pPic.TabIndex = 18;
//
+ // pb1
+ //
+ this.pb1.Location = new System.Drawing.Point(920, 18);
+ this.pb1.Name = "pb1";
+ this.pb1.Size = new System.Drawing.Size(391, 23);
+ this.pb1.TabIndex = 104;
+ //
// txtHDataInTmp
//
this.txtHDataInTmp.Location = new System.Drawing.Point(509, 18);
- this.txtHDataInTmp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHDataInTmp.Margin = new System.Windows.Forms.Padding(4);
this.txtHDataInTmp.Name = "txtHDataInTmp";
this.txtHDataInTmp.Size = new System.Drawing.Size(236, 25);
this.txtHDataInTmp.TabIndex = 103;
@@ -312,7 +319,7 @@
this.cmdHDataInTmp.Image = ((System.Drawing.Image)(resources.GetObject("cmdHDataInTmp.Image")));
this.cmdHDataInTmp.ImageAlign = System.Drawing.ContentAlignment.TopRight;
this.cmdHDataInTmp.Location = new System.Drawing.Point(747, 18);
- this.cmdHDataInTmp.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHDataInTmp.Margin = new System.Windows.Forms.Padding(4);
this.cmdHDataInTmp.Name = "cmdHDataInTmp";
this.cmdHDataInTmp.Size = new System.Drawing.Size(29, 28);
this.cmdHDataInTmp.TabIndex = 102;
@@ -368,7 +375,7 @@
this.cmdHPath.Image = ((System.Drawing.Image)(resources.GetObject("cmdHPath.Image")));
this.cmdHPath.ImageAlign = System.Drawing.ContentAlignment.TopRight;
this.cmdHPath.Location = new System.Drawing.Point(1063, 8);
- this.cmdHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.cmdHPath.Margin = new System.Windows.Forms.Padding(4);
this.cmdHPath.Name = "cmdHPath";
this.cmdHPath.Size = new System.Drawing.Size(29, 28);
this.cmdHPath.TabIndex = 34;
@@ -378,7 +385,7 @@
// txtHPath
//
this.txtHPath.Location = new System.Drawing.Point(613, 9);
- this.txtHPath.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.txtHPath.Margin = new System.Windows.Forms.Padding(4);
this.txtHPath.Multiline = true;
this.txtHPath.Name = "txtHPath";
this.txtHPath.Size = new System.Drawing.Size(447, 49);
@@ -403,7 +410,7 @@
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
this.grdMain.Location = new System.Drawing.Point(0, 177);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdMain.Margin = new System.Windows.Forms.Padding(4);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
@@ -421,7 +428,7 @@
this.grdSum.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdSum.Dock = System.Windows.Forms.DockStyle.Bottom;
this.grdSum.Location = new System.Drawing.Point(0, 765);
- this.grdSum.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdSum.Margin = new System.Windows.Forms.Padding(4);
this.grdSum.Name = "grdSum";
this.grdSum.ReadOnly = true;
this.grdSum.RowHeadersWidth = 51;
@@ -438,7 +445,7 @@
//
this.grdPrint.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdPrint.Location = new System.Drawing.Point(713, 379);
- this.grdPrint.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.grdPrint.Margin = new System.Windows.Forms.Padding(4);
this.grdPrint.Name = "grdPrint";
this.grdPrint.RowHeadersWidth = 51;
this.grdPrint.RowTemplate.Height = 23;
@@ -454,17 +461,10 @@
this.panel1.Controls.Add(this.cmdHPath);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 115);
- this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(1460, 62);
this.panel1.TabIndex = 50;
- //
- // pb1
- //
- this.pb1.Location = new System.Drawing.Point(920, 18);
- this.pb1.Name = "pb1";
- this.pb1.Size = new System.Drawing.Size(391, 23);
- this.pb1.TabIndex = 104;
//
// Gy_DataInTmp
//
@@ -477,7 +477,7 @@
this.Controls.Add(this.grdSum);
this.Controls.Add(this.pPic);
this.Controls.Add(this.Tool);
- this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+ this.Margin = new System.Windows.Forms.Padding(4);
this.Name = "Gy_DataInTmp";
this.Text = "鏁版嵁瀵煎叆";
this.Load += new System.EventHandler(this.Gy_DataInTmp_Load);
@@ -530,6 +530,6 @@
public System.Windows.Forms.Button cmdHPath;
public System.Windows.Forms.TextBox txtHPath;
public System.Windows.Forms.Label label4;
- private System.Windows.Forms.ProgressBar pb1;
+ public System.Windows.Forms.ProgressBar pb1;
}
}
\ No newline at end of file
--
Gitblit v1.9.1