From cabb7ecdde336baec10b5ca4e0bd09d443b2023b Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期二, 23 十二月 2025 13:28:57 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs | 120 +++++++++++++++++++++++++++++++++---------------------------
1 files changed, 66 insertions(+), 54 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
index c767fb7..3d6fb7d 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectHz.Designer.cs
@@ -35,11 +35,12 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.gcMain = new DevExpress.XtraGrid.GridControl();
this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gv_operationTime = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_Name = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_no = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gv_time = new DevExpress.XtraGrid.Columns.GridColumn();
this.gv_Btn = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -48,81 +49,80 @@
// gcMain
//
this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+ this.gcMain.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
this.gcMain.Location = new System.Drawing.Point(0, 0);
this.gcMain.MainView = this.gridView1;
+ this.gcMain.Margin = new System.Windows.Forms.Padding(4);
this.gcMain.Name = "gcMain";
this.gcMain.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMain.Size = new System.Drawing.Size(581, 489);
+ this.gcMain.Size = new System.Drawing.Size(1014, 600);
this.gcMain.TabIndex = 3;
this.gcMain.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
//
// gridView1
//
- this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
this.gridView1.Appearance.Row.Options.UseFont = true;
this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gv_operationTime,
- this.gv_operationTable,
- this.gv_userName,
- this.gv_Btn});
+ this.gv_Name,
+ this.gv_no,
+ this.gv_time,
+ this.gv_Btn,
+ this.gridColumn1});
+ this.gridView1.DetailHeight = 428;
this.gridView1.GridControl = this.gcMain;
this.gridView1.Name = "gridView1";
this.gridView1.OptionsFind.ShowSearchNavButtons = false;
this.gridView1.OptionsView.ShowAutoFilterRow = true;
this.gridView1.OptionsView.ShowGroupPanel = false;
//
- // gv_operationTime
+ // gv_Name
//
- this.gv_operationTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_operationTime.AppearanceCell.Options.UseFont = true;
- this.gv_operationTime.Caption = "缁勭粐鍚嶇О";
- this.gv_operationTime.FieldName = "name";
- this.gv_operationTime.MinWidth = 10;
- this.gv_operationTime.Name = "gv_operationTime";
- this.gv_operationTime.OptionsColumn.AllowEdit = false;
- this.gv_operationTime.Tag = "query_OPERATION_TIME";
- this.gv_operationTime.Visible = true;
- this.gv_operationTime.VisibleIndex = 0;
- this.gv_operationTime.Width = 300;
+ this.gv_Name.AppearanceCell.Options.UseFont = true;
+ this.gv_Name.Caption = "鍚嶇О";
+ this.gv_Name.FieldName = "name";
+ this.gv_Name.MinWidth = 12;
+ this.gv_Name.Name = "gv_Name";
+ this.gv_Name.OptionsColumn.AllowEdit = false;
+ this.gv_Name.Tag = "query_OPERATION_TIME";
+ this.gv_Name.Visible = true;
+ this.gv_Name.VisibleIndex = 0;
+ this.gv_Name.Width = 375;
//
- // gv_operationTable
+ // gv_no
//
- this.gv_operationTable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_operationTable.AppearanceCell.Options.UseFont = true;
- this.gv_operationTable.Caption = "缁勭粐缂栧彿";
- this.gv_operationTable.FieldName = "fNumber";
- this.gv_operationTable.MinWidth = 10;
- this.gv_operationTable.Name = "gv_operationTable";
- this.gv_operationTable.OptionsColumn.AllowEdit = false;
- this.gv_operationTable.Tag = "query_OPERATION_TABLE";
- this.gv_operationTable.Visible = true;
- this.gv_operationTable.VisibleIndex = 1;
- this.gv_operationTable.Width = 100;
+ this.gv_no.AppearanceCell.Options.UseFont = true;
+ this.gv_no.Caption = "缂栧彿";
+ this.gv_no.FieldName = "fNumber";
+ this.gv_no.MinWidth = 12;
+ this.gv_no.Name = "gv_no";
+ this.gv_no.OptionsColumn.AllowEdit = false;
+ this.gv_no.Tag = "query_OPERATION_TABLE";
+ this.gv_no.Visible = true;
+ this.gv_no.VisibleIndex = 2;
+ this.gv_no.Width = 125;
//
- // gv_userName
+ // gv_time
//
- this.gv_userName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
- this.gv_userName.AppearanceCell.Options.UseFont = true;
- this.gv_userName.Caption = "鍚屾鏃堕棿";
- this.gv_userName.FieldName = "edtTime";
- this.gv_userName.MinWidth = 10;
- this.gv_userName.Name = "gv_userName";
- this.gv_userName.OptionsColumn.AllowEdit = false;
- this.gv_userName.Tag = "query_USER_NAME";
- this.gv_userName.Width = 250;
+ this.gv_time.AppearanceCell.Options.UseFont = true;
+ this.gv_time.Caption = "鍚屾鏃堕棿";
+ this.gv_time.FieldName = "edtTime";
+ this.gv_time.MinWidth = 12;
+ this.gv_time.Name = "gv_time";
+ this.gv_time.OptionsColumn.AllowEdit = false;
+ this.gv_time.Tag = "query_USER_NAME";
+ this.gv_time.Width = 312;
//
// gv_Btn
//
this.gv_Btn.Caption = "閫夋嫨";
this.gv_Btn.ColumnEdit = this.repositoryItemButtonEdit1;
- this.gv_Btn.MinWidth = 25;
+ this.gv_Btn.MinWidth = 31;
this.gv_Btn.Name = "gv_Btn";
this.gv_Btn.Visible = true;
- this.gv_Btn.VisibleIndex = 2;
- this.gv_Btn.Width = 94;
+ this.gv_Btn.VisibleIndex = 3;
+ this.gv_Btn.Width = 117;
//
// repositoryItemButtonEdit1
//
@@ -135,16 +135,27 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // SelectOrg
+ // gridColumn1
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.gridColumn1.Caption = "缁勭粐";
+ this.gridColumn1.FieldName = "fSubsidiary";
+ this.gridColumn1.MinWidth = 30;
+ this.gridColumn1.Name = "gridColumn1";
+ this.gridColumn1.Visible = true;
+ this.gridColumn1.VisibleIndex = 1;
+ this.gridColumn1.Width = 94;
+ //
+ // SelectHz
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(581, 489);
+ this.ClientSize = new System.Drawing.Size(1014, 600);
this.Controls.Add(this.gcMain);
this.IconOptions.Image = global::Gs.DevApp.Properties.Resources.logo_png_black;
+ this.Margin = new System.Windows.Forms.Padding(4);
this.MaximizeBox = false;
this.MinimizeBox = false;
- this.Name = "SelectOrg";
+ this.Name = "SelectHz";
this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
this.Text = "閫夋嫨缁勭粐";
((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
@@ -158,10 +169,11 @@
private DevExpress.XtraGrid.GridControl gcMain;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
- private DevExpress.XtraGrid.Columns.GridColumn gv_operationTime;
- private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
- private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_Name;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_no;
+ private DevExpress.XtraGrid.Columns.GridColumn gv_time;
private DevExpress.XtraGrid.Columns.GridColumn gv_Btn;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3