From 018bfb9c78088d9cd7b9371edcd2102abd594b4d Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 21 四月 2025 15:21:59 +0800
Subject: [PATCH] 水力计算曲线 报错修复
---
Desktop/PBS.Desktop/MainForm.cs | 497 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 377 insertions(+), 120 deletions(-)
diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index f966940..29df251 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -10,15 +10,12 @@
using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Dict;
-using IBox.WinFrmUI;
-using NPOI.SS.Formula.Functions;
using PBS.WinFrmUI;
+using PBS.WinFrmUI.Box;
using PBS.WinFrmUI.DataAnalysis;
using PBS.WinFrmUI.Hydro;
using Yw.WinFrmUI;
using Yw.WinFrmUI.Page;
-using PBS.Vmo;
-using PBS.WinFrmUI.Box;
namespace PBS.Desktop
{
@@ -162,6 +159,7 @@
{
pguid = this.tabbedView1.ActiveDocument.Tag as PageGuid;
}
+
SelectModular(tag, pguid);
}
@@ -186,8 +184,13 @@
//if (!IsExistPage(guid, true))
//{
//}
-
- SelectModular("BasicData");
+ var pageGuid = new PageGuid()
+ {
+ Modular = "Home",
+ MoudingType = eMoudingType.Tab,
+ Function = "MapInfo",
+ };
+ SelectModular("Home", pageGuid);
}
//界面正在退出时确认
@@ -539,27 +542,6 @@
}
}
- /* //智能硬件
- if (modular == "SmartHardware")
- {
- var guid = new PageGuid()
- {
- Modular = "SmartHardware",
- MoudingType = eMoudingType.Tab,
- Function = "IBox",
- };
- if (!IsExistPage(guid, true))
- {
- var ibox = IBoxDataHelper.GetData();
- var page = new IBoxForm(ibox);
- page.PageGuid = guid;
- page.PageTitle.Caption = "智能硬件";
- page.PageTitle.HeaderSvgImage = svgImgItem32[4];
- page.PageTitle.SvgImageSize = new Size(18, 18);
- CreatePage(page, guid);
- }
- }*/
-
//初始功能列表
this.accordionControlFunction.Elements.Clear();
var list = GetAccordionElementList(modular);
@@ -569,6 +551,14 @@
{
var accEle = GetAccordionControlElement(element);
this.accordionControlFunction.Elements.Add(accEle);
+ }
+
+ foreach (var element in list)
+ {
+ if (element.IsNormallyOpen && !IsExistPage(element.PageGuid, false))
+ {
+ element.Click.Invoke();
+ }
}
}
_sel_modular = modular;
@@ -647,6 +637,8 @@
return false;
}
+
+ private bool _ibox_status = false;
//获取
private List<AccordionElement> GetAccordionElementList(string modular)
@@ -769,7 +761,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "AssetsCouplingMgr",
- }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImgItem32[41], new Size(18, 18), (caption, guid, svg, size) =>
{
});
coupling.Elements = new List<AccordionElement>()
@@ -779,7 +771,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "AssetsBluntheadMgr",
- }, svgImgItem32[8], new Size(18, 18), (caption,guid,svg,size) =>
+ }, svgImgItem32[43], new Size(18, 18), (caption,guid,svg,size) =>
{
if (!IsExistPage(guid, true))
{
@@ -849,7 +841,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "AssetsEmitterMgr",
- }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImgItem32[37], new Size(18, 18), (caption, guid, svg, size) =>
{
});
emitter.Elements = new List<AccordionElement>()
@@ -1023,7 +1015,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "waterSupplySource",
- }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImgItem32[40], new Size(18, 18), (caption, guid, svg, size) =>
{
});
waterSupplySource.Elements = new List<AccordionElement>()
@@ -1033,7 +1025,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "AssetsTankMgr",
- }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImgItem32[39], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1056,7 +1048,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "waterSupply",
- }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImgItem32[38], new Size(18, 18), (caption, guid, svg, size) =>
{
});
waterSupply.Elements = new List<AccordionElement>()
@@ -1104,7 +1096,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "FacilityNetwork",
- }, svgImgItem32[7], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImgItem32[36], new Size(18, 18), (caption, guid, svg, size) =>
{
});
FacilityNetwork.Elements = new List<AccordionElement>()
@@ -1131,7 +1123,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "AssetsValveMgr",
- }, svgImgItem32[7], new Size(18, 18), (caption,guid,svg,size) =>
+ }, svgImgItem32[42], new Size(18, 18), (caption,guid,svg,size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1181,18 +1173,35 @@
{
if (!IsExistPage(guid, true))
{
- /* var page = new DocumentPage();
+ var page=new AssetsManufacturerMainPage();
page.PageGuid = guid;
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
page.PageTitle.SvgImageSize = size;
- CreatePage(page, guid);*/
+ CreatePage(page,guid);
}
}),
waterSupplySource,
waterSupply,
FacilityNetwork,
Instrument,
+ Get("供水设备",new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "WaterEquipmentMgr",
+ }, svgImgItem32[6], new Size(18, 18), (caption,guid,svg,size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page=new WaterEquipmentMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
+ }),
}
};
@@ -1289,7 +1298,24 @@
CreatePage(page,guid);
}
}),
- }
+ Get("电费配置",new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "ElecPriceMgr",
+ }, svgImgItem32[44], new Size(18, 18), (caption,guid,svg,size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page=new ElecPriceMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page,guid);
+ }
+ }),
+ }
};
var auth_config_ele = new AccordionElement()
@@ -1411,60 +1437,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 = " ",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
- {
- if (!IsExistPage(guid, true))
- {
- }
- });
- 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 modelEdit = Get("模型编辑", new PageGuid()
- {
- Modular = "ModelManage",
- MoudingType = eMoudingType.Tab,
- Function = " ",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
- {
- if (!IsExistPage(guid, true))
- {
- }
- });
- list.Add(hydraulicScenario);
- list.Add(modelTemplate);
- list.Add(rapidModeling);
- list.Add(modelEdit);
}
break;
@@ -1487,6 +1459,23 @@
CreatePage(page, guid);
}
});
+ //var simulationDrill = Get("模拟调度", new PageGuid()
+ //{
+ // Modular = "WaterSupplyAnalysis",
+ // MoudingType = eMoudingType.Tab,
+ // Function = "SimulationSchedule",
+ //}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ //{
+ // if (!IsExistPage(guid, true))
+ // {
+ // var page = new SimulationSchedulePage();
+ // 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",
@@ -1517,12 +1506,29 @@
case "DataAnalysis":
{
+ var analysis = Get("能耗分析", new PageGuid()
+ {
+ Modular = "DataAnalysis",
+ MoudingType = eMoudingType.Tab,
+ Function = "EnergyAnalysis",
+ }, svgImageIBox[14], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new EnergyAnalysis();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ });
var analysis1 = Get("流量压力比对分析", new PageGuid()
{
Modular = "DataAnalysis",
MoudingType = eMoudingType.Tab,
Function = "FlowPressAnalysis",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[13], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1540,7 +1546,7 @@
Modular = "DataAnalysis",
MoudingType = eMoudingType.Tab,
Function = "EndPressAnalysis",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[12], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1552,7 +1558,7 @@
CreatePage(page, guid);
}
});
-
+ list.Add(analysis);
list.Add(analysis1);
list.Add(analysis2);
}
@@ -1568,9 +1574,10 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "FlowPressAnalysis",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[7], new Size(18, 18), (caption, guid, svg, size) =>
{
var dlg = new PBS.WinFrmUI.Box.ChoiceFacilityDlg();
+ dlg.SetDataSource();
dlg.VisibleChanged += (bol) =>
{
accordionElement_Facility.Enable = bol;
@@ -1579,17 +1586,36 @@
foreach (var ele in item.Elements)
{
ele.Enable = true;
+ _ibox_status = true;
}
}
};
dlg.ShowDialog();
});
+ AccordionElement accordionElement_IboxInfo = new();
+ accordionElement_IboxInfo = Get("硬件详情", new PageGuid()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "IBoxInfo",
+ }, svgImageIBox[10], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new IBoxInfoMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ }, true);
var accordionElement_Monitor = new AccordionElement()
{
Id = "monitor",
- Caption = "检测分析",
- SvgImage = svgImgGroup32[0],
+ Caption = "监测分析",
+ SvgImage = svgImageIBox[4],
SvgImageSize = new Size(24, 24),
AllowGlyphSkinning = true,
Elements = new List<AccordionElement>()
@@ -1599,10 +1625,16 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "MonitorMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[3], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new MonitorMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
}),
Get("能耗分析", new PageGuid()
@@ -1610,7 +1642,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "AnalysisMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[1], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1629,7 +1661,7 @@
{
Id = "management",
Caption = "数据管理",
- SvgImage = svgImgGroup32[0],
+ SvgImage = svgImageIBox[9],
SvgImageSize = new Size(24, 24),
AllowGlyphSkinning = true,
Elements = new List<AccordionElement>()
@@ -1639,32 +1671,50 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "ProtocolMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[11], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new ProtocolMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
}),
Get("监测配置", new PageGuid()
{
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
- Function = "MonitorMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ Function = "MonitorConfigurationMgr",
+ }, svgImageIBox[5], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new MonitorConfigurationMgr();
+ 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 = "SmartHardware",
MoudingType = eMoudingType.Tab,
- Function = "DataProcessingMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ Function = "DataFilterMgr",
+ },svgImageIBox[8], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new DataFilter();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
}),
Get("参数配置", new PageGuid()
@@ -1672,12 +1722,19 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "ParameterMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[0], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new ParameterMgr();
+ 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 = "SmartHardware",
MoudingType = eMoudingType.Tab,
@@ -1696,6 +1753,12 @@
{
if (!IsExistPage(guid, true))
{
+ var page = new DataDeliveryMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
}),Get("服务升级", new PageGuid()
{
@@ -1707,42 +1770,235 @@
if (!IsExistPage(guid, true))
{
}
- }),Get("基础信息", new PageGuid()
+ })*/
+ Get("基础信息", new PageGuid()
{
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "BasicInfoMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[2], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new BasicInfoMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
}),Get("日志管理", new PageGuid()
{
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "LogManagentMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[6], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new LogManagentMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
}),
}
};
allAccordionElements.Add(accordionElement_DataManagement);
- /* foreach (var item in allAccordionElements)
- {
- foreach (var ele in item.Elements)
- {
- ele.Enable = false;
- }
- }*/
+ if (!_ibox_status)
+ {
+ foreach (var item in allAccordionElements)
+ {
+ foreach (var ele in item.Elements)
+ {
+ ele.Enable = false;
+ }
+ }
+ }
list.Add(accordionElement_Facility);
+ list.Add(accordionElement_IboxInfo);
list.Add(accordionElement_Monitor);
list.Add(accordionElement_DataManagement);
}
+ break;
+
+ case "Home":
+ {
+ AccordionElement accordionElement_Home = new();
+ accordionElement_Home = Get("地图信息", new PageGuid()
+ {
+ Modular = "Home",
+ MoudingType = eMoudingType.Tab,
+ Function = "MapInfo",
+ }, svgImageHome[7], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new HomePbsProjectPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ }, true);
+
+ var accordionElement_ModelManagement = new AccordionElement()
+ {
+ Id = "Home",
+ Caption = "模型管理",
+ SvgImage = svgImageHome[3],
+ SvgImageSize = new Size(24, 24),
+ AllowGlyphSkinning = true,
+ Elements = new List<AccordionElement>()
+ {
+ Get("水力场景", new PageGuid()
+ {
+ Modular = "ModelManage",
+ MoudingType = eMoudingType.Tab,
+ Function = " ",
+ }, svgImageHome[8], 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",
+ }, svgImageHome[2], 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",
+ }, svgImageHome[1], 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",
+ }, svgImageHome[0], 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 = svgImageHome[6],
+ SvgImageSize = new Size(24, 24),
+ AllowGlyphSkinning = true,
+ Elements = new List<AccordionElement>()
+ {
+ Get("系统曲线", new PageGuid()
+ {
+ Modular = "Home",
+ MoudingType = eMoudingType.Tab,
+ Function = " ",
+ }, svgImageHome[9], 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 = " ",
+ }, svgImageHome[5], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ }
+ }),
+ Get("运行评估", new PageGuid()
+ {
+ Modular = "Home",
+ MoudingType = eMoudingType.Tab,
+ Function = " ",
+ }, svgImageHome[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ }
+ })
+ }
+ };
+ /* AccordionElement accordionElement_test = new();
+ accordionElement_test = Get("test", new PageGuid()
+ {
+ Modular = "Test",
+ MoudingType = eMoudingType.Tab,
+ Function = "MapInfo",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new IBox.WinFrmUI.IBoxFormControll(new Vmo.IBoxControllViewModel());
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ }, true);*/
+ list.Add(accordionElement_Home);
+ // list.Add(accordionElement_test);
+ list.Add(accordionElement_WaterSupplyAnalysic);
+ list.Add(accordionElement_ModelManagement);
+ }
break;
default:
@@ -1752,7 +2008,7 @@
return list;
}
- private AccordionElement Get(string caption, PageGuid guid, SvgImage svg_img, Size size, Action<string, PageGuid, SvgImage, Size> action, bool glyph_skinning = true)
+ private AccordionElement Get(string caption, PageGuid guid, SvgImage svg_img, Size size, Action<string, PageGuid, SvgImage, Size> action, bool is_normally_open = false, bool glyph_skinning = true)
{
var ele = new AccordionElement();
if (guid == null)
@@ -1769,6 +2025,7 @@
ele.SvgImage = svg_img;
ele.SvgImageSize = size;
ele.AllowGlyphSkinning = glyph_skinning;
+ ele.IsNormallyOpen = is_normally_open;
return ele;
}
--
Gitblit v1.9.3