From 32e0a92a0c603db872d56739299cb7f603b23dd1 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 12 九月 2025 17:31:17 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs | 57 ++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 36 insertions(+), 21 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs
index 9b8e92b..a5102a8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs
@@ -29,13 +29,15 @@
private void InitializeComponent()
{
this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
- this.label2 = new System.Windows.Forms.Label();
- this.label1 = new System.Windows.Forms.Label();
+ this.chkWater = new DevExpress.XtraEditors.CheckEdit();
this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
this.txt_gx = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.label2 = new System.Windows.Forms.Label();
this.txt_bc = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.label1 = new System.Windows.Forms.Label();
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
this.panelControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.chkWater.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit();
this.SuspendLayout();
@@ -45,6 +47,7 @@
this.panelControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
+ this.panelControl1.Controls.Add(this.chkWater);
this.panelControl1.Controls.Add(this.btnLogin);
this.panelControl1.Controls.Add(this.txt_gx);
this.panelControl1.Controls.Add(this.label2);
@@ -52,26 +55,17 @@
this.panelControl1.Controls.Add(this.label1);
this.panelControl1.Location = new System.Drawing.Point(162, 116);
this.panelControl1.Name = "panelControl1";
- this.panelControl1.Size = new System.Drawing.Size(280, 249);
+ this.panelControl1.Size = new System.Drawing.Size(280, 264);
this.panelControl1.TabIndex = 0;
//
- // label2
+ // chkWater
//
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(45, 99);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(38, 18);
- this.label2.TabIndex = 2;
- this.label2.Text = "宸ュ簭";
- //
- // label1
- //
- this.label1.AutoSize = true;
- this.label1.Location = new System.Drawing.Point(45, 35);
- this.label1.Name = "label1";
- this.label1.Size = new System.Drawing.Size(38, 18);
- this.label1.TabIndex = 0;
- this.label1.Text = "鐝";
+ this.chkWater.Location = new System.Drawing.Point(100, 140);
+ this.chkWater.Name = "chkWater";
+ this.chkWater.Properties.Caption = "瀵规帴姘存鏈哄櫒";
+ this.chkWater.Size = new System.Drawing.Size(125, 24);
+ this.chkWater.TabIndex = 5;
+ this.chkWater.Visible = false;
//
// btnLogin
//
@@ -79,7 +73,7 @@
this.btnLogin.Appearance.Options.UseBackColor = true;
this.btnLogin.Appearance.Options.UseFont = true;
this.btnLogin.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_32x32;
- this.btnLogin.Location = new System.Drawing.Point(45, 162);
+ this.btnLogin.Location = new System.Drawing.Point(45, 194);
this.btnLogin.Name = "btnLogin";
this.btnLogin.Size = new System.Drawing.Size(180, 40);
this.btnLogin.TabIndex = 4;
@@ -87,7 +81,7 @@
//
// txt_gx
//
- this.txt_gx.Location = new System.Drawing.Point(100, 96);
+ this.txt_gx.Location = new System.Drawing.Point(100, 86);
this.txt_gx.Name = "txt_gx";
this.txt_gx.Properties.Appearance.Options.UseFont = true;
this.txt_gx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -95,6 +89,15 @@
this.txt_gx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_gx.Size = new System.Drawing.Size(125, 24);
this.txt_gx.TabIndex = 3;
+ //
+ // label2
+ //
+ this.label2.AutoSize = true;
+ this.label2.Location = new System.Drawing.Point(45, 89);
+ this.label2.Name = "label2";
+ this.label2.Size = new System.Drawing.Size(38, 18);
+ this.label2.TabIndex = 2;
+ this.label2.Text = "宸ュ簭";
//
// txt_bc
//
@@ -105,11 +108,21 @@
this.txt_bc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.txt_bc.Properties.Items.AddRange(new object[] {
+ "-璇烽�夋嫨-",
"鐧界彮",
"澶滅彮"});
this.txt_bc.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
this.txt_bc.Size = new System.Drawing.Size(125, 24);
this.txt_bc.TabIndex = 1;
+ //
+ // label1
+ //
+ this.label1.AutoSize = true;
+ this.label1.Location = new System.Drawing.Point(45, 35);
+ this.label1.Name = "label1";
+ this.label1.Size = new System.Drawing.Size(38, 18);
+ this.label1.TabIndex = 0;
+ this.label1.Text = "鐝";
//
// Frm_WorkStart
//
@@ -123,6 +136,7 @@
((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
this.panelControl1.ResumeLayout(false);
this.panelControl1.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.chkWater.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit();
this.ResumeLayout(false);
@@ -137,5 +151,6 @@
private DevExpress.XtraEditors.ComboBoxEdit txt_gx;
private System.Windows.Forms.Label label2;
private DevExpress.XtraEditors.SimpleButton btnLogin;
+ private DevExpress.XtraEditors.CheckEdit chkWater;
}
}
\ No newline at end of file
--
Gitblit v1.9.3