From af5eeb8797d88e142410a9e82e84291355e7c336 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期三, 02 四月 2025 17:01:57 +0800
Subject: [PATCH] --成套设备曲线增加 --用水当量逻辑改变
---
WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs | 68 ++++++++++++++-------------------
1 files changed, 29 insertions(+), 39 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs
index 0c27e7f..b2752cc 100644
--- a/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.WE/WaterWE/WaterEquivalentMgr.designer.cs
@@ -46,17 +46,16 @@
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barBtnRefresh = new DevExpress.XtraBars.BarButtonItem();
barCekSearch = new DevExpress.XtraBars.BarCheckItem();
- barBtnSetting = new DevExpress.XtraBars.BarButtonItem();
+ BtnAdd = new DevExpress.XtraBars.BarButtonItem();
BtnDelete = new DevExpress.XtraBars.BarButtonItem();
BtnInfo = new DevExpress.XtraBars.BarButtonItem();
+ BtnEdit = new DevExpress.XtraBars.BarButtonItem();
ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
dockPanel1 = new DevExpress.XtraBars.Docking.DockPanel();
dockPanel1_Container = new DevExpress.XtraBars.Docking.ControlContainer();
catalogueCtrl1 = new CatalogueCtrl();
- barBtnEdit = new DevExpress.XtraBars.BarButtonItem();
- barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
barBtnSave = new DevExpress.XtraBars.BarButtonItem();
((ISupportInitialize)gridControl1).BeginInit();
((ISupportInitialize)itemViewModelBindingSource).BeginInit();
@@ -101,8 +100,6 @@
colName.FieldName = "Name";
colName.MinWidth = 23;
colName.Name = "colName";
- colName.Visible = true;
- colName.VisibleIndex = 0;
colName.Width = 86;
//
// colUtensilName
@@ -111,7 +108,7 @@
colUtensilName.MinWidth = 23;
colUtensilName.Name = "colUtensilName";
colUtensilName.Visible = true;
- colUtensilName.VisibleIndex = 1;
+ colUtensilName.VisibleIndex = 0;
colUtensilName.Width = 86;
//
// colUtensilCount
@@ -120,7 +117,7 @@
colUtensilCount.MinWidth = 23;
colUtensilCount.Name = "colUtensilCount";
colUtensilCount.Visible = true;
- colUtensilCount.VisibleIndex = 2;
+ colUtensilCount.VisibleIndex = 1;
colUtensilCount.Width = 86;
//
// colRatedFlow
@@ -129,7 +126,7 @@
colRatedFlow.MinWidth = 23;
colRatedFlow.Name = "colRatedFlow";
colRatedFlow.Visible = true;
- colRatedFlow.VisibleIndex = 3;
+ colRatedFlow.VisibleIndex = 2;
colRatedFlow.Width = 86;
//
// colMinRatedFlow
@@ -138,7 +135,7 @@
colMinRatedFlow.MinWidth = 23;
colMinRatedFlow.Name = "colMinRatedFlow";
colMinRatedFlow.Visible = true;
- colMinRatedFlow.VisibleIndex = 4;
+ colMinRatedFlow.VisibleIndex = 3;
colMinRatedFlow.Width = 86;
//
// colDescription
@@ -147,7 +144,7 @@
colDescription.MinWidth = 23;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 5;
+ colDescription.VisibleIndex = 4;
colDescription.Width = 86;
//
// ribbonControl1
@@ -156,10 +153,10 @@
ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
ribbonControl1.ExpandCollapseItem.Id = 0;
ribbonControl1.ItemPanelStyle = DevExpress.XtraBars.Ribbon.RibbonItemPanelStyle.Classic;
- ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnRefresh, barCekSearch, barBtnSetting, BtnDelete, BtnInfo });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnRefresh, barCekSearch, BtnAdd, BtnDelete, BtnInfo, BtnEdit });
ribbonControl1.Location = new Point(0, 0);
ribbonControl1.Margin = new Padding(3, 4, 3, 4);
- ribbonControl1.MaxItemId = 33;
+ ribbonControl1.MaxItemId = 34;
ribbonControl1.Name = "ribbonControl1";
ribbonControl1.OptionsMenuMinWidth = 377;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
@@ -185,13 +182,13 @@
barCekSearch.Name = "barCekSearch";
barCekSearch.CheckedChanged += barCekSearch_CheckedChanged;
//
- // barBtnSetting
+ // BtnAdd
//
- barBtnSetting.Caption = "璁剧疆";
- barBtnSetting.Id = 29;
- barBtnSetting.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnSetting.ImageOptions.SvgImage");
- barBtnSetting.Name = "barBtnSetting";
- barBtnSetting.ItemClick += barBtnEdit_ItemClick;
+ BtnAdd.Caption = "娣诲姞";
+ BtnAdd.Id = 29;
+ BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
+ BtnAdd.Name = "BtnAdd";
+ BtnAdd.ItemClick += barBtnEdit_ItemClick;
//
// BtnDelete
//
@@ -210,6 +207,14 @@
BtnInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
BtnInfo.ItemClick += BtnInfo_ItemClick;
//
+ // BtnEdit
+ //
+ BtnEdit.Caption = "缂栬緫";
+ BtnEdit.Id = 33;
+ BtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnEdit.ImageOptions.SvgImage");
+ BtnEdit.Name = "BtnEdit";
+ BtnEdit.ItemClick += BtnEdit_ItemClick;
+ //
// ribbonPage
//
ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
@@ -218,10 +223,11 @@
//
// ribbonPageGroup1
//
- ribbonPageGroup1.ItemLinks.Add(barBtnSetting);
+ ribbonPageGroup1.ItemLinks.Add(BtnAdd);
+ ribbonPageGroup1.ItemLinks.Add(BtnEdit);
+ ribbonPageGroup1.ItemLinks.Add(BtnDelete);
ribbonPageGroup1.ItemLinks.Add(barCekSearch);
ribbonPageGroup1.ItemLinks.Add(barBtnRefresh);
- ribbonPageGroup1.ItemLinks.Add(BtnDelete);
ribbonPageGroup1.ItemLinks.Add(BtnInfo);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "鍩虹";
@@ -265,21 +271,6 @@
catalogueCtrl1.Name = "catalogueCtrl1";
catalogueCtrl1.Size = new Size(199, 720);
catalogueCtrl1.TabIndex = 0;
- //
- // barBtnEdit
- //
- barBtnEdit.Caption = "淇敼";
- barBtnEdit.Id = 27;
- barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
- barBtnEdit.Name = "barBtnEdit";
- barBtnEdit.ItemClick += barBtnEdit_ItemClick;
- //
- // barBtnAdd
- //
- barBtnAdd.Caption = "娣诲姞";
- barBtnAdd.Id = 26;
- barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
- barBtnAdd.Name = "barBtnAdd";
//
// barBtnSave
//
@@ -331,11 +322,10 @@
private DevExpress.XtraGrid.Columns.GridColumn colRatedFlow;
private DevExpress.XtraGrid.Columns.GridColumn colMinRatedFlow;
private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- private DevExpress.XtraBars.BarButtonItem barBtnSetting;
- private DevExpress.XtraBars.BarButtonItem barBtnEdit;
- private DevExpress.XtraBars.BarButtonItem barBtnAdd;
- private DevExpress.XtraBars.BarButtonItem barBtnSave;
+ private DevExpress.XtraBars.BarButtonItem BtnAdd;
+ private DevExpress.XtraBars.BarButtonItem barBtnSave;
private DevExpress.XtraBars.BarButtonItem BtnDelete;
private DevExpress.XtraBars.BarButtonItem BtnInfo;
+ private DevExpress.XtraBars.BarButtonItem BtnEdit;
}
}
--
Gitblit v1.9.3