From c5cfa2df88c6d2e5b31e87e1d5a8fe49d585f0bb Mon Sep 17 00:00:00 2001
From: jinghz@oceic.com <jinghz@oceic.com>
Date: 星期四, 24 八月 2023 10:44:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
BaseSet/公用资料/其他基础资料/Gy_StdWorkTimesList.Designer.cs | 108 +++++++++++++++++++++++++++++++----------------------
1 files changed, 63 insertions(+), 45 deletions(-)
diff --git "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs" "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
index c4312df..54674e5 100644
--- "a/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
+++ "b/BaseSet/\345\205\254\347\224\250\350\265\204\346\226\231/\345\205\266\344\273\226\345\237\272\347\241\200\350\265\204\346\226\231/Gy_StdWorkTimesList.Designer.cs"
@@ -1,5 +1,5 @@
锘�
-namespace BaseSet.鍏敤璧勬枡.鍏朵粬鍩虹璧勬枡
+namespace BaseSet
{
partial class Gy_StdWorkTimesList
{
@@ -48,9 +48,9 @@
this.sh = new System.Windows.Forms.ToolStripButton();
this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
this.ToolBar = new System.Windows.Forms.ToolStrip();
- this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.gs = new System.Windows.Forms.ToolStripButton();
this.wl = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
this.xz = new System.Windows.Forms.ToolStripButton();
this.xg = new System.Windows.Forms.ToolStripButton();
this.sc = new System.Windows.Forms.ToolStripButton();
@@ -64,6 +64,8 @@
this.bclk = new System.Windows.Forms.ToolStripButton();
this.jy = new System.Windows.Forms.ToolStripButton();
this.fjy = new System.Windows.Forms.ToolStripButton();
+ this.dc = new System.Windows.Forms.ToolStripButton();
+ this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
this.tabPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.grdMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
@@ -80,11 +82,10 @@
this.tabPage1.BackColor = System.Drawing.Color.Transparent;
this.tabPage1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
this.tabPage1.Controls.Add(this.grdMain);
- this.tabPage1.Location = new System.Drawing.Point(4, 25);
- this.tabPage1.Margin = new System.Windows.Forms.Padding(4);
+ this.tabPage1.Location = new System.Drawing.Point(4, 22);
this.tabPage1.Name = "tabPage1";
- this.tabPage1.Padding = new System.Windows.Forms.Padding(4);
- this.tabPage1.Size = new System.Drawing.Size(1041, 590);
+ this.tabPage1.Padding = new System.Windows.Forms.Padding(3, 3, 3, 3);
+ this.tabPage1.Size = new System.Drawing.Size(779, 469);
this.tabPage1.TabIndex = 0;
this.tabPage1.Text = "鍒楄〃瑙嗗浘";
this.tabPage1.UseVisualStyleBackColor = true;
@@ -97,13 +98,12 @@
this.grdMain.ClipboardCopyMode = System.Windows.Forms.DataGridViewClipboardCopyMode.Disable;
this.grdMain.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
this.grdMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.grdMain.Location = new System.Drawing.Point(4, 4);
- this.grdMain.Margin = new System.Windows.Forms.Padding(4);
+ this.grdMain.Location = new System.Drawing.Point(3, 3);
this.grdMain.Name = "grdMain";
this.grdMain.ReadOnly = true;
this.grdMain.RowHeadersWidth = 51;
this.grdMain.RowTemplate.Height = 23;
- this.grdMain.Size = new System.Drawing.Size(1031, 580);
+ this.grdMain.Size = new System.Drawing.Size(771, 461);
this.grdMain.TabIndex = 21;
//
// fsh
@@ -123,7 +123,7 @@
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
- this.toolStripSeparator3.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator3.Size = new System.Drawing.Size(6, 50);
//
// tc
//
@@ -142,7 +142,7 @@
// toolStripSeparator5
//
this.toolStripSeparator5.Name = "toolStripSeparator5";
- this.toolStripSeparator5.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator5.Size = new System.Drawing.Size(6, 50);
//
// imageList1
//
@@ -158,8 +158,7 @@
// splitContainer1
//
this.splitContainer1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.splitContainer1.Location = new System.Drawing.Point(0, 62);
- this.splitContainer1.Margin = new System.Windows.Forms.Padding(4);
+ this.splitContainer1.Location = new System.Drawing.Point(0, 50);
this.splitContainer1.Name = "splitContainer1";
//
// splitContainer1.Panel1
@@ -170,9 +169,8 @@
// splitContainer1.Panel2
//
this.splitContainer1.Panel2.Controls.Add(this.stTab);
- this.splitContainer1.Size = new System.Drawing.Size(1249, 619);
- this.splitContainer1.SplitterDistance = 195;
- this.splitContainer1.SplitterWidth = 5;
+ this.splitContainer1.Size = new System.Drawing.Size(937, 495);
+ this.splitContainer1.SplitterDistance = 146;
this.splitContainer1.TabIndex = 18;
//
// tv
@@ -185,8 +183,7 @@
this.tv.Indent = 18;
this.tv.ItemHeight = 18;
this.tv.LineColor = System.Drawing.Color.Navy;
- this.tv.Location = new System.Drawing.Point(0, 24);
- this.tv.Margin = new System.Windows.Forms.Padding(4);
+ this.tv.Location = new System.Drawing.Point(0, 20);
this.tv.Name = "tv";
treeNode2.ForeColor = System.Drawing.Color.Black;
treeNode2.Name = "tjbb";
@@ -196,7 +193,7 @@
this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] {
treeNode2});
this.tv.SelectedImageIndex = 1;
- this.tv.Size = new System.Drawing.Size(195, 595);
+ this.tv.Size = new System.Drawing.Size(146, 475);
this.tv.TabIndex = 16;
this.tv.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseClick);
//
@@ -206,18 +203,16 @@
this.panel1.Controls.Add(this.lblCaption);
this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
this.panel1.Location = new System.Drawing.Point(0, 0);
- this.panel1.Margin = new System.Windows.Forms.Padding(4);
this.panel1.Name = "panel1";
- this.panel1.Size = new System.Drawing.Size(195, 24);
+ this.panel1.Size = new System.Drawing.Size(146, 20);
this.panel1.TabIndex = 15;
//
// lblCaption
//
this.lblCaption.AutoSize = true;
- this.lblCaption.Location = new System.Drawing.Point(0, 4);
- this.lblCaption.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+ this.lblCaption.Location = new System.Drawing.Point(0, 3);
this.lblCaption.Name = "lblCaption";
- this.lblCaption.Size = new System.Drawing.Size(37, 15);
+ this.lblCaption.Size = new System.Drawing.Size(29, 12);
this.lblCaption.TabIndex = 0;
this.lblCaption.Text = "璧勬枡";
//
@@ -226,10 +221,9 @@
this.stTab.Controls.Add(this.tabPage1);
this.stTab.Dock = System.Windows.Forms.DockStyle.Fill;
this.stTab.Location = new System.Drawing.Point(0, 0);
- this.stTab.Margin = new System.Windows.Forms.Padding(4);
this.stTab.Name = "stTab";
this.stTab.SelectedIndex = 0;
- this.stTab.Size = new System.Drawing.Size(1049, 619);
+ this.stTab.Size = new System.Drawing.Size(787, 495);
this.stTab.TabIndex = 15;
//
// sh
@@ -250,7 +244,7 @@
//
this.toolStripSeparator9.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator9.Name = "toolStripSeparator9";
- this.toolStripSeparator9.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator9.Size = new System.Drawing.Size(6, 50);
//
// ToolBar
//
@@ -259,9 +253,11 @@
this.ToolBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
this.ToolBar.ImageScalingSize = new System.Drawing.Size(22, 22);
this.ToolBar.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
- this.toolStripSeparator6,
+ this.dc,
+ this.toolStripSeparator5,
this.gs,
this.wl,
+ this.toolStripSeparator6,
this.xz,
this.xg,
this.sc,
@@ -277,22 +273,17 @@
this.sh,
this.fsh,
this.toolStripSeparator3,
- this.tc,
- this.toolStripSeparator5,
this.jy,
- this.fjy});
+ this.fjy,
+ this.toolStripSeparator4,
+ this.tc});
this.ToolBar.Location = new System.Drawing.Point(0, 0);
this.ToolBar.Name = "ToolBar";
this.ToolBar.Padding = new System.Windows.Forms.Padding(0);
- this.ToolBar.Size = new System.Drawing.Size(1249, 62);
+ this.ToolBar.Size = new System.Drawing.Size(937, 50);
this.ToolBar.Stretch = true;
this.ToolBar.TabIndex = 17;
this.ToolBar.Text = "toolStrip1";
- //
- // toolStripSeparator6
- //
- this.toolStripSeparator6.Name = "toolStripSeparator6";
- this.toolStripSeparator6.Size = new System.Drawing.Size(6, 62);
//
// gs
//
@@ -326,6 +317,11 @@
this.wl.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.wl.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.wl.Click += new System.EventHandler(this.wl_Click);
+ //
+ // toolStripSeparator6
+ //
+ this.toolStripSeparator6.Name = "toolStripSeparator6";
+ this.toolStripSeparator6.Size = new System.Drawing.Size(6, 50);
//
// xz
//
@@ -373,7 +369,7 @@
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
- this.toolStripSeparator2.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator2.Size = new System.Drawing.Size(6, 50);
//
// cx
//
@@ -406,13 +402,13 @@
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
- this.toolStripSeparator1.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator1.Size = new System.Drawing.Size(6, 50);
//
// toolStripSeparator8
//
this.toolStripSeparator8.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator8.Name = "toolStripSeparator8";
- this.toolStripSeparator8.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator8.Size = new System.Drawing.Size(6, 50);
//
// mrlk
//
@@ -422,7 +418,7 @@
this.mrlk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.mrlk.ImageTransparentColor = System.Drawing.Color.White;
this.mrlk.Name = "mrlk";
- this.mrlk.Size = new System.Drawing.Size(73, 59);
+ this.mrlk.Size = new System.Drawing.Size(60, 47);
this.mrlk.Text = "榛樿鍒楀";
this.mrlk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.mrlk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -431,7 +427,7 @@
//
this.toolStripSeparator7.Alignment = System.Windows.Forms.ToolStripItemAlignment.Right;
this.toolStripSeparator7.Name = "toolStripSeparator7";
- this.toolStripSeparator7.Size = new System.Drawing.Size(6, 62);
+ this.toolStripSeparator7.Size = new System.Drawing.Size(6, 50);
//
// bclk
//
@@ -441,7 +437,7 @@
this.bclk.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
this.bclk.ImageTransparentColor = System.Drawing.Color.White;
this.bclk.Name = "bclk";
- this.bclk.Size = new System.Drawing.Size(73, 59);
+ this.bclk.Size = new System.Drawing.Size(60, 47);
this.bclk.Text = "淇濆瓨鍒楀";
this.bclk.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
this.bclk.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
@@ -474,13 +470,33 @@
this.fjy.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
this.fjy.Click += new System.EventHandler(this.fjy_Click);
//
+ // dc
+ //
+ this.dc.AutoSize = false;
+ this.dc.Image = ((System.Drawing.Image)(resources.GetObject("dc.Image")));
+ this.dc.ImageAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.ImageScaling = System.Windows.Forms.ToolStripItemImageScaling.None;
+ this.dc.ImageTransparentColor = System.Drawing.Color.White;
+ this.dc.Name = "dc";
+ this.dc.Size = new System.Drawing.Size(36, 47);
+ this.dc.Text = "寮曞嚭";
+ this.dc.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
+ this.dc.TextImageRelation = System.Windows.Forms.TextImageRelation.ImageAboveText;
+ this.dc.Click += new System.EventHandler(this.dc_Click);
+ //
+ // toolStripSeparator4
+ //
+ this.toolStripSeparator4.Name = "toolStripSeparator4";
+ this.toolStripSeparator4.Size = new System.Drawing.Size(6, 50);
+ //
// Gy_StdWorkTimesList
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1249, 681);
+ this.ClientSize = new System.Drawing.Size(937, 545);
this.Controls.Add(this.splitContainer1);
this.Controls.Add(this.ToolBar);
+ this.Margin = new System.Windows.Forms.Padding(2, 2, 2, 2);
this.Name = "Gy_StdWorkTimesList";
this.Text = "鏍囧噯宸ユ椂";
this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
@@ -534,5 +550,7 @@
private System.Windows.Forms.ToolStripButton wl;
private System.Windows.Forms.ToolStripButton jy;
private System.Windows.Forms.ToolStripButton fjy;
+ private System.Windows.Forms.ToolStripButton dc;
+ private System.Windows.Forms.ToolStripSeparator toolStripSeparator4;
}
}
\ No newline at end of file
--
Gitblit v1.9.1