项目管理优化

lixiaojun

2024-12-05 77a4be9a061af13fcd7a0143cf6299172a6fa7f9

项目管理优化

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/02-project/03-mgr/XhsProjectMgrViewModel.cs

@@ -77,7 +77,6 @@
            {
                this.Address = Yw.Model.Map.Marker.ToModel(mapInfo.Position).Address;
            }
            this.CreateTime = project.NO.Substring(4, 10);

            this.Customer = project.Customer;
            this.Flags = Yw.Untity.FlagsHelper.ToString(project.Flags);
@@ -120,7 +119,6 @@
        {
            this.ID = (long)project.ProjectID;
            this.NO = project.NO;
            this.CreateTime = project.NO.Substring(4, 10);
            this.Name = project.Name;
            this.Address = project.Address;
            this.Customer = project.Customer;
@@ -154,40 +152,16 @@
        public string Name { get; set; }

        /// <summary>
        /// 生效时间
        /// 客户
        /// </summary>
        [Display(Name = "生效时间")]
        public string StartTime { get; set; }

        /// <summary>
        /// 失效时间
        /// </summary>
        [Display(Name = "失效时间")]
        public string EndTime { get; set; }

        /// <summary>
        /// 发布状态
        /// </summary>
        [Display(Name = "发布状态")]
        public string PublishStatus { get; set; }
        [Display(Name = "客户名称")]
        public string Customer { get; set; }

        /// <summary>
        /// 详细地址
        /// </summary>
        [Display(Name = "详细地址")]
        public string Address { get; set; }

        /// <summary>
        /// 创建时间
        /// </summary>
        [Display(Name = "创建时间")]
        public string CreateTime { get; set; }

        /// <summary>
        /// 客户
        /// </summary>
        [Display(Name = "客户名称")]
        public string Customer { get; set; }

        /// <summary>
        /// 模型状态
@@ -219,11 +193,14 @@
        [Display(Name = "说明")]
        public string Description { get; set; }

        /*      /// <summary>
        /// <summary>
              /// 定位
              /// </summary>
              [Display(Name = "定位")]
              public bool HasLocation { get; set; }*/
        public bool HasLocation { get; set; }


        public bool HasModel { get; set; }

        /// <summary>
        /// 是否存在三维模型

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/01-property/SimulationPropertyCtrl.cs

@@ -1,4 +1,5 @@
using HStation.WinFrmUI.PhartRelation;
using DevExpress.Utils.MVVM;
using HStation.WinFrmUI.PhartRelation;
using HStation.WinFrmUI.Xhs;
using Yw.Model;

@@ -120,12 +121,11 @@
                case Yw.Hydro.ParterCatalog.Tank:
                    {
                        var tankViewModel = vm as HydroTankViewModel;
                        var input = HydroMatchingHelper.Create(tankViewModel.Vmo, tankViewModel.HydroInfo);
                        var input = HydroMatchingHelper.Create(tankViewModel);
                        var dlg = new SimulationTankSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(tankViewModel.HydroInfo, tankViewModel.Vmo, output);
                            tankViewModel.UpdateProperty();
                            HydroMatchingHelper.Apply(tankViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
@@ -135,12 +135,11 @@
                case Yw.Hydro.ParterCatalog.Waterbox:
                    {
                        var tankViewModel = vm as HydroTankViewModel;
                        var input = HydroMatchingHelper.Create(tankViewModel.Vmo, tankViewModel.HydroInfo);
                        var input = HydroMatchingHelper.Create(tankViewModel);
                        var dlg = new SimulationTankSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(tankViewModel.HydroInfo, tankViewModel.Vmo, output);
                            tankViewModel.UpdateProperty();
                            HydroMatchingHelper.Apply(tankViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
@@ -149,18 +148,26 @@
                    break;
                case Yw.Hydro.ParterCatalog.Blunthead:
                    {

                        var bluntheadViewModel = vm as HydroBluntheadViewModel;
                        var input = HydroMatchingHelper.Create(bluntheadViewModel);
                        var dlg = new SimulationBluntheadSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(bluntheadViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Elbow:
                    {
                        var elbowViewModel = vm as HydroElbowViewModel;
                        var input = HydroMatchingHelper.Create(elbowViewModel.Vmo, elbowViewModel.HydroInfo);
                        var input = HydroMatchingHelper.Create(elbowViewModel);
                        var dlg = new SimulationElbowSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(elbowViewModel.HydroInfo, elbowViewModel.Vmo, output);
                            elbowViewModel.UpdateProperty();
                            HydroMatchingHelper.Apply(elbowViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
@@ -169,48 +176,110 @@
                    break;
                case Yw.Hydro.ParterCatalog.Threelink:
                    {

                        var threelinkViewModel = vm as HydroThreelinkViewModel;
                        var input = HydroMatchingHelper.Create(threelinkViewModel);
                        var dlg = new SimulationThreelinkSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(threelinkViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Fourlink:
                    {

                        var fourlinkViewModel = vm as HydroFourlinkViewModel;
                        var input = HydroMatchingHelper.Create(fourlinkViewModel);
                        var dlg = new SimulationFourlinkSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(fourlinkViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Meter:
                    {

                        var meterViewModel = vm as HydroMeterViewModel;
                        var input = HydroMatchingHelper.Create(meterViewModel);
                        var dlg = new SimulationMeterSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(meterViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Flowmeter:
                    {

                        var flowmeterViewModel = vm as HydroFlowmeterViewModel;
                        var input = HydroMatchingHelper.Create(flowmeterViewModel);
                        var dlg = new SimulationFlowmeterSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(flowmeterViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Pressmeter:
                    {

                        var pressmeterViewModel = vm as HydroPressmeterViewModel;
                        var input = HydroMatchingHelper.Create(pressmeterViewModel);
                        var dlg = new SimulationPressmeterSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(pressmeterViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Nozzle:
                    {

                        var nozzleViewModel = vm as HydroNozzleViewModel;
                        var input = HydroMatchingHelper.Create(nozzleViewModel);
                        var dlg = new SimulationSprinklerSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(nozzleViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Hydrant:
                    {

                        var hydrantViewModel = vm as HydroHydrantViewModel;
                        var input = HydroMatchingHelper.Create(hydrantViewModel);
                        var dlg = new SimulationHydrantSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(hydrantViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Pipe:
                    {
                        var pipeViewModel = vm as HydroPipeViewModel;
                        var input = HydroMatchingHelper.Create(pipeViewModel);
                        var dlg = new PipeSingMatchingDlg();
                        var dlg = new SimulationPipeSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(pipeViewModel.HydroInfo, pipeViewModel.Vmo, output);
                            pipeViewModel.UpdateProperty();
                            HydroMatchingHelper.Apply(pipeViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.ShowDialog();
@@ -223,8 +292,7 @@
                        var dlg = new SimulationPumpSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(pumpViewModel.HydroInfo, pumpViewModel.Vmo, output);
                            pumpViewModel.UpdateProperty();
                            HydroMatchingHelper.Apply(pumpViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
@@ -233,17 +301,44 @@
                    break;
                case Yw.Hydro.ParterCatalog.Valve:
                    {

                        var valveViewModel = vm as HydroValveViewModel;
                        var input = HydroMatchingHelper.Create(valveViewModel);
                        var dlg = new SimulationValveSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(valveViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Exchanger:
                    {

                        var exchangerViewModel = vm as HydroExchangerViewModel;
                        var input = HydroMatchingHelper.Create(exchangerViewModel);
                        var dlg = new SimulationExchangerSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(exchangerViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                case Yw.Hydro.ParterCatalog.Compressor:
                    {

                        var compressorViewModel = vm as HydroCompressorViewModel;
                        var input = HydroMatchingHelper.Create(compressorViewModel);
                        var dlg = new SimulationCompressorSingleMatchingDlg();
                        dlg.ReloadDataEvent += (output) =>
                        {
                            HydroMatchingHelper.Apply(compressorViewModel, output);
                            this.hydroVisualPropertyCtrl1.UpdateRows();
                        };
                        dlg.SetBindingData(input);
                        dlg.ShowDialog();
                    }
                    break;
                default: break;
@@ -262,46 +357,36 @@
            {
                case HydroCurve.Tank:
                    {

                        var tankViewModel = vm as HydroTankViewModel;
                        var dlg = new TankChartShowDlg();
                        dlg.ShowDialog();
                    }
                    break;
                case HydroCurve.Pump:
                    {
                        //var pumpInfo = vm.HydroInfo.Pumps?.Find(x => x.Code == vm.Code);
                        //if (pumpInfo == null)
                        //{
                        //    break;
                        //}
                        //var input = AssetsMatchingParasHelper.Create(vm.HydroInfo, pumpInfo, null);
                        //var dlg = new SinglePumpAnalyDlg();
                        //dlg.SetBindindData(input);
                        //dlg.ReloadDataEvent += (output) =>
                        //{
                        //    var bol = AssetsMatchingParasHelper.Apply(vm.HydroInfo, output);
                        //    if (bol)
                        //    {
                        //        vm.UpdateProperty();
                        //        this.hydroVisualPropertyCtrl1.UpdateRows();
                        //    }
                        //    return bol;
                        //};
                        //dlg.ShowDialog();
                        //return true;
                        var pumpViewModel = vm as HydroPumpViewModel;
                        //var dlg = new PumpChartShowDlg();
                    }
                    break;
                case HydroCurve.Valve:
                    {

                        var valveViewModel = vm as HydroValveViewModel;
                        var dlg = new ValveChartShowDlg();
                        dlg.ShowDialog();
                    }
                    break;
                case HydroCurve.Exchanger:
                    {

                        var exchangerViewModel = vm as HydroExchangerViewModel;
                        var dlg = new ExchangerChartShowDlg();
                        dlg.ShowDialog();
                    }
                    break;
                case HydroCurve.Compressor:
                    {

                        var compressorViewModel = vm as HydroCompressorViewModel;
                        var dlg = new CompressorChartShowDlg();
                        dlg.ShowDialog();
                    }
                    break;
                default: break;

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/02-pump/HydroPumpViewModel.cs

@@ -171,7 +171,7 @@
        [DisplayName("流量扬程曲线")]
        [PropertyOrder(2010)]
        [HydroCurvePro(HydroCurve.PumpQH, HydroCurveType.CurveQH)]
        [Browsable(true)]
        [Browsable(false)]
        public string CurveQH { get; set; }

        /// <summary>
@@ -181,7 +181,7 @@
        [DisplayName("流量功率曲线")]
        [PropertyOrder(2011)]
        [HydroCurvePro(HydroCurve.PumpQP, HydroCurveType.CurveQP)]
        [Browsable(true)]
        [Browsable(false)]
        public string CurveQP { get; set; }

        /// <summary>
@@ -191,7 +191,7 @@
        [DisplayName("流量效率曲线")]
        [PropertyOrder(2012)]
        [HydroCurvePro(HydroCurve.PumpQE, HydroCurveType.CurveQE)]
        [Browsable(true)]
        [Browsable(false)]
        public string CurveQE { get; set; }

        /// <summary>