From f1dd96fcf0f0397b0cbcca3ee6ef1936f1e86e45 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期五, 07 三月 2025 13:02:57 +0800
Subject: [PATCH] math net 版本统一
---
Desktop/PBS.Desktop/MainForm.cs | 345 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 261 insertions(+), 84 deletions(-)
diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index 9163daa..cf68138 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -1,3 +1,4 @@
+using DevExpress.CodeParser.VB.Preprocessor;
using DevExpress.Utils.Svg;
using DevExpress.XtraBars.Docking;
using DevExpress.XtraBars.Docking2010.Views;
@@ -5,6 +6,7 @@
using DevExpress.XtraBars.Navigation;
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
+using DevExpress.XtraSpreadsheet.Model;
using DevExpress.XtraTab;
using HStation.WinFrmUI;
using HStation.WinFrmUI.Basic;
@@ -875,7 +877,7 @@
}),
};
- var Instrument = Get("仪表", new PageGuid()
+ var Instrument = Get("设施仪表", new PageGuid()
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
@@ -885,21 +887,21 @@
});
Instrument.Elements = new List<AccordionElement>()
{
- Get("流量计",new PageGuid()
+ Get("水表",new PageGuid()
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
- Function = "AssetsFlowmeterMgr",
- }, svgImgItem32[21], new Size(18, 18), (caption,guid,svg,size) =>
+ Function = "AssetsMeterMgr",
+ }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
{
if (!IsExistPage(guid, true))
{
- var page=new AssetsFlowmeterMgrPage();
+ var page = new AssetsMeterMgrPage();
page.PageGuid = guid;
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
page.PageTitle.SvgImageSize = size;
- CreatePage(page,guid);
+ CreatePage(page, guid);
}
}),
Get("压力表",new PageGuid()
@@ -919,21 +921,21 @@
CreatePage(page,guid);
}
}),
- Get("水表",new PageGuid()
+ Get("流量计",new PageGuid()
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
- Function = "AssetsMeterMgr",
- }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
+ Function = "AssetsFlowmeterMgr",
+ }, svgImgItem32[21], new Size(18, 18), (caption,guid,svg,size) =>
{
if (!IsExistPage(guid, true))
{
- var page = new AssetsMeterMgrPage();
+ var page=new AssetsFlowmeterMgrPage();
page.PageGuid = guid;
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
page.PageTitle.SvgImageSize = size;
- CreatePage(page, guid);
+ CreatePage(page,guid);
}
}),
};
@@ -984,15 +986,19 @@
}),
};
- var asset_mgr_ele = new AccordionElement()
+ #region 供水水源
+
+ var waterSupplySource = Get("供水水源", new PageGuid()
{
- Id = "asset",
- Caption = "产品管理",
- SvgImage = svgImgGroup32[2],
- SvgImageSize = new Size(24, 24),
- AllowGlyphSkinning = true,
- Elements = new List<AccordionElement>() {
- Get("水池", new PageGuid()
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "waterSupplySource",
+ }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ });
+ waterSupplySource.Elements = new List<AccordionElement>()
+ {
+ Get("水池", new PageGuid()
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
@@ -1009,10 +1015,65 @@
CreatePage(page, guid);
}
}),
- coupling,
- emitter,
- Instrument,
- Get("管道",new PageGuid()
+ };
+
+ #endregion 供水水源
+
+ #region 供水装置
+
+ var waterSupply = Get("供水装置", new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "waterSupply",
+ }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ });
+ waterSupply.Elements = new List<AccordionElement>()
+ {
+ Get("水泵管理", new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "AssetsPumpMgr",
+ }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new PumpProductMainPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ }),
+ Get("成套设备", new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "AssetsKitMgr",
+ }, svgImgItem32[8], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ }
+ })
+ };
+
+ #endregion 供水装置
+
+ var FacilityNetwork = Get("设施管网", new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "FacilityNetwork",
+ }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ });
+ FacilityNetwork.Elements = new List<AccordionElement>()
+ {
+ Get("管道",new PageGuid()
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
@@ -1029,61 +1090,7 @@
CreatePage(page, guid);
}
}),
-
- Get("过渡件",new PageGuid()
- {
- Modular = "BasicData",
- MoudingType = eMoudingType.Tab,
- Function = "AssetsTranslationMgr",
- }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
- {
- if (!IsExistPage(guid, true))
- {
- var page = new AssetsTranslationMgrPage();
- page.PageGuid = guid;
- page.PageTitle.Caption = caption;
- page.PageTitle.HeaderSvgImage = svg;
- page.PageTitle.SvgImageSize = size;
- CreatePage(page, guid);
- }
- }),
-
- Get("水泵管理",new PageGuid()
- {
- Modular = "BasicData",
- MoudingType = eMoudingType.Tab,
- Function = "AssetsPumpMgr",
- }, svgImgItem32[7], new Size(18, 18), (caption,guid,svg,size) =>
- {
- if (!IsExistPage(guid, true))
- {
- var page=new PumpProductMainPage();
- page.PageGuid = guid;
- page.PageTitle.Caption = caption;
- page.PageTitle.HeaderSvgImage = svg;
- page.PageTitle.SvgImageSize = size;
- CreatePage(page,guid);
- }
- }),
-
- Get("厂商管理",new PageGuid()
- {
- Modular = "BasicData",
- MoudingType = eMoudingType.Tab,
- Function = "AssetsManufacturerMgr",
- }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
- {
- if (!IsExistPage(guid, true))
- {
- /* var page = new DocumentPage();
- page.PageGuid = guid;
- page.PageTitle.Caption = caption;
- page.PageTitle.HeaderSvgImage = svg;
- page.PageTitle.SvgImageSize = size;
- CreatePage(page, guid);*/
- }
- }),
- Get("阀门管理",new PageGuid()
+ Get("阀门",new PageGuid()
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
@@ -1100,19 +1107,57 @@
CreatePage(page,guid);
}
}),
-
- Get("成套设备",new PageGuid()
+ Get("过渡件",new PageGuid()
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
- Function = "AssetsKitMgr",
- }, svgImgItem32[8], new Size(18, 18), (caption,guid,svg,size) =>
+ Function = "AssetsTranslationMgr",
+ }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new AssetsTranslationMgrPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
- })
- }
+ }),
+ coupling,
+ emitter,
+ };
+
+ var asset_mgr_ele = new AccordionElement()
+ {
+ Id = "asset",
+ Caption = "产品管理",
+ SvgImage = svgImgGroup32[2],
+ SvgImageSize = new Size(24, 24),
+ AllowGlyphSkinning = true,
+ Elements = new List<AccordionElement>() {
+ Get("厂商管理",new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "AssetsManufacturerMgr",
+ }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ /* var page = new DocumentPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);*/
+ }
+ }),
+ waterSupplySource,
+ waterSupply,
+ FacilityNetwork,
+ Instrument,
+ }
};
var system_config_ele = new AccordionElement()
@@ -1326,6 +1371,138 @@
list.Add(system_config_ele);
list.Add(auth_config_ele);
}
+ if (modular == "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 PBS.WinFrmUI.WE.WaterUtensilMainPage();
+ 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 = " ",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new PBS.WinFrmUI.WE.WaterUtensilMainPage();
+ 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 = " ",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new PBS.WinFrmUI.WE.WaterUtensilMainPage();
+ 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 = " ",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new PBS.WinFrmUI.WE.WaterUtensilMainPage();
+ 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);
+ }
+ if (modular == "WaterSupplyAnalysis")
+ {
+ var systemCurve = Get("系统曲线", new PageGuid()
+ {
+ Modular = "WaterSupplyAnalysis",
+ MoudingType = eMoudingType.Tab,
+ Function = " ",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new PBS.WinFrmUI.WE.WaterUtensilMainPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ });
+ var forecastWater = Get("水量预测", new PageGuid()
+ {
+ Modular = "WaterSupplyAnalysis",
+ MoudingType = eMoudingType.Tab,
+ Function = " ",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new PBS.WinFrmUI.WE.WaterUtensilMainPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ });
+ var operationalEvaluation = Get("运行评估", new PageGuid()
+ {
+ Modular = "WaterSupplyAnalysis",
+ MoudingType = eMoudingType.Tab,
+ Function = " ",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new PBS.WinFrmUI.WE.WaterUtensilMainPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ });
+ list.Add(systemCurve);
+ list.Add(forecastWater);
+ list.Add(operationalEvaluation);
+ }
return list;
}
--
Gitblit v1.9.3