From 84820e6296602b263633ff9a960bfd15cf0618de Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 05 十二月 2024 12:47:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs | 112 ++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 72 insertions(+), 40 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs
index e2db501..a813665 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/TankManageMainPage.Designer.cs
@@ -36,6 +36,7 @@
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
BarBtnEidtPumpPart = new DevExpress.XtraBars.BarButtonItem();
barBtnSetCoefficient = new DevExpress.XtraBars.BarButtonItem();
+ barBtnTankChart = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
@@ -45,17 +46,19 @@
TankViewModelBindingSource = new BindingSource(components);
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
- colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
- colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
- colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+ colDN = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMinVol = new DevExpress.XtraGrid.Columns.GridColumn();
+ colOverFlow = new DevExpress.XtraGrid.Columns.GridColumn();
+ colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMaxLevel = new DevExpress.XtraGrid.Columns.GridColumn();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
TankTreeListCtrl1 = new TankTreeListCtrl();
barBtnValveLine = new DevExpress.XtraBars.BarButtonItem();
- barBtnTankChart = new DevExpress.XtraBars.BarButtonItem();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImageCollection1).BeginInit();
sidePanel1.SuspendLayout();
@@ -120,7 +123,16 @@
barBtnSetCoefficient.Id = 24;
barBtnSetCoefficient.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetCoefficient.ImageOptions.SvgImage");
barBtnSetCoefficient.Name = "barBtnSetCoefficient";
+ barBtnSetCoefficient.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
barBtnSetCoefficient.ItemClick += barBtnSetCoefficient_ItemClick;
+ //
+ // barBtnTankChart
+ //
+ barBtnTankChart.Caption = "瀹圭Н鏇茬嚎";
+ barBtnTankChart.Id = 25;
+ barBtnTankChart.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnTankChart.ImageOptions.SvgImage");
+ barBtnTankChart.Name = "barBtnTankChart";
+ barBtnTankChart.ItemClick += barBtnTankChart_ItemClick;
//
// ribbonPage1
//
@@ -179,7 +191,7 @@
gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colDescription, colKeyWord, colMaterial, colMinorLoss });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colDescription, colKeyWord, colDN, colMinLevel, colMinVol, colOverFlow, colSortCode, colMaxLevel });
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsView.ShowGroupPanel = false;
@@ -192,17 +204,7 @@
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 192;
- //
- // colCaliber
- //
- colCaliber.AppearanceCell.Options.UseTextOptions = true;
- colCaliber.AppearanceCell.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
- colCaliber.FieldName = "Caliber";
- colCaliber.Name = "colCaliber";
- colCaliber.Visible = true;
- colCaliber.VisibleIndex = 3;
- colCaliber.Width = 85;
+ colName.Width = 163;
//
// colDescription
//
@@ -211,8 +213,8 @@
colDescription.FieldName = "Description";
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 5;
- colDescription.Width = 222;
+ colDescription.VisibleIndex = 8;
+ colDescription.Width = 158;
//
// colKeyWord
//
@@ -220,21 +222,55 @@
colKeyWord.Name = "colKeyWord";
colKeyWord.Visible = true;
colKeyWord.VisibleIndex = 1;
- colKeyWord.Width = 128;
+ colKeyWord.Width = 101;
//
- // colMaterial
+ // colDN
//
- colMaterial.FieldName = "Material";
- colMaterial.Name = "colMaterial";
- colMaterial.Visible = true;
- colMaterial.VisibleIndex = 2;
+ colDN.FieldName = "DN";
+ colDN.Name = "colDN";
+ colDN.Visible = true;
+ colDN.VisibleIndex = 2;
+ colDN.Width = 78;
//
- // colMinorLoss
+ // colMinLevel
//
- colMinorLoss.FieldName = "MinorLoss";
- colMinorLoss.Name = "colMinorLoss";
- colMinorLoss.Visible = true;
- colMinorLoss.VisibleIndex = 4;
+ colMinLevel.FieldName = "MinLevel";
+ colMinLevel.Name = "colMinLevel";
+ colMinLevel.Visible = true;
+ colMinLevel.VisibleIndex = 3;
+ colMinLevel.Width = 74;
+ //
+ // colMinVol
+ //
+ colMinVol.FieldName = "MinVol";
+ colMinVol.Name = "colMinVol";
+ colMinVol.Visible = true;
+ colMinVol.VisibleIndex = 4;
+ colMinVol.Width = 63;
+ //
+ // colOverFlow
+ //
+ colOverFlow.FieldName = "OverFlow";
+ colOverFlow.Name = "colOverFlow";
+ colOverFlow.Visible = true;
+ colOverFlow.VisibleIndex = 5;
+ colOverFlow.Width = 101;
+ //
+ // colSortCode
+ //
+ colSortCode.FieldName = "SortCode";
+ colSortCode.Name = "colSortCode";
+ colSortCode.Visible = true;
+ colSortCode.VisibleIndex = 7;
+ colSortCode.Width = 53;
+ //
+ // colMaxLevel
+ //
+ colMaxLevel.FieldName = "MaxLevel";
+ colMaxLevel.Name = "colMaxLevel";
+ colMaxLevel.Visible = true;
+ colMaxLevel.VisibleIndex = 6;
+ colMaxLevel.Width = 68;
//
// dockManager1
//
@@ -253,7 +289,7 @@
dockPanel1.Name = "dockPanel1";
dockPanel1.OriginalSize = new Size(200, 200);
dockPanel1.Size = new Size(200, 520);
- dockPanel1.Text = "鍠峰ご绯诲垪";
+ dockPanel1.Text = "姘存睜绯诲垪";
//
// dockPanel1_Container
//
@@ -279,13 +315,6 @@
barBtnValveLine.Id = 22;
barBtnValveLine.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnValveLine.ImageOptions.SvgImage");
barBtnValveLine.Name = "barBtnValveLine";
- //
- // barBtnTankChart
- //
- barBtnTankChart.Caption = "barButtonItem1";
- barBtnTankChart.Id = 25;
- barBtnTankChart.Name = "barBtnTankChart";
- barBtnTankChart.ItemClick += barBtnTankChart_ItemClick;
//
// TankManageMainPage
//
@@ -324,7 +353,6 @@
private DevExpress.XtraGrid.GridControl gridControl1;
private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
private DevExpress.XtraGrid.Columns.GridColumn colName;
- private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
private DevExpress.XtraBars.Docking.DockManager dockManager1;
private DevExpress.XtraBars.Docking.DockPanel dockPanel1;
@@ -334,9 +362,13 @@
private BindingSource TankViewModelBindingSource;
private TankTreeListCtrl TankTreeListCtrl1;
private DevExpress.XtraBars.BarButtonItem barBtnSetCoefficient;
- private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
- private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
private DevExpress.XtraBars.BarButtonItem barBtnTankChart;
private DevExpress.XtraBars.BarButtonItem barBtnValveLine;
+ private DevExpress.XtraGrid.Columns.GridColumn colDN;
+ private DevExpress.XtraGrid.Columns.GridColumn colMinLevel;
+ private DevExpress.XtraGrid.Columns.GridColumn colMinVol;
+ private DevExpress.XtraGrid.Columns.GridColumn colOverFlow;
+ private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
+ private DevExpress.XtraGrid.Columns.GridColumn colMaxLevel;
}
}
--
Gitblit v1.9.3