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

yangyin

2024-08-21 04e1d0a290ff76bf623bd9de075b350b8b77ba25

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

 BLL/HStation.BLL.Organize.Core/HStation.BLL.Organize.Core.csproj

@@ -11,7 +11,7 @@
  </ItemGroup>

  <ItemGroup>
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.2" />
    <PackageReference Include="Yw.BLL.Auth.Core" Version="3.1.5" />
  </ItemGroup>

  <ItemGroup>

 Desktop/HStation.DeskTop.Xhs.Main/Login/LoginFrm.cs

@@ -45,7 +45,7 @@

        private void btnLogin_Click(object sender, EventArgs e)
        {
            LocalLogin();
            Login();
        }

        /// <summary>

 Vmo/HStation.Vmo.Assets.Core/PumpMainAndPartMap.cs

ÎļþÃû´Ó Vmo/HStation.Vmo.Assets.Core/Class1.cs ÐÞ¸Ä
@@ -1,12 +1,7 @@
namespace HStation.Vmo
{
    public class PumpMainAndPartMap
    public class PumpMainAndPartMap : Yw.Vmo.BaseVmo
    {
        /// <summary>
        /// ID
        /// </summary>
        public long ID { get; set; }

        /// <summary>
        /// æ³µç³»åˆ—ID
        /// </summary>

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain/ChoicePumpMainDlg.Designer.cs

@@ -35,6 +35,7 @@
            navigationPage1 = new DevExpress.XtraBars.Navigation.NavigationPage();
            pumpMainChoicePage = new PumpMainChoicePage();
            navigationPage2 = new DevExpress.XtraBars.Navigation.NavigationPage();
            valveChoicePage1 = new ValveChoicePage();
            btnPrev = new DevExpress.XtraEditors.SimpleButton();
            btnNext = new DevExpress.XtraEditors.SimpleButton();
            stepProgressBar1 = new DevExpress.XtraEditors.StepProgressBar();
@@ -46,10 +47,9 @@
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            itemForComplete = new DevExpress.XtraLayout.LayoutControlItem();
            itemForPrev = new DevExpress.XtraLayout.LayoutControlItem();
            itemForNext = new DevExpress.XtraLayout.LayoutControlItem();
            itemForCancel = new DevExpress.XtraLayout.LayoutControlItem();
            ValveChoicePage = new ValveChoicePage();
            itemForNext = new DevExpress.XtraLayout.LayoutControlItem();
            itemForPrev = new DevExpress.XtraLayout.LayoutControlItem();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)navigationFrame1).BeginInit();
@@ -62,9 +62,9 @@
            ((ISupportInitialize)layoutControlItem2).BeginInit();
            ((ISupportInitialize)emptySpaceItem1).BeginInit();
            ((ISupportInitialize)itemForComplete).BeginInit();
            ((ISupportInitialize)itemForPrev).BeginInit();
            ((ISupportInitialize)itemForNext).BeginInit();
            ((ISupportInitialize)itemForCancel).BeginInit();
            ((ISupportInitialize)itemForNext).BeginInit();
            ((ISupportInitialize)itemForPrev).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -78,6 +78,7 @@
            layoutControl1.Dock = DockStyle.Fill;
            layoutControl1.Location = new Point(0, 0);
            layoutControl1.Name = "layoutControl1";
            layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(1222, 300, 650, 400);
            layoutControl1.Root = Root;
            layoutControl1.Size = new Size(929, 557);
            layoutControl1.TabIndex = 6;
@@ -87,9 +88,11 @@
            // 
            btnComplete.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            btnComplete.Appearance.Options.UseBackColor = true;
            btnComplete.Location = new Point(808, 523);
            btnComplete.Location = new Point(813, 523);
            btnComplete.MaximumSize = new Size(104, 0);
            btnComplete.MinimumSize = new Size(104, 0);
            btnComplete.Name = "btnComplete";
            btnComplete.Size = new Size(109, 22);
            btnComplete.Size = new Size(104, 22);
            btnComplete.StyleController = layoutControl1;
            btnComplete.TabIndex = 6;
            btnComplete.Text = "完成";
@@ -118,24 +121,33 @@
            // 
            pumpMainChoicePage.Dock = DockStyle.Fill;
            pumpMainChoicePage.Location = new Point(0, 0);
            pumpMainChoicePage.Name = "pumpMainChoicePage1";
            pumpMainChoicePage.Name = "pumpMainChoicePage";
            pumpMainChoicePage.Size = new Size(905, 433);
            pumpMainChoicePage.TabIndex = 0;
            // 
            // navigationPage2
            // 
            navigationPage2.Caption = "navigationPage2";
            navigationPage2.Controls.Add(ValveChoicePage);
            navigationPage2.Controls.Add(valveChoicePage1);
            navigationPage2.Name = "navigationPage2";
            navigationPage2.Size = new Size(905, 433);
            // 
            // valveChoicePage1
            // 
            valveChoicePage1.Dock = DockStyle.Top;
            valveChoicePage1.Location = new Point(0, 0);
            valveChoicePage1.Name = "valveChoicePage1";
            valveChoicePage1.Size = new Size(905, 150);
            valveChoicePage1.TabIndex = 0;
            // 
            // btnPrev
            // 
            btnPrev.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            btnPrev.Appearance.Options.UseBackColor = true;
            btnPrev.Location = new Point(712, 523);
            btnPrev.Location = new Point(489, 523);
            btnPrev.MinimumSize = new Size(104, 0);
            btnPrev.Name = "btnPrev";
            btnPrev.Size = new Size(92, 22);
            btnPrev.Size = new Size(104, 22);
            btnPrev.StyleController = layoutControl1;
            btnPrev.TabIndex = 5;
            btnPrev.Text = "<上一步";
@@ -145,9 +157,11 @@
            // 
            btnNext.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
            btnNext.Appearance.Options.UseBackColor = true;
            btnNext.Location = new Point(605, 523);
            btnNext.Location = new Point(597, 523);
            btnNext.MaximumSize = new Size(104, 0);
            btnNext.MinimumSize = new Size(104, 0);
            btnNext.Name = "btnNext";
            btnNext.Size = new Size(103, 22);
            btnNext.Size = new Size(104, 22);
            btnNext.StyleController = layoutControl1;
            btnNext.TabIndex = 4;
            btnNext.Text = "下一步>";
@@ -185,7 +199,9 @@
            // 
            btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
            btnCancel.Appearance.Options.UseBackColor = true;
            btnCancel.Location = new Point(497, 523);
            btnCancel.Location = new Point(705, 523);
            btnCancel.MaximumSize = new Size(104, 0);
            btnCancel.MinimumSize = new Size(104, 0);
            btnCancel.Name = "btnCancel";
            btnCancel.Size = new Size(104, 22);
            btnCancel.StyleController = layoutControl1;
@@ -197,7 +213,7 @@
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, emptySpaceItem1, itemForComplete, itemForPrev, itemForNext, itemForCancel });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, emptySpaceItem1, itemForComplete, itemForCancel, itemForNext, itemForPrev });
            Root.Name = "Root";
            Root.Size = new Size(929, 557);
            Root.TextVisible = false;
@@ -225,52 +241,56 @@
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 511);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(485, 26);
            emptySpaceItem1.Size = new Size(477, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // itemForComplete
            // 
            itemForComplete.Control = btnComplete;
            itemForComplete.Location = new Point(796, 511);
            itemForComplete.Location = new Point(801, 511);
            itemForComplete.MaxSize = new Size(108, 26);
            itemForComplete.MinSize = new Size(108, 26);
            itemForComplete.Name = "itemForComplete";
            itemForComplete.Size = new Size(113, 26);
            itemForComplete.Size = new Size(108, 26);
            itemForComplete.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForComplete.TextSize = new Size(0, 0);
            itemForComplete.TextVisible = false;
            // 
            // itemForPrev
            // 
            itemForPrev.Control = btnPrev;
            itemForPrev.Location = new Point(700, 511);
            itemForPrev.Name = "itemForPrev";
            itemForPrev.Size = new Size(96, 26);
            itemForPrev.TextSize = new Size(0, 0);
            itemForPrev.TextVisible = false;
            // 
            // itemForNext
            // 
            itemForNext.Control = btnNext;
            itemForNext.Location = new Point(593, 511);
            itemForNext.Name = "itemForNext";
            itemForNext.Size = new Size(107, 26);
            itemForNext.TextSize = new Size(0, 0);
            itemForNext.TextVisible = false;
            // 
            // itemForCancel
            // 
            itemForCancel.Control = btnCancel;
            itemForCancel.Location = new Point(485, 511);
            itemForCancel.Location = new Point(693, 511);
            itemForCancel.MaxSize = new Size(108, 26);
            itemForCancel.MinSize = new Size(108, 26);
            itemForCancel.Name = "itemForCancel";
            itemForCancel.Size = new Size(108, 26);
            itemForCancel.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForCancel.TextSize = new Size(0, 0);
            itemForCancel.TextVisible = false;
            // 
            // ValveChoicePage
            // itemForNext
            // 
            ValveChoicePage.Dock = DockStyle.Fill;
            ValveChoicePage.Location = new Point(0, 0);
            ValveChoicePage.Name = "xtraUserControl11";
            ValveChoicePage.Size = new Size(905, 433);
            ValveChoicePage.TabIndex = 0;
            itemForNext.Control = btnNext;
            itemForNext.Location = new Point(585, 511);
            itemForNext.MaxSize = new Size(108, 26);
            itemForNext.MinSize = new Size(108, 26);
            itemForNext.Name = "itemForNext";
            itemForNext.Size = new Size(108, 26);
            itemForNext.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForNext.TextSize = new Size(0, 0);
            itemForNext.TextVisible = false;
            // 
            // itemForPrev
            // 
            itemForPrev.Control = btnPrev;
            itemForPrev.Location = new Point(477, 511);
            itemForPrev.MaxSize = new Size(108, 26);
            itemForPrev.MinSize = new Size(108, 26);
            itemForPrev.Name = "itemForPrev";
            itemForPrev.Size = new Size(108, 26);
            itemForPrev.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            itemForPrev.TextSize = new Size(0, 0);
            itemForPrev.TextVisible = false;
            // 
            // ChoicePumpMainDlg
            // 
@@ -293,9 +313,9 @@
            ((ISupportInitialize)layoutControlItem2).EndInit();
            ((ISupportInitialize)emptySpaceItem1).EndInit();
            ((ISupportInitialize)itemForComplete).EndInit();
            ((ISupportInitialize)itemForPrev).EndInit();
            ((ISupportInitialize)itemForNext).EndInit();
            ((ISupportInitialize)itemForCancel).EndInit();
            ((ISupportInitialize)itemForNext).EndInit();
            ((ISupportInitialize)itemForPrev).EndInit();
            ResumeLayout(false);
        }

@@ -321,6 +341,6 @@
        private DevExpress.XtraLayout.LayoutControlItem itemForPrev;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private PumpMainChoicePage pumpMainChoicePage;
        private ValveChoicePage ValveChoicePage;
         private ValveChoicePage valveChoicePage1;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-scheme/02-asset-mgr/PumpMain/ChoicePumpMainDlg.cs

@@ -20,7 +20,7 @@
            _wizard.SelectedPageStateChangedEvent += _wizard_SelectedPageStateChangedEvent; ;
            _wizard.InitialManager(new IWizardPage<PumpMainChoiceViewModel>[] {
                this.pumpMainChoicePage,
                this.ValveChoicePage
                this.valveChoicePage1
             });
        }