af5eeb8797d88e142410a9e82e84291355e7c336..6c521d86f3dae53a64a626e2d63cdaac67a8ea94
2025-04-03 duheng
修改首页菜单位置
6c521d 对比 | 目录
2025-04-03 duheng
增加获取成套设备曲线方法
82f8a7 对比 | 目录
已修改3个文件
229 ■■■■■ 文件已修改
Desktop/PBS.Desktop/MainForm.Designer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/PBS.Desktop/MainForm.cs 205 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/04-package-curve/packageCurveViewModel.cs 22 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Desktop/PBS.Desktop/MainForm.Designer.cs
@@ -185,6 +185,7 @@
            nbModelManage.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbModelManage.ImageOptions.SvgImage");
            nbModelManage.Name = "nbModelManage";
            nbModelManage.Tag = "ModelManage";
            nbModelManage.Visible = false;
            // 
            // nbWaterSupplyAnalysis
            // 
@@ -193,6 +194,7 @@
            nbWaterSupplyAnalysis.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("nbWaterSupplyAnalysis.ImageOptions.SvgImage");
            nbWaterSupplyAnalysis.Name = "nbWaterSupplyAnalysis";
            nbWaterSupplyAnalysis.Tag = "WaterSupplyAnalysis";
            nbWaterSupplyAnalysis.Visible = false;
            // 
            // nbSmartHardware
            // 
Desktop/PBS.Desktop/MainForm.cs
@@ -1420,78 +1420,6 @@
                case "ModelManage":
                    {
                        var hydraulicScenario = Get("水力场景", new PageGuid()
                        {
                            Modular = "ModelManage",
                            MoudingType = eMoudingType.Tab,
                            Function = " ",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                //var page = new HydroSceneMgrPage();
                                //page.PageGuid = guid;
                                //page.PageTitle.Caption = caption;
                                //page.PageTitle.HeaderSvgImage = svg;
                                //page.PageTitle.SvgImageSize = size;
                                //CreatePage(page, guid);
                            }
                        });
                        var modelTemplate = Get("模型模版", new PageGuid()
                        {
                            Modular = "ModelManage",
                            MoudingType = eMoudingType.Tab,
                            Function = "ModelTemplate",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new ModelTemplatePage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        });
                        var rapidModeling = Get("快速建模", new PageGuid()
                        {
                            Modular = "ModelManage",
                            MoudingType = eMoudingType.Tab,
                            Function = "QuickModeling",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new QuickModelingPage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        });
                        var modelEdit = Get("模型编辑", new PageGuid()
                        {
                            Modular = "ModelManage",
                            MoudingType = eMoudingType.Tab,
                            Function = "ModelEdit",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new ModelEditPage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        });
                        list.Add(hydraulicScenario);
                        list.Add(modelTemplate);
                        list.Add(rapidModeling);
                        list.Add(modelEdit);
                    }
                    break;
@@ -1899,7 +1827,140 @@
                                CreatePage(page, guid);
                            }
                        }, true);
                        var accordionElement_ModelManagement = new AccordionElement()
                        {
                            Id = "Home",
                            Caption = "模型管理",
                            SvgImage = svgImageIBox[9],
                            SvgImageSize = new Size(24, 24),
                            AllowGlyphSkinning = true,
                            Elements = new List<AccordionElement>()
                            {
                                Get("水力场景", new PageGuid()
                        {
                            Modular = "ModelManage",
                            MoudingType = eMoudingType.Tab,
                            Function = " ",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                //var page = new HydroSceneMgrPage();
                                //page.PageGuid = guid;
                                //page.PageTitle.Caption = caption;
                                //page.PageTitle.HeaderSvgImage = svg;
                                //page.PageTitle.SvgImageSize = size;
                                //CreatePage(page, guid);
                            }
                        }),
                                Get("模型模版", new PageGuid()
                        {
                            Modular = "Home",
                            MoudingType = eMoudingType.Tab,
                            Function = "ModelTemplate",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new ModelTemplatePage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        }),
                                Get("快速建模", new PageGuid()
                        {
                            Modular = "Home",
                            MoudingType = eMoudingType.Tab,
                            Function = "QuickModeling",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new QuickModelingPage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        }),
                                Get("模型编辑", new PageGuid()
                        {
                            Modular = "Home",
                            MoudingType = eMoudingType.Tab,
                            Function = "ModelEdit",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new ModelEditPage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        })
                          }
                        };
                        var accordionElement_WaterSupplyAnalysic = new AccordionElement()
                        {
                            Id = "WaterSupplyAnalysis",
                            Caption = "供水分析",
                            SvgImage = svgImageIBox[9],
                            SvgImageSize = new Size(24, 24),
                            AllowGlyphSkinning = true,
                            Elements = new List<AccordionElement>()
                            {
                        Get("系统曲线", new PageGuid()
                        {
                            Modular = "Home",
                            MoudingType = eMoudingType.Tab,
                            Function = " ",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new SystemCurvePage();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        }),
                        Get("水量预测", new PageGuid()
                        {
                            Modular = "Home",
                            MoudingType = eMoudingType.Tab,
                            Function = " ",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                            }
                        }),
                        Get("运行评估", new PageGuid()
                        {
                            Modular = "Home",
                            MoudingType = eMoudingType.Tab,
                            Function = " ",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                            }
                        })
                        }
                        };
                        list.Add(accordionElement_Home);
                        list.Add(accordionElement_WaterSupplyAnalysic);
                        list.Add(accordionElement_ModelManagement);
                    }
                    break;
WinFrmUI/PBS.WinFrmUI/04-package-curve/packageCurveViewModel.cs
@@ -1,12 +1,5 @@
using DevExpress.XtraCharts;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.IO;
using Yw;
using Yw.Vmo;
namespace PBS.WinFrmUI
{
@@ -63,6 +56,19 @@
                File.Delete(filePath);
            }
        }
        public static packageCurveViewModel GetFacilityCurve(long facilityId)
        {
            string rootDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Package_Curve");
            string filePath = Path.Combine(rootDirectory, $"{facilityId}.json");
            if (!Directory.Exists(filePath))
            {
                var json = File.ReadAllText(filePath);
                return JsonHelper.Json2Object<packageCurveViewModel>(json);
            }
            return null;
        }
    }
    public class PumpInfo