From ef2ed31abaaec51c035c53d7596e788af4beb40a Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期二, 01 四月 2025 12:49:27 +0800
Subject: [PATCH] inp保存路径修改
---
Desktop/PBS.Desktop/MainForm.cs | 89 +++++++++++++++++++++++++++++---------------
1 files changed, 58 insertions(+), 31 deletions(-)
diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index d774fd9..0b9d870 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -10,7 +10,6 @@
using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Dict;
-using IBox.WinFrmUI;
using PBS.WinFrmUI;
using PBS.WinFrmUI.Box;
using PBS.WinFrmUI.DataAnalysis;
@@ -622,10 +621,6 @@
ctrl_ele.OwnerElement.Expanded = true;
this.accordionControlFunction.Refresh();
}
- //if (!IsExistPage(pguid, true))
- //{
- // ele.Click.Invoke();
- //}
return true;
}
else
@@ -766,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>()
@@ -776,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))
{
@@ -846,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>()
@@ -1020,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>()
@@ -1030,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))
{
@@ -1053,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>()
@@ -1101,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>()
@@ -1128,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))
{
@@ -1178,12 +1173,12 @@
{
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,
@@ -1286,7 +1281,24 @@
CreatePage(page,guid);
}
}),
- }
+ Get("电费配置",new PageGuid()
+ {
+ Modular = "BasicData",
+ MoudingType = eMoudingType.Tab,
+ Function = "ElecPriceMgr",
+ }, svgImgItem32[12], 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()
@@ -1457,7 +1469,6 @@
page.PageTitle.HeaderSvgImage = svg;
page.PageTitle.SvgImageSize = size;
CreatePage(page, guid);
-
}
});
var modelEdit = Get("模型编辑", new PageGuid()
@@ -1474,7 +1485,7 @@
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
page.PageTitle.SvgImageSize = size;
- CreatePage(page, guid);
+ CreatePage(page, guid);
}
});
list.Add(hydraulicScenario);
@@ -1503,6 +1514,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",
@@ -1601,7 +1629,7 @@
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();
@@ -1625,7 +1653,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "IBoxInfo",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[10], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1642,7 +1670,7 @@
{
Id = "monitor",
Caption = "监测分析",
- SvgImage = svgImgGroup32[0],
+ SvgImage = svgImageIBox[4],
SvgImageSize = new Size(24, 24),
AllowGlyphSkinning = true,
Elements = new List<AccordionElement>()
@@ -1652,7 +1680,7 @@
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))
{
@@ -1669,7 +1697,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))
{
@@ -1688,7 +1716,7 @@
{
Id = "management",
Caption = "数据管理",
- SvgImage = svgImgGroup32[0],
+ SvgImage = svgImageIBox[9],
SvgImageSize = new Size(24, 24),
AllowGlyphSkinning = true,
Elements = new List<AccordionElement>()
@@ -1698,7 +1726,7 @@
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))
{
@@ -1715,7 +1743,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "MonitorConfigurationMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[5], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1732,7 +1760,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "DataFilterMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ },svgImageIBox[8], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1749,7 +1777,7 @@
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))
{
@@ -1758,7 +1786,6 @@
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
page.PageTitle.SvgImageSize = size;
-
CreatePage(page, guid);
}
}),/*Get("智控数据", new PageGuid()
@@ -1803,7 +1830,7 @@
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))
{
@@ -1819,7 +1846,7 @@
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))
{
--
Gitblit v1.9.3