From f7d479db638f3d9e3aeb05ec82dc2818f14bf903 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 24 三月 2025 17:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
Desktop/PBS.Desktop/MainForm.cs | 425 ++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 401 insertions(+), 24 deletions(-)
diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index 690b075..7edc0d0 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -1,4 +1,3 @@
-using DevExpress.CodeParser.VB.Preprocessor;
using DevExpress.Utils.Svg;
using DevExpress.XtraBars.Docking;
using DevExpress.XtraBars.Docking2010.Views;
@@ -6,16 +5,16 @@
using DevExpress.XtraBars.Navigation;
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
-using DevExpress.XtraSpreadsheet.Model;
using DevExpress.XtraTab;
using HStation.WinFrmUI;
+using HStation.WinFrmUI.Assets;
using HStation.WinFrmUI.Basic;
using HStation.WinFrmUI.Dict;
-using NPOI.SS.Formula.Functions;
+using IBox.WinFrmUI;
using PBS.WinFrmUI;
+using PBS.WinFrmUI.Box;
+using PBS.WinFrmUI.DataAnalysis;
using PBS.WinFrmUI.Hydro;
-using PBS.WinFrmUI.WE;
-using System.IO;
using Yw.WinFrmUI;
using Yw.WinFrmUI.Page;
@@ -45,7 +44,7 @@
//this.tabbedView1.AppearancePage.Header.BackColor = Color.White;
this.tabbedView1.AppearancePage.HeaderSelected.Font = new Font("微软雅黑", 10f, FontStyle.Bold);
- // this.tabbedView1.CustomDrawTabHeader += OnCustomDrawTabHeader;
+ // this.tabbedView1.CustomDrawTabHeader += OnCustomDrawTabHeader;
}
private void OnCustomDrawTabHeader(object sender, TabHeaderCustomDrawEventArgs e)
@@ -161,6 +160,7 @@
{
pguid = this.tabbedView1.ActiveDocument.Tag as PageGuid;
}
+
SelectModular(tag, pguid);
}
@@ -185,8 +185,13 @@
//if (!IsExistPage(guid, true))
//{
//}
-
- SelectModular("BasicData");
+ var pageGuid = new PageGuid()
+ {
+ Modular = "Home",
+ MoudingType = eMoudingType.Tab,
+ Function = "MapInfo",
+ };
+ SelectModular("Home", pageGuid);
}
//界面正在退出时确认
@@ -548,6 +553,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;
}
@@ -576,6 +589,11 @@
dev_ele.Tag = ele;
dev_ele.Style = DevExpress.XtraBars.Navigation.ElementStyle.Item;
dev_ele.Click += delegate { ele.Click?.Invoke(); };
+ dev_ele.Enabled = ele.Enable;
+ ele.EnableChangedEvent += (bol) =>
+ {
+ dev_ele.Enabled = bol;
+ };
if (ele.Elements != null && ele.Elements.Count > 0)
{
dev_ele.Style = DevExpress.XtraBars.Navigation.ElementStyle.Group;
@@ -604,6 +622,10 @@
ctrl_ele.OwnerElement.Expanded = true;
this.accordionControlFunction.Refresh();
}
+ //if (!IsExistPage(pguid, true))
+ //{
+ // ele.Click.Invoke();
+ //}
return true;
}
else
@@ -620,6 +642,8 @@
return false;
}
+
+ private bool _ibox_status = false;
//获取
private List<AccordionElement> GetAccordionElementList(string modular)
@@ -1055,11 +1079,17 @@
{
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
- Function = "AssetsKitMgr",
+ Function = "AssetsPackageMgr",
}, svgImgItem32[8], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new PackageManageMainPage();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
})
};
@@ -1256,6 +1286,23 @@
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);
+ }
+ }),
}
};
@@ -1375,6 +1422,7 @@
list.Add(auth_config_ele);
}
break;
+
case "ModelManage":
{
var hydraulicScenario = Get("水力场景", new PageGuid()
@@ -1392,42 +1440,57 @@
//page.PageTitle.HeaderSvgImage = svg;
//page.PageTitle.SvgImageSize = size;
//CreatePage(page, guid);
-
}
});
var modelTemplate = Get("模型模版", new PageGuid()
{
Modular = "ModelManage",
MoudingType = eMoudingType.Tab,
- Function = " ",
+ 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 = " ",
+ 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 = " ",
+ 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);
@@ -1436,6 +1499,7 @@
list.Add(modelEdit);
}
break;
+
case "WaterSupplyAnalysis":
{
var systemCurve = Get("系统曲线", new PageGuid()
@@ -1475,7 +1539,6 @@
{
if (!IsExistPage(guid, true))
{
-
}
});
list.Add(systemCurve);
@@ -1483,46 +1546,359 @@
list.Add(operationalEvaluation);
}
break;
+
case "DataAnalysis":
{
- var analysis1 = Get("分析1", new PageGuid()
+ var analysis = Get("能耗分析", new PageGuid()
{
Modular = "DataAnalysis",
MoudingType = eMoudingType.Tab,
- Function = " ",
+ Function = "EnergyAnalysis",
}, svgImgItem32[4], 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 analysis2 = Get("分析1", new PageGuid()
+ var analysis1 = Get("流量压力比对分析", new PageGuid()
{
Modular = "DataAnalysis",
MoudingType = eMoudingType.Tab,
- Function = " ",
+ Function = "FlowPressAnalysis",
}, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
+ var page = new FlowPressAnalysis();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
}
});
+ var analysis2 = Get("末端压力分析", new PageGuid()
+ {
+ Modular = "DataAnalysis",
+ MoudingType = eMoudingType.Tab,
+ Function = "EndPressAnalysis",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new EndPressAnalysis();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ });
+ list.Add(analysis);
list.Add(analysis1);
list.Add(analysis2);
}
break;
+
+ case "SmartHardware":
+ {
+ // 创建一个列表来存储所有需要操作的 AccordionElement 对象
+ List<AccordionElement> allAccordionElements = new List<AccordionElement>();
+ AccordionElement accordionElement_Facility = new();
+ accordionElement_Facility = Get("选择设施", new PageGuid()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "FlowPressAnalysis",
+ }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ var dlg = new PBS.WinFrmUI.Box.ChoiceFacilityDlg();
+ dlg.SetDataSource();
+ dlg.VisibleChanged += (bol) =>
+ {
+ accordionElement_Facility.Enable = bol;
+ foreach (var item in allAccordionElements)
+ {
+ 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",
+ }, svgImgItem32[4], 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],
+ SvgImageSize = new Size(24, 24),
+ AllowGlyphSkinning = true,
+ Elements = new List<AccordionElement>()
+ {
+ Get("实时监测", new PageGuid()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "MonitorMgr",
+ }, svgImgItem32[2], 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()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "AnalysisMgr",
+ }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ var page = new AnalysisMgr();
+ page.PageGuid = guid;
+ page.PageTitle.Caption = caption;
+ page.PageTitle.HeaderSvgImage = svg;
+ page.PageTitle.SvgImageSize = size;
+ CreatePage(page, guid);
+ }
+ })
+ }
+ };
+ allAccordionElements.Add(accordionElement_Monitor);
+ var accordionElement_DataManagement = new AccordionElement()
+ {
+ Id = "management",
+ Caption = "数据管理",
+ SvgImage = svgImgGroup32[0],
+ SvgImageSize = new Size(24, 24),
+ AllowGlyphSkinning = true,
+ Elements = new List<AccordionElement>()
+ {
+ Get("协议配置", new PageGuid()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "ProtocolMgr",
+ }, svgImgItem32[2], 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 = "MonitorConfigurationMgr",
+ }, svgImgItem32[2], 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()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "DataFilterMgr",
+ }, svgImgItem32[2], 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()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "ParameterMgr",
+ }, svgImgItem32[2], 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()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "IntelligentControlData",
+ }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ }
+ }),Get("数据下发", new PageGuid()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "DataDeliveryMgr",
+ }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ 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()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "ServiceUpgradeMgr",
+ }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ {
+ if (!IsExistPage(guid, true))
+ {
+ }
+ })*/
+ Get("基础信息", new PageGuid()
+ {
+ Modular = "SmartHardware",
+ MoudingType = eMoudingType.Tab,
+ Function = "BasicInfoMgr",
+ }, svgImgItem32[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) =>
+ {
+ 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);
+ 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",
+ }, svgImgItem32[4], 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);
+ list.Add(accordionElement_Home);
+ }
+ break;
+
default:
break;
}
-
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)
@@ -1539,6 +1915,7 @@
ele.SvgImage = svg_img;
ele.SvgImageSize = size;
ele.AllowGlyphSkinning = glyph_skinning;
+ ele.IsNormallyOpen = is_normally_open;
return ele;
}
--
Gitblit v1.9.3