Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

lixiaojun

2025-02-17 ad8f523428e7f319700c226707e3cdfe389d6539

 WinFrmUI/PBS.WinFrmUI.WE.Core/WaterUtensil/WaterUtensilMgr.designer.cs

@@ -2,7 +2,7 @@
using System.ComponentModel;
using System.Windows.Forms;

namespace HStation.WinFrmUI.WE
namespace PBS.WinFrmUI.WE
{
    partial class WaterUtensilMainPage
    {
@@ -42,15 +42,10 @@
            sidePanel1 = new DevExpress.XtraEditors.SidePanel();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new GridView();
            colID = new DevExpress.XtraGrid.Columns.GridColumn();
            colNO = new DevExpress.XtraGrid.Columns.GridColumn();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colGroupID = new DevExpress.XtraGrid.Columns.GridColumn();
            colRatedFlow = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinRatedFlow = new DevExpress.XtraGrid.Columns.GridColumn();
            colTagName = new DevExpress.XtraGrid.Columns.GridColumn();
            colUseStatus = new DevExpress.XtraGrid.Columns.GridColumn();
            colSortCode = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
            barBtnAdd = new DevExpress.XtraBars.BarButtonItem();
@@ -64,6 +59,7 @@
            barCekSearch = new DevExpress.XtraBars.BarCheckItem();
            ribbonPage = new DevExpress.XtraBars.Ribbon.RibbonPage();
            ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ribbonPageGroup2 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
            ((ISupportInitialize)waterUtensilViewModelBindingSource).BeginInit();
            ((ISupportInitialize)dockManager1).BeginInit();
            dockPanel5.SuspendLayout();
@@ -137,79 +133,44 @@
            // 
            // gridView1
            // 
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colID, colNO, colName, colGroupID, colRatedFlow, colMinRatedFlow, colTagName, colUseStatus, colSortCode, colDescription });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colRatedFlow, colMinRatedFlow, colTagName, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            // 
            // colID
            // 
            colID.FieldName = "ID";
            colID.Name = "colID";
            colID.Visible = true;
            colID.VisibleIndex = 0;
            // 
            // colNO
            // 
            colNO.FieldName = "NO";
            colNO.Name = "colNO";
            colNO.Visible = true;
            colNO.VisibleIndex = 1;
            // 
            // colName
            // 
            colName.FieldName = "Name";
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 2;
            // 
            // colGroupID
            // 
            colGroupID.FieldName = "GroupID";
            colGroupID.Name = "colGroupID";
            colGroupID.Visible = true;
            colGroupID.VisibleIndex = 3;
            colName.VisibleIndex = 0;
            // 
            // colRatedFlow
            // 
            colRatedFlow.FieldName = "RatedFlow";
            colRatedFlow.Name = "colRatedFlow";
            colRatedFlow.Visible = true;
            colRatedFlow.VisibleIndex = 4;
            colRatedFlow.VisibleIndex = 1;
            // 
            // colMinRatedFlow
            // 
            colMinRatedFlow.FieldName = "MinRatedFlow";
            colMinRatedFlow.Name = "colMinRatedFlow";
            colMinRatedFlow.Visible = true;
            colMinRatedFlow.VisibleIndex = 5;
            colMinRatedFlow.VisibleIndex = 2;
            // 
            // colTagName
            // 
            colTagName.FieldName = "TagName";
            colTagName.Name = "colTagName";
            colTagName.Visible = true;
            colTagName.VisibleIndex = 6;
            // 
            // colUseStatus
            // 
            colUseStatus.FieldName = "UseStatus";
            colUseStatus.Name = "colUseStatus";
            colUseStatus.Visible = true;
            colUseStatus.VisibleIndex = 7;
            // 
            // colSortCode
            // 
            colSortCode.FieldName = "SortCode";
            colSortCode.Name = "colSortCode";
            colSortCode.Visible = true;
            colSortCode.VisibleIndex = 8;
            colTagName.VisibleIndex = 3;
            // 
            // colDescription
            // 
            colDescription.FieldName = "Description";
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 9;
            colDescription.VisibleIndex = 4;
            // 
            // ribbonControl1
            // 
@@ -233,6 +194,7 @@
            barBtnAdd.Id = 16;
            barBtnAdd.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnAdd.ImageOptions.SvgImage");
            barBtnAdd.Name = "barBtnAdd";
            barBtnAdd.ItemClick += barBtnAdd_ItemClick;
            // 
            // barBtnEdit
            // 
@@ -240,6 +202,7 @@
            barBtnEdit.Id = 17;
            barBtnEdit.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnEdit.ImageOptions.SvgImage");
            barBtnEdit.Name = "barBtnEdit";
            barBtnEdit.ItemClick += barBtnEdit_ItemClick;
            // 
            // barBtnRefresh
            // 
@@ -247,6 +210,7 @@
            barBtnRefresh.Id = 18;
            barBtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnRefresh.ImageOptions.SvgImage");
            barBtnRefresh.Name = "barBtnRefresh";
            barBtnRefresh.ItemClick += barBtnRefresh_ItemClick;
            // 
            // barBtnDelete
            // 
@@ -254,6 +218,7 @@
            barBtnDelete.Id = 19;
            barBtnDelete.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDelete.ImageOptions.SvgImage");
            barBtnDelete.Name = "barBtnDelete";
            barBtnDelete.ItemClick += barBtnDelete_ItemClick;
            // 
            // barBtnUpdateSortCode
            // 
@@ -261,6 +226,7 @@
            barBtnUpdateSortCode.Id = 20;
            barBtnUpdateSortCode.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateSortCode.ImageOptions.SvgImage");
            barBtnUpdateSortCode.Name = "barBtnUpdateSortCode";
            barBtnUpdateSortCode.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barBtnDetail
            // 
@@ -268,6 +234,7 @@
            barBtnDetail.Id = 22;
            barBtnDetail.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnDetail.ImageOptions.SvgImage");
            barBtnDetail.Name = "barBtnDetail";
            barBtnDetail.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barBtnUpdateTagName
            // 
@@ -275,6 +242,7 @@
            barBtnUpdateTagName.Id = 23;
            barBtnUpdateTagName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateTagName.ImageOptions.SvgImage");
            barBtnUpdateTagName.Name = "barBtnUpdateTagName";
            barBtnUpdateTagName.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barBtnUpdateUseStatus
            // 
@@ -282,6 +250,7 @@
            barBtnUpdateUseStatus.Id = 24;
            barBtnUpdateUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateUseStatus.ImageOptions.SvgImage");
            barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
            barBtnUpdateUseStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barCekSearch
            // 
@@ -292,7 +261,7 @@
            // 
            // ribbonPage
            // 
            ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
            ribbonPage.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1, ribbonPageGroup2 });
            ribbonPage.Name = "ribbonPage";
            ribbonPage.Text = "基础操作";
            // 
@@ -305,10 +274,15 @@
            ribbonPageGroup1.ItemLinks.Add(barBtnUpdateTagName, true);
            ribbonPageGroup1.ItemLinks.Add(barBtnUpdateSortCode);
            ribbonPageGroup1.ItemLinks.Add(barBtnUpdateUseStatus);
            ribbonPageGroup1.ItemLinks.Add(barCekSearch);
            ribbonPageGroup1.ItemLinks.Add(barBtnRefresh);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "基础";
            // 
            // ribbonPageGroup2
            // 
            ribbonPageGroup2.ItemLinks.Add(barCekSearch);
            ribbonPageGroup2.ItemLinks.Add(barBtnRefresh);
            ribbonPageGroup2.Name = "ribbonPageGroup2";
            ribbonPageGroup2.Text = "ribbonPageGroup2";
            // 
            // WaterUtensilMainPage
            // 
@@ -318,7 +292,7 @@
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(sidePanel1);
            Controls.Add(dockPanel5);
            Name = "WaterUtensilMgr";
            Name = "WaterUtensilMainPage";
            Size = new Size(875, 696);
            ((ISupportInitialize)waterUtensilViewModelBindingSource).EndInit();
            ((ISupportInitialize)dockManager1).EndInit();
@@ -338,10 +312,7 @@
        private DevExpress.XtraEditors.SidePanel sidePanel1;
        private DevExpress.XtraGrid.GridControl gridControl1;
        private GridView gridView1;
        private DevExpress.XtraGrid.Columns.GridColumn colID;
        private DevExpress.XtraGrid.Columns.GridColumn colNO;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colGroupID;
        private DevExpress.XtraGrid.Columns.GridColumn colRatedFlow;
        private DevExpress.XtraGrid.Columns.GridColumn colMinRatedFlow;
        private DevExpress.XtraGrid.Columns.GridColumn colTagName;
@@ -363,5 +334,6 @@
        private DevExpress.XtraBars.Docking.DockPanel dockPanel5;
        private DevExpress.XtraBars.Docking.ControlContainer dockPanel5_Container;
        private UtensilGroupCtrl utensilGroupCtrl1;
        private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup2;
    }
}