From 935170937ade710c44a00408e4ad7de3b3a22b70 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 25 十月 2024 09:36:30 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/02-analy/SinglePumpAnalyInfoCtrl.Designer.cs | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/02-analy/SinglePumpAnalyInfoCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/02-analy/SinglePumpAnalyInfoCtrl.Designer.cs
index 86132b5..317fbe1 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/02-analy/SinglePumpAnalyInfoCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-pump/02-analy/SinglePumpAnalyInfoCtrl.Designer.cs
@@ -40,7 +40,6 @@
colQueryH = new DevExpress.XtraGrid.Columns.GridColumn();
colQueryE = new DevExpress.XtraGrid.Columns.GridColumn();
colQueryP = new DevExpress.XtraGrid.Columns.GridColumn();
- gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
gridControl2 = new DevExpress.XtraGrid.GridControl();
gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
colCurrentSpeed2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -139,7 +138,7 @@
//
// gridView3
//
- gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCurrentSpeed1, colCurrentHz2, colQueryQ, colQueryH, colQueryE, colQueryP, gridColumn1 });
+ gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCurrentSpeed1, colCurrentHz2, colQueryQ, colQueryH, colQueryE, colQueryP });
gridView3.GridControl = gridControl3;
gridView3.Name = "gridView3";
//
@@ -196,15 +195,6 @@
colQueryP.Visible = true;
colQueryP.VisibleIndex = 5;
colQueryP.Width = 112;
- //
- // gridColumn1
- //
- gridColumn1.Caption = "gridColumn1";
- gridColumn1.MinWidth = 30;
- gridColumn1.Name = "gridColumn1";
- gridColumn1.Visible = true;
- gridColumn1.VisibleIndex = 6;
- gridColumn1.Width = 112;
//
// gridControl2
//
@@ -650,7 +640,6 @@
private DevExpress.XtraGrid.Columns.GridColumn colSectH;
private DevExpress.XtraGrid.Columns.GridColumn colSectE;
private DevExpress.XtraGrid.Columns.GridColumn colSectP;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
private SimpleButton btnSave;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
--
Gitblit v1.9.3