From 2b7276b2892b6f090e4c0078a20dfdc9da9ab053 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期四, 13 三月 2025 10:32:54 +0800
Subject: [PATCH] --基础界面修改初步提交
---
WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs | 253 +++++++++++++++++++++++++++++--------------------
1 files changed, 149 insertions(+), 104 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs
index 26e021e..85c2a61 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs
@@ -36,18 +36,20 @@
private void InitializeComponent()
{
components = new Container();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(PlaceMgrPage));
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(FacilityMgrPage));
gridControl1 = new DevExpress.XtraGrid.GridControl();
- placeViewModelBindingSource = new BindingSource(components);
+ facilityViewModelBindingSource = new BindingSource(components);
gridView1 = new GridView();
- colID = new DevExpress.XtraGrid.Columns.GridColumn();
- colRegionID = new DevExpress.XtraGrid.Columns.GridColumn();
colName = new DevExpress.XtraGrid.Columns.GridColumn();
- colPlaceType = new DevExpress.XtraGrid.Columns.GridColumn();
- colPlaceInfo = new DevExpress.XtraGrid.Columns.GridColumn();
- colAddress = new DevExpress.XtraGrid.Columns.GridColumn();
+ colWaterSupply = new DevExpress.XtraGrid.Columns.GridColumn();
+ colSupplyMode = new DevExpress.XtraGrid.Columns.GridColumn();
+ colFloor = new DevExpress.XtraGrid.Columns.GridColumn();
+ colFloorHeight = new DevExpress.XtraGrid.Columns.GridColumn();
+ colHouseholds = new DevExpress.XtraGrid.Columns.GridColumn();
+ colMaxWaterDemand = new DevExpress.XtraGrid.Columns.GridColumn();
+ colConstantPressure = new DevExpress.XtraGrid.Columns.GridColumn();
+ colTerminalPressure = new DevExpress.XtraGrid.Columns.GridColumn();
colParas = new DevExpress.XtraGrid.Columns.GridColumn();
- colFlags = new DevExpress.XtraGrid.Columns.GridColumn();
colTagName = new DevExpress.XtraGrid.Columns.GridColumn();
colUseStatus = new DevExpress.XtraGrid.Columns.GridColumn();
colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -60,7 +62,6 @@
barBtnUpdateTagName = new DevExpress.XtraBars.BarButtonItem();
barBtnUpdateUseStatus = new DevExpress.XtraBars.BarButtonItem();
barCekSearch = new DevExpress.XtraBars.BarCheckItem();
- barSubItem1 = new DevExpress.XtraBars.BarSubItem();
btnAddBuilding = new DevExpress.XtraBars.BarButtonItem();
btnAddschool = new DevExpress.XtraBars.BarButtonItem();
btnAddHospital = new DevExpress.XtraBars.BarButtonItem();
@@ -68,13 +69,14 @@
barCkDrag = new DevExpress.XtraBars.BarCheckItem();
barBtnUp = new DevExpress.XtraBars.BarButtonItem();
barBtnDown = new DevExpress.XtraBars.BarButtonItem();
+ BtnAdd = new DevExpress.XtraBars.BarButtonItem();
ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(components);
dragDropEvents1 = new DevExpress.Utils.DragDrop.DragDropEvents(components);
((ISupportInitialize)gridControl1).BeginInit();
- ((ISupportInitialize)placeViewModelBindingSource).BeginInit();
+ ((ISupportInitialize)facilityViewModelBindingSource).BeginInit();
((ISupportInitialize)gridView1).BeginInit();
((ISupportInitialize)ribbonControl1).BeginInit();
((ISupportInitialize)behaviorManager1).BeginInit();
@@ -82,125 +84,173 @@
//
// gridControl1
//
- gridControl1.DataSource = placeViewModelBindingSource;
+ gridControl1.DataSource = facilityViewModelBindingSource;
gridControl1.Dock = DockStyle.Fill;
- gridControl1.Location = new Point(0, 104);
+ gridControl1.EmbeddedNavigator.Margin = new Padding(3, 4, 3, 4);
+ gridControl1.Location = new Point(0, 128);
gridControl1.MainView = gridView1;
+ gridControl1.Margin = new Padding(3, 4, 3, 4);
gridControl1.Name = "gridControl1";
- gridControl1.Size = new Size(818, 577);
+ gridControl1.Size = new Size(935, 748);
gridControl1.TabIndex = 18;
gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
//
- // placeViewModelBindingSource
+ // facilityViewModelBindingSource
//
- placeViewModelBindingSource.DataSource = typeof(PlaceViewModel);
+ facilityViewModelBindingSource.DataSource = typeof(FacilityViewModel);
//
// gridView1
//
behaviorManager1.SetBehaviors(gridView1, new DevExpress.Utils.Behaviors.Behavior[] { DevExpress.Utils.DragDrop.DragDropBehavior.Create(typeof(DevExpress.XtraGrid.Extensions.ColumnViewDragDropSource), true, true, true, true, dragDropEvents1) });
- gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colRegionID, colName, colPlaceType, colPlaceInfo, colAddress, colParas, colFlags, colTagName, colUseStatus, colSortCode, colDescription });
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colWaterSupply, colSupplyMode, colFloor, colFloorHeight, colHouseholds, colMaxWaterDemand, colConstantPressure, colTerminalPressure, colParas, colTagName, colUseStatus, colSortCode, colDescription });
+ gridView1.DetailHeight = 450;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
gridView1.OptionsDetail.EnableMasterViewMode = false;
- //
- // colID
- //
- colID.FieldName = "ID";
- colID.Name = "colID";
- colID.Visible = true;
- colID.VisibleIndex = 0;
- //
- // colRegionID
- //
- colRegionID.FieldName = "RegionID";
- colRegionID.Name = "colRegionID";
- colRegionID.Visible = true;
- colRegionID.VisibleIndex = 1;
+ gridView1.OptionsEditForm.PopupEditFormWidth = 914;
+ gridView1.OptionsView.ShowGroupPanel = false;
//
// colName
//
colName.FieldName = "Name";
+ colName.MinWidth = 25;
colName.Name = "colName";
colName.Visible = true;
- colName.VisibleIndex = 2;
+ colName.VisibleIndex = 0;
+ colName.Width = 94;
//
- // colPlaceType
+ // colWaterSupply
//
- colPlaceType.FieldName = "PlaceType";
- colPlaceType.Name = "colPlaceType";
- colPlaceType.Visible = true;
- colPlaceType.VisibleIndex = 3;
+ colWaterSupply.FieldName = "WaterSupply";
+ colWaterSupply.MinWidth = 25;
+ colWaterSupply.Name = "colWaterSupply";
+ colWaterSupply.Visible = true;
+ colWaterSupply.VisibleIndex = 1;
+ colWaterSupply.Width = 94;
//
- // colPlaceInfo
+ // colSupplyMode
//
- colPlaceInfo.FieldName = "PlaceInfo";
- colPlaceInfo.Name = "colPlaceInfo";
- colPlaceInfo.Visible = true;
- colPlaceInfo.VisibleIndex = 4;
+ colSupplyMode.FieldName = "SupplyMode";
+ colSupplyMode.MinWidth = 25;
+ colSupplyMode.Name = "colSupplyMode";
+ colSupplyMode.Visible = true;
+ colSupplyMode.VisibleIndex = 2;
+ colSupplyMode.Width = 94;
//
- // colAddress
+ // colFloor
//
- colAddress.FieldName = "Address";
- colAddress.Name = "colAddress";
- colAddress.Visible = true;
- colAddress.VisibleIndex = 5;
+ colFloor.FieldName = "Floor";
+ colFloor.MinWidth = 25;
+ colFloor.Name = "colFloor";
+ colFloor.Visible = true;
+ colFloor.VisibleIndex = 3;
+ colFloor.Width = 94;
+ //
+ // colFloorHeight
+ //
+ colFloorHeight.FieldName = "FloorHeight";
+ colFloorHeight.MinWidth = 25;
+ colFloorHeight.Name = "colFloorHeight";
+ colFloorHeight.Visible = true;
+ colFloorHeight.VisibleIndex = 4;
+ colFloorHeight.Width = 94;
+ //
+ // colHouseholds
+ //
+ colHouseholds.FieldName = "Households";
+ colHouseholds.MinWidth = 25;
+ colHouseholds.Name = "colHouseholds";
+ colHouseholds.Visible = true;
+ colHouseholds.VisibleIndex = 5;
+ colHouseholds.Width = 94;
+ //
+ // colMaxWaterDemand
+ //
+ colMaxWaterDemand.FieldName = "MaxWaterDemand";
+ colMaxWaterDemand.MinWidth = 25;
+ colMaxWaterDemand.Name = "colMaxWaterDemand";
+ colMaxWaterDemand.Visible = true;
+ colMaxWaterDemand.VisibleIndex = 6;
+ colMaxWaterDemand.Width = 94;
+ //
+ // colConstantPressure
+ //
+ colConstantPressure.FieldName = "ConstantPressure";
+ colConstantPressure.MinWidth = 25;
+ colConstantPressure.Name = "colConstantPressure";
+ colConstantPressure.Visible = true;
+ colConstantPressure.VisibleIndex = 7;
+ colConstantPressure.Width = 94;
+ //
+ // colTerminalPressure
+ //
+ colTerminalPressure.FieldName = "TerminalPressure";
+ colTerminalPressure.MinWidth = 25;
+ colTerminalPressure.Name = "colTerminalPressure";
+ colTerminalPressure.Visible = true;
+ colTerminalPressure.VisibleIndex = 8;
+ colTerminalPressure.Width = 94;
//
// colParas
//
colParas.FieldName = "Paras";
+ colParas.MinWidth = 25;
colParas.Name = "colParas";
colParas.Visible = true;
- colParas.VisibleIndex = 6;
- //
- // colFlags
- //
- colFlags.FieldName = "Flags";
- colFlags.Name = "colFlags";
- colFlags.Visible = true;
- colFlags.VisibleIndex = 7;
+ colParas.VisibleIndex = 9;
+ colParas.Width = 94;
//
// colTagName
//
colTagName.FieldName = "TagName";
+ colTagName.MinWidth = 25;
colTagName.Name = "colTagName";
colTagName.Visible = true;
- colTagName.VisibleIndex = 8;
+ colTagName.VisibleIndex = 10;
+ colTagName.Width = 94;
//
// colUseStatus
//
colUseStatus.FieldName = "UseStatus";
+ colUseStatus.MinWidth = 25;
colUseStatus.Name = "colUseStatus";
colUseStatus.Visible = true;
- colUseStatus.VisibleIndex = 9;
+ colUseStatus.VisibleIndex = 11;
+ colUseStatus.Width = 94;
//
// colSortCode
//
colSortCode.FieldName = "SortCode";
+ colSortCode.MinWidth = 25;
colSortCode.Name = "colSortCode";
- colSortCode.Visible = true;
- colSortCode.VisibleIndex = 10;
+ colSortCode.Width = 94;
//
// colDescription
//
colDescription.FieldName = "Description";
+ colDescription.MinWidth = 25;
colDescription.Name = "colDescription";
colDescription.Visible = true;
- colDescription.VisibleIndex = 11;
+ colDescription.VisibleIndex = 12;
+ colDescription.Width = 94;
//
// ribbonControl1
//
ribbonControl1.DrawGroupsBorderMode = DefaultBoolean.False;
+ 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, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnDetail, barBtnUpdateTagName, barBtnUpdateUseStatus, barCekSearch, barSubItem1, btnAddBuilding, btnAddschool, btnAddHospital, btnAddShop, barCkDrag, barBtnUp, barBtnDown });
+ ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barBtnEdit, barBtnRefresh, barBtnDelete, barBtnDetail, barBtnUpdateTagName, barBtnUpdateUseStatus, barCekSearch, btnAddBuilding, btnAddschool, btnAddHospital, btnAddShop, barCkDrag, barBtnUp, barBtnDown, BtnAdd });
ribbonControl1.Location = new Point(0, 0);
- ribbonControl1.MaxItemId = 39;
+ ribbonControl1.Margin = new Padding(3, 4, 3, 4);
+ ribbonControl1.MaxItemId = 44;
ribbonControl1.Name = "ribbonControl1";
+ ribbonControl1.OptionsMenuMinWidth = 377;
ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage });
ribbonControl1.ShowApplicationButton = DefaultBoolean.False;
ribbonControl1.ShowExpandCollapseButton = DefaultBoolean.False;
ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide;
- ribbonControl1.Size = new Size(818, 104);
+ ribbonControl1.Size = new Size(935, 128);
ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
//
// barBtnEdit
@@ -255,41 +305,25 @@
barCekSearch.Name = "barCekSearch";
barCekSearch.CheckedChanged += barCekSearch_CheckedChanged;
//
- // barSubItem1
- //
- barSubItem1.Caption = "娣诲姞";
- barSubItem1.Id = 31;
- barSubItem1.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barSubItem1.ImageOptions.SvgImage");
- barSubItem1.LinksPersistInfo.AddRange(new DevExpress.XtraBars.LinkPersistInfo[] { new DevExpress.XtraBars.LinkPersistInfo(btnAddBuilding), new DevExpress.XtraBars.LinkPersistInfo(btnAddschool), new DevExpress.XtraBars.LinkPersistInfo(btnAddHospital), new DevExpress.XtraBars.LinkPersistInfo(btnAddShop) });
- barSubItem1.Name = "barSubItem1";
- //
// btnAddBuilding
//
- btnAddBuilding.Caption = "灏忓尯";
- btnAddBuilding.Id = 32;
+ btnAddBuilding.Id = 40;
btnAddBuilding.Name = "btnAddBuilding";
- btnAddBuilding.ItemClick += btnAddBuilding_ItemClick;
//
// btnAddschool
//
- btnAddschool.Caption = "瀛︽牎";
- btnAddschool.Id = 33;
+ btnAddschool.Id = 41;
btnAddschool.Name = "btnAddschool";
- btnAddschool.ItemClick += btnAddschool_ItemClick;
//
// btnAddHospital
//
- btnAddHospital.Caption = "鍖婚櫌";
- btnAddHospital.Id = 34;
+ btnAddHospital.Id = 42;
btnAddHospital.Name = "btnAddHospital";
- btnAddHospital.ItemClick += btnAddHospital_ItemClick;
//
// btnAddShop
//
- btnAddShop.Caption = "鍟嗛摵";
- btnAddShop.Id = 35;
+ btnAddShop.Id = 43;
btnAddShop.Name = "btnAddShop";
- btnAddShop.ItemClick += btnAddShop_ItemClick;
//
// barCkDrag
//
@@ -303,7 +337,7 @@
//
barBtnUp.Caption = "涓婄Щ";
barBtnUp.Id = 37;
- barBtnUp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem1.ImageOptions.SvgImage");
+ barBtnUp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUp.ImageOptions.SvgImage");
barBtnUp.Name = "barBtnUp";
barBtnUp.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnUp.ItemClick += barButtonItem1_ItemClick;
@@ -312,10 +346,18 @@
//
barBtnDown.Caption = "涓嬬Щ";
barBtnDown.Id = 38;
- barBtnDown.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem2.ImageOptions.SvgImage");
+ barBtnDown.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDown.ImageOptions.SvgImage");
barBtnDown.Name = "barBtnDown";
barBtnDown.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.SmallWithText;
barBtnDown.ItemClick += barBtnDown_ItemClick;
+ //
+ // BtnAdd
+ //
+ BtnAdd.Caption = "娣诲姞";
+ BtnAdd.Id = 39;
+ BtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnAdd.ImageOptions.SvgImage");
+ BtnAdd.Name = "BtnAdd";
+ BtnAdd.ItemClick += BtnAdd_ItemClick;
//
// ribbonPage
//
@@ -325,7 +367,7 @@
//
// ribbonPageGroup1
//
- ribbonPageGroup1.ItemLinks.Add(barSubItem1);
+ ribbonPageGroup1.ItemLinks.Add(BtnAdd);
ribbonPageGroup1.ItemLinks.Add(barBtnEdit);
ribbonPageGroup1.ItemLinks.Add(barBtnDelete);
ribbonPageGroup1.ItemLinks.Add(barBtnDetail);
@@ -348,18 +390,19 @@
//
dragDropEvents1.DragDrop += dragDropEvents1_DragDrop;
//
- // PlaceMgrPage
+ // FacilityMgrPage
//
Appearance.BackColor = SystemColors.Control;
Appearance.Options.UseBackColor = true;
- AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(gridControl1);
Controls.Add(ribbonControl1);
- Name = "PlaceMgrPage";
- Size = new Size(818, 681);
+ Margin = new Padding(3, 5, 3, 5);
+ Name = "FacilityMgrPage";
+ Size = new Size(935, 876);
((ISupportInitialize)gridControl1).EndInit();
- ((ISupportInitialize)placeViewModelBindingSource).EndInit();
+ ((ISupportInitialize)facilityViewModelBindingSource).EndInit();
((ISupportInitialize)gridView1).EndInit();
((ISupportInitialize)ribbonControl1).EndInit();
((ISupportInitialize)behaviorManager1).EndInit();
@@ -380,20 +423,6 @@
private DevExpress.XtraBars.BarButtonItem barBtnUpdateTagName;
private DevExpress.XtraBars.BarButtonItem barBtnUpdateUseStatus;
private DevExpress.XtraBars.BarCheckItem barCekSearch;
- private BindingSource placeViewModelBindingSource;
- private DevExpress.XtraGrid.Columns.GridColumn colID;
- private DevExpress.XtraGrid.Columns.GridColumn colRegionID;
- private DevExpress.XtraGrid.Columns.GridColumn colName;
- private DevExpress.XtraGrid.Columns.GridColumn colPlaceType;
- private DevExpress.XtraGrid.Columns.GridColumn colPlaceInfo;
- private DevExpress.XtraGrid.Columns.GridColumn colAddress;
- private DevExpress.XtraGrid.Columns.GridColumn colParas;
- private DevExpress.XtraGrid.Columns.GridColumn colFlags;
- private DevExpress.XtraGrid.Columns.GridColumn colTagName;
- private DevExpress.XtraGrid.Columns.GridColumn colUseStatus;
- private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
- private DevExpress.XtraGrid.Columns.GridColumn colDescription;
- private DevExpress.XtraBars.BarSubItem barSubItem1;
private DevExpress.XtraBars.BarButtonItem btnAddBuilding;
private DevExpress.XtraBars.BarButtonItem btnAddschool;
private DevExpress.XtraBars.BarButtonItem btnAddHospital;
@@ -404,5 +433,21 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
private DevExpress.Utils.DragDrop.DragDropEvents dragDropEvents1;
+ private BindingSource facilityViewModelBindingSource;
+ private DevExpress.XtraGrid.Columns.GridColumn colName;
+ private DevExpress.XtraGrid.Columns.GridColumn colWaterSupply;
+ private DevExpress.XtraGrid.Columns.GridColumn colSupplyMode;
+ private DevExpress.XtraGrid.Columns.GridColumn colFloor;
+ private DevExpress.XtraGrid.Columns.GridColumn colFloorHeight;
+ private DevExpress.XtraGrid.Columns.GridColumn colHouseholds;
+ private DevExpress.XtraGrid.Columns.GridColumn colMaxWaterDemand;
+ private DevExpress.XtraGrid.Columns.GridColumn colConstantPressure;
+ private DevExpress.XtraGrid.Columns.GridColumn colTerminalPressure;
+ private DevExpress.XtraGrid.Columns.GridColumn colParas;
+ private DevExpress.XtraGrid.Columns.GridColumn colTagName;
+ private DevExpress.XtraGrid.Columns.GridColumn colUseStatus;
+ private DevExpress.XtraGrid.Columns.GridColumn colSortCode;
+ private DevExpress.XtraGrid.Columns.GridColumn colDescription;
+ private DevExpress.XtraBars.BarButtonItem BtnAdd;
}
}
--
Gitblit v1.9.3