计算修改

lixiaojun

2024-10-29 c2bb91cc8706cdeb18b0835a36a4266891daccf3

计算修改

 BLL/HStation.BLL.TransferFile.Core/04-bll/02-revit/TransferRevitFile_File.cs

@@ -19,7 +19,6 @@
        public async Task<string> Download(string StorageHouse, string StorageCode)
        {
            return await new Yw.BLL.HttpFileHelper().Download(_downloadUrl, StorageHouse, StorageCode, ConfigHelper.CALType);

        }



 WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/00-core/SetHydroCalcuPrefixCtrl.Designer.cs

@@ -124,6 +124,7 @@
            groupForPump.GroupStyle = DevExpress.Utils.GroupStyle.Card;
            groupForPump.HeaderButtonsLocation = DevExpress.Utils.GroupElementLocation.AfterText;
            groupForPump.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { itemForPump });
            groupForPump.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Flow;
            groupForPump.Location = new Point(0, 108);
            groupForPump.Name = "groupForPump";
            groupForPump.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/02-pump/SetHydroPumpCalcuPrefixListCtrl.Designer.cs

@@ -29,88 +29,15 @@
        private void InitializeComponent()
        {
            flowLayoutPanel1 = new FlowLayoutPanel();
            setHydroPumpCalcuPrefixCtrl1 = new SetHydroPumpCalcuPrefixCtrl();
            setHydroPumpCalcuPrefixCtrl2 = new SetHydroPumpCalcuPrefixCtrl();
            setHydroPumpCalcuPrefixCtrl3 = new SetHydroPumpCalcuPrefixCtrl();
            setHydroPumpCalcuPrefixCtrl4 = new SetHydroPumpCalcuPrefixCtrl();
            setHydroPumpCalcuPrefixCtrl5 = new SetHydroPumpCalcuPrefixCtrl();
            setHydroPumpCalcuPrefixCtrl6 = new SetHydroPumpCalcuPrefixCtrl();
            setHydroPumpCalcuPrefixCtrl7 = new SetHydroPumpCalcuPrefixCtrl();
            setHydroPumpCalcuPrefixCtrl8 = new SetHydroPumpCalcuPrefixCtrl();
            flowLayoutPanel1.SuspendLayout();
            SuspendLayout();
            // 
            // flowLayoutPanel1
            // 
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl1);
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl2);
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl3);
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl4);
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl5);
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl6);
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl7);
            flowLayoutPanel1.Controls.Add(setHydroPumpCalcuPrefixCtrl8);
            flowLayoutPanel1.Dock = DockStyle.Fill;
            flowLayoutPanel1.Location = new Point(0, 0);
            flowLayoutPanel1.Name = "flowLayoutPanel1";
            flowLayoutPanel1.Size = new Size(1063, 249);
            flowLayoutPanel1.Size = new Size(791, 165);
            flowLayoutPanel1.TabIndex = 0;
            // 
            // setHydroPumpCalcuPrefixCtrl1
            // 
            setHydroPumpCalcuPrefixCtrl1.Location = new Point(3, 3);
            setHydroPumpCalcuPrefixCtrl1.Name = "setHydroPumpCalcuPrefixCtrl1";
            setHydroPumpCalcuPrefixCtrl1.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl1.TabIndex = 0;
            // 
            // setHydroPumpCalcuPrefixCtrl2
            // 
            setHydroPumpCalcuPrefixCtrl2.Location = new Point(341, 3);
            setHydroPumpCalcuPrefixCtrl2.Name = "setHydroPumpCalcuPrefixCtrl2";
            setHydroPumpCalcuPrefixCtrl2.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl2.TabIndex = 1;
            // 
            // setHydroPumpCalcuPrefixCtrl3
            // 
            setHydroPumpCalcuPrefixCtrl3.Location = new Point(679, 3);
            setHydroPumpCalcuPrefixCtrl3.Name = "setHydroPumpCalcuPrefixCtrl3";
            setHydroPumpCalcuPrefixCtrl3.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl3.TabIndex = 2;
            // 
            // setHydroPumpCalcuPrefixCtrl4
            // 
            setHydroPumpCalcuPrefixCtrl4.Location = new Point(3, 80);
            setHydroPumpCalcuPrefixCtrl4.Name = "setHydroPumpCalcuPrefixCtrl4";
            setHydroPumpCalcuPrefixCtrl4.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl4.TabIndex = 3;
            // 
            // setHydroPumpCalcuPrefixCtrl5
            // 
            setHydroPumpCalcuPrefixCtrl5.Location = new Point(341, 80);
            setHydroPumpCalcuPrefixCtrl5.Name = "setHydroPumpCalcuPrefixCtrl5";
            setHydroPumpCalcuPrefixCtrl5.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl5.TabIndex = 4;
            // 
            // setHydroPumpCalcuPrefixCtrl6
            // 
            setHydroPumpCalcuPrefixCtrl6.Location = new Point(679, 80);
            setHydroPumpCalcuPrefixCtrl6.Name = "setHydroPumpCalcuPrefixCtrl6";
            setHydroPumpCalcuPrefixCtrl6.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl6.TabIndex = 5;
            // 
            // setHydroPumpCalcuPrefixCtrl7
            // 
            setHydroPumpCalcuPrefixCtrl7.Location = new Point(3, 157);
            setHydroPumpCalcuPrefixCtrl7.Name = "setHydroPumpCalcuPrefixCtrl7";
            setHydroPumpCalcuPrefixCtrl7.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl7.TabIndex = 6;
            // 
            // setHydroPumpCalcuPrefixCtrl8
            // 
            setHydroPumpCalcuPrefixCtrl8.Location = new Point(341, 157);
            setHydroPumpCalcuPrefixCtrl8.Name = "setHydroPumpCalcuPrefixCtrl8";
            setHydroPumpCalcuPrefixCtrl8.Size = new Size(332, 71);
            setHydroPumpCalcuPrefixCtrl8.TabIndex = 7;
            // 
            // SetHydroPumpCalcuPrefixListCtrl
            // 
@@ -118,21 +45,12 @@
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(flowLayoutPanel1);
            Name = "SetHydroPumpCalcuPrefixListCtrl";
            Size = new Size(1063, 249);
            flowLayoutPanel1.ResumeLayout(false);
            Size = new Size(791, 165);
            ResumeLayout(false);
        }

        #endregion

        private FlowLayoutPanel flowLayoutPanel1;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl1;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl2;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl3;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl4;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl5;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl6;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl7;
        private SetHydroPumpCalcuPrefixCtrl setHydroPumpCalcuPrefixCtrl8;
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/11-prefix/02-pump/SetHydroPumpCalcuPrefixListCtrl.cs

@@ -52,29 +52,24 @@
            }
            if (_allCalcuPrefixCtrlList == null)
            {
                //_allCalcuPrefixCtrlList = new List<SetHydroPumpCalcuPrefixCtrl>();
                //this.tablePanel.Rows.Add(new TablePanelRow(TablePanelEntityStyle.Relative, 55F));
                //if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
               // {
                   // for (int i = 0; i < _hydroInfo.Pumps.Count; i++)
                   // {
                    //    this.tablePanel.Columns.Add(new TablePanelColumn(TablePanelEntityStyle.AutoSize, 250F));
                    //    var ctrl = new SetHydroPumpCalcuPrefixCtrl();
                    //    ctrl.Anchor = AnchorStyles.Left | AnchorStyles.Top | AnchorStyles.Bottom;
                    //    ctrl.ViewParterEvent += (pump) =>
                    //    {
                    //        if (pump == null)
                    //        {
                    //            return;
                    //        }
                    //        this.ViewParterEvent?.Invoke(pump);
                    //    };
                    //    _allCalcuPrefixCtrlList.Add(ctrl);
                    //    this.tablePanel.Controls.Add(ctrl);
                    //    this.tablePanel.SetCell(ctrl, 0, i);
                    //}
                    //this.tablePanel.Columns.Add(new TablePanelColumn(TablePanelEntityStyle.AutoSize, 150F));
                //}
                _allCalcuPrefixCtrlList = new List<SetHydroPumpCalcuPrefixCtrl>();
                if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count > 0)
                {
                    for (int i = 0; i < _hydroInfo.Pumps.Count; i++)
                    {
                        var ctrl = new SetHydroPumpCalcuPrefixCtrl();
                        ctrl.ViewParterEvent += (pump) =>
                        {
                            if (pump == null)
                            {
                                return;
                            }
                            this.ViewParterEvent?.Invoke(pump);
                        };
                        _allCalcuPrefixCtrlList.Add(ctrl);
                        this.flowLayoutPanel1.Controls.Add(ctrl);
                    }
                }
            }
            if (_hydroInfo.Pumps != null && _hydroInfo.Pumps.Count == _allCalcuPrefixCtrlList.Count)
            {