水池单独匹配界面修改

duheng

2024-12-05 b26ae60e85d4a03a2426e6607e7afe89e1c10a5f

水池单独匹配界面修改

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankChartShowDlg.cs

@@ -69,7 +69,7 @@
        {
            this.xtrPerform2dchart1.SetBindingData(curveStr, null);

            this.xtrPerform2dchart1.SetAxisTitle("阀门开度", "损失系数");
            this.xtrPerform2dchart1.SetAxisTitle("流量m³/h", "容积m³");
        }
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.Designer.cs

@@ -39,15 +39,11 @@
            gridControl3 = new DevExpress.XtraGrid.GridControl();
            TankSingleMatchingViewModelBindingSource = new BindingSource(components);
            gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
            colCoefficient = new DevExpress.XtraGrid.Columns.GridColumn();
            colTankLift = new DevExpress.XtraGrid.Columns.GridColumn();
            colName = new DevExpress.XtraGrid.Columns.GridColumn();
            colKeyWord = new DevExpress.XtraGrid.Columns.GridColumn();
            colTankSetting = new DevExpress.XtraGrid.Columns.GridColumn();
            colDescription = new DevExpress.XtraGrid.Columns.GridColumn();
            colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
            colSeriesType = new DevExpress.XtraGrid.Columns.GridColumn();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            ColShowChart = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -62,6 +58,11 @@
            layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            colDN = new DevExpress.XtraGrid.Columns.GridColumn();
            colMaxLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinLevel = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinVol = new DevExpress.XtraGrid.Columns.GridColumn();
            colOverFlow = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((ISupportInitialize)gridControl3).BeginInit();
@@ -111,35 +112,18 @@
            // 
            gridView3.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView3.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCaliber, colCoefficient, colTankLift, colName, colKeyWord, colTankSetting, colDescription, colMaterial, colSeriesType });
            gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colCoefficient, colName, colKeyWord, colTankSetting, colDescription, colDN, colMaxLevel, colMinLevel, colMinVol, colOverFlow });
            gridView3.GridControl = gridControl3;
            gridView3.Name = "gridView3";
            gridView3.OptionsView.ShowGroupPanel = false;
            gridView3.FocusedRowChanged += gridView2_FocusedRowChanged;
            // 
            // colCaliber
            // 
            colCaliber.FieldName = "Caliber";
            colCaliber.Name = "colCaliber";
            colCaliber.Visible = true;
            colCaliber.VisibleIndex = 2;
            colCaliber.Width = 123;
            // 
            // colCoefficient
            // 
            colCoefficient.FieldName = "Coefficient";
            colCoefficient.Name = "colCoefficient";
            colCoefficient.Visible = true;
            colCoefficient.VisibleIndex = 3;
            colCoefficient.Width = 89;
            // 
            // colTankLift
            // 
            colTankLift.FieldName = "TankLift";
            colTankLift.Name = "colTankLift";
            colTankLift.Visible = true;
            colTankLift.VisibleIndex = 4;
            colTankLift.Width = 86;
            colCoefficient.VisibleIndex = 2;
            // 
            // colName
            // 
@@ -147,7 +131,7 @@
            colName.Name = "colName";
            colName.Visible = true;
            colName.VisibleIndex = 0;
            colName.Width = 167;
            colName.Width = 148;
            // 
            // colKeyWord
            // 
@@ -155,39 +139,23 @@
            colKeyWord.Name = "colKeyWord";
            colKeyWord.Visible = true;
            colKeyWord.VisibleIndex = 1;
            colKeyWord.Width = 85;
            colKeyWord.Width = 72;
            // 
            // colTankSetting
            // 
            colTankSetting.FieldName = "TankSetting";
            colTankSetting.Name = "colTankSetting";
            colTankSetting.Visible = true;
            colTankSetting.VisibleIndex = 5;
            colTankSetting.Width = 84;
            colTankSetting.VisibleIndex = 3;
            colTankSetting.Width = 71;
            // 
            // colDescription
            // 
            colDescription.FieldName = "Description";
            colDescription.Name = "colDescription";
            colDescription.Visible = true;
            colDescription.VisibleIndex = 8;
            colDescription.Width = 194;
            // 
            // colMaterial
            // 
            colMaterial.FieldName = "Material";
            colMaterial.Name = "colMaterial";
            colMaterial.Visible = true;
            colMaterial.VisibleIndex = 6;
            colMaterial.Width = 66;
            // 
            // colSeriesType
            // 
            colSeriesType.FieldName = "SeriesType";
            colSeriesType.Name = "colSeriesType";
            colSeriesType.Visible = true;
            colSeriesType.VisibleIndex = 7;
            colSeriesType.Width = 112;
            colDescription.VisibleIndex = 9;
            colDescription.Width = 176;
            // 
            // gridControl1
            // 
@@ -335,6 +303,46 @@
            layoutControlItem5.TextSize = new Size(0, 0);
            layoutControlItem5.TextVisible = false;
            // 
            // colDN
            // 
            colDN.FieldName = "DN";
            colDN.Name = "colDN";
            colDN.Visible = true;
            colDN.VisibleIndex = 4;
            colDN.Width = 63;
            // 
            // colMaxLevel
            // 
            colMaxLevel.FieldName = "MaxLevel";
            colMaxLevel.Name = "colMaxLevel";
            colMaxLevel.Visible = true;
            colMaxLevel.VisibleIndex = 5;
            colMaxLevel.Width = 63;
            // 
            // colMinLevel
            // 
            colMinLevel.FieldName = "MinLevel";
            colMinLevel.Name = "colMinLevel";
            colMinLevel.Visible = true;
            colMinLevel.VisibleIndex = 6;
            colMinLevel.Width = 63;
            // 
            // colMinVol
            // 
            colMinVol.FieldName = "MinVol";
            colMinVol.Name = "colMinVol";
            colMinVol.Visible = true;
            colMinVol.VisibleIndex = 7;
            colMinVol.Width = 63;
            // 
            // colOverFlow
            // 
            colOverFlow.FieldName = "OverFlow";
            colOverFlow.Name = "colOverFlow";
            colOverFlow.Visible = true;
            colOverFlow.VisibleIndex = 8;
            colOverFlow.Width = 63;
            // 
            // TankSingleMatchingCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -378,16 +386,19 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private BindingSource TankSingleMatchingViewModelBindingSource;
        private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
        private DevExpress.XtraGrid.Columns.GridColumn colCoefficient;
        private DevExpress.XtraGrid.Columns.GridColumn colTankLift;
        private DevExpress.XtraGrid.Columns.GridColumn colName;
        private DevExpress.XtraGrid.Columns.GridColumn colKeyWord;
        private DevExpress.XtraGrid.Columns.GridColumn colTankSetting;
        private DevExpress.XtraGrid.Columns.GridColumn colDescription;
        private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
        private DevExpress.XtraGrid.Columns.GridColumn colSeriesType;
        private DevExpress.XtraGrid.Columns.GridColumn ColShowChart;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn colDN;
        private DevExpress.XtraGrid.Columns.GridColumn colMaxLevel;
        private DevExpress.XtraGrid.Columns.GridColumn colMinLevel;
        private DevExpress.XtraGrid.Columns.GridColumn colMinVol;
        private DevExpress.XtraGrid.Columns.GridColumn colOverFlow;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.cs

@@ -18,6 +18,11 @@
            public string OtherName { get; set; }
            public int Importance { get; set; }
            public int SortCode { get; set; }

            /// <summary>
            /// 容积曲线
            /// </summary>
            public string VolCurve { get; set; }
        }

        public class CurvieInfo
@@ -44,9 +49,12 @@
            _allBindingList = new List<TankSingleMatchingViewModel>();
            _TankBll = new BLL.AssetsTankMain();
            var allAssetsPumpMain = await _TankBll.GetAll();
            foreach (var Main in allAssetsPumpMain)
            if (allAssetsPumpMain != null)
            {
                _allBindingList.Add(new TankSingleMatchingViewModel(Main));
                foreach (var Main in allAssetsPumpMain)
                {
                    _allBindingList.Add(new TankSingleMatchingViewModel(Main));
                }
            }
            this.TankSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
            this.searchControl1.Text = _pumpMatchingViewModel.ModelType;
@@ -72,16 +80,16 @@
            {
                _pumpMatchingViewModel.MatchingDbId = vm.ID.ToString();
                _pumpMatchingViewModel.MatchingModelType = vm.Name.ToString();
                /*  _pumpMatchingViewModel.MatchingMinorLoss = vm.Coefficient;
                 _pumpMatchingViewModel.MatchingMaterial = vm.Material;
                 _pumpMatchingViewModel.MatchingTankType = (eTankType?)vm.SeriesType;
                 _pumpMatchingViewModel.MatchingTankSetting = vm.TankSetting;*/
                _pumpMatchingViewModel.MatchingMaxLevel = vm.MaxLevel;
                _pumpMatchingViewModel.MatchingMinLevel = vm.MinLevel;
                _pumpMatchingViewModel.MatchingDN = vm.DN;
                _pumpMatchingViewModel.MatchingMinVol = vm.MinVol;
                var list = await _bll_ex.Value.GetByMainID(vm.ID);
                if (list != null && list.Any())
                {
                    foreach (var item in list)
                    {
                        _allPhartList.Add(new PhartViewModel { ID = item.ID });
                        _allPhartList.Add(new PhartViewModel { ID = item.ID, VolCurve = item.VolCurve });
                    }
                }
            }
@@ -127,6 +135,8 @@
            if (vmo != null)
            {
                _pumpMatchingViewModel.MatchingCurveDbId = vm.ID.ToString();
                var pt_list = Yw.JsonHelper.Json2Object<List<HydroCurvePointViewModel>>(vm.VolCurve);
                _pumpMatchingViewModel.MatchingVolCurve = pt_list;
            }
        }
    }

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingCtrl.resx

@@ -117,7 +117,7 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="valveSingleMatchingViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
  <metadata name="TankSingleMatchingViewModelBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
  <assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-Tank/TankSingleMatchingViewModel.cs

@@ -28,18 +28,39 @@
        public long SeriesID { get; set; }

        /// <summary>
        /// 口径
        /// 最低水位
        /// </summary>
        [DisplayName("口径(mm)")]
        [DisplayName("最低水位")]
        [Browsable(true)]
        public string Caliber { get; set; }
        public double MinLevel { get; set; }

        /// <summary>
        /// 材料
        /// 最高水位
        /// </summary>
        [DisplayName("材料")]
        [DisplayName("最高水位")]
        [Browsable(true)]
        public string Material { get; set; }
        public double MaxLevel { get; set; }

        /// <summary>
        /// 公称直径
        /// </summary>
        [DisplayName("公称直径")]
        [Browsable(true)]
        public double DN { get; set; }

        /// <summary>
        /// 最小容积
        /// </summary>
        [DisplayName("最小容积")]
        [Browsable(true)]
        public double MinVol { get; set; }

        /// <summary>
        /// 是否允许溢流
        /// </summary>
        [DisplayName("是否允许溢流")]
        [Browsable(true)]
        public bool OverFlow { get; set; }

        /// <summary>
        /// 损失系数

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/09-tank/SimulationTankSingleMatchingDlg.cs

@@ -23,7 +23,7 @@
        {
            if (_TankMatchingView.MatchingDbId == null || _TankMatchingView.MatchingDbId == string.Empty)
            {
                TipFormHelper.ShowError("阀门型号选择错误");
                TipFormHelper.ShowError("水池型号选择错误");
                return;
            }


 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/17-compressor/CompressorSingleMatchingCtrl.cs

@@ -44,9 +44,12 @@
            _allBindingList = new List<CompressorSingleMatchingViewModel>();
            _CompressorBll = new BLL.AssetsCompressorMain();
            var allAssetsPumpMain = await _CompressorBll.GetAll();
            foreach (var Main in allAssetsPumpMain)
            if (allAssetsPumpMain != null)
            {
                _allBindingList.Add(new CompressorSingleMatchingViewModel(Main));
                foreach (var Main in allAssetsPumpMain)
                {
                    _allBindingList.Add(new CompressorSingleMatchingViewModel(Main));
                }
            }
            this.CompressorSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
            this.searchControl1.Text = _pumpMatchingViewModel.ModelType;

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/06-simulation/01-matching/18-exchanger/ExchangerSingleMatchingCtrl.cs

@@ -44,9 +44,12 @@
            _allBindingList = new List<ExchangerSingleMatchingViewModel>();
            _ExchangerBll = new BLL.AssetsExchangerMain();
            var allAssetsPumpMain = await _ExchangerBll.GetAll();
            foreach (var Main in allAssetsPumpMain)
            if (allAssetsPumpMain != null)
            {
                _allBindingList.Add(new ExchangerSingleMatchingViewModel(Main));
                foreach (var Main in allAssetsPumpMain)
                {
                    _allBindingList.Add(new ExchangerSingleMatchingViewModel(Main));
                }
            }
            this.ExchangerSingleMatchingViewModelBindingSource.DataSource = _allBindingList;
            this.searchControl1.Text = _pumpMatchingViewModel.ModelType;