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 | 191 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 137 insertions(+), 54 deletions(-)
diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index 7a0e8f5..7edc0d0 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -11,16 +11,12 @@
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;
-using MathNet.Numerics.LinearAlgebra.Factorization;
-using static System.Windows.Forms.VisualStyles.VisualStyleElement.Window;
namespace PBS.Desktop
{
@@ -164,6 +160,7 @@
{
pguid = this.tabbedView1.ActiveDocument.Tag as PageGuid;
}
+
SelectModular(tag, pguid);
}
@@ -188,8 +185,13 @@
//if (!IsExistPage(guid, true))
//{
//}
-
- SelectModular("BasicData");
+ var pageGuid = new PageGuid()
+ {
+ Modular = "Home",
+ MoudingType = eMoudingType.Tab,
+ Function = "MapInfo",
+ };
+ SelectModular("Home", pageGuid);
}
//界面正在退出时确认
@@ -541,27 +543,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);
@@ -571,6 +552,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;
@@ -633,6 +622,10 @@
ctrl_ele.OwnerElement.Expanded = true;
this.accordionControlFunction.Refresh();
}
+ //if (!IsExistPage(pguid, true))
+ //{
+ // ele.Click.Invoke();
+ //}
return true;
}
else
@@ -649,6 +642,8 @@
return false;
}
+
+ private bool _ibox_status = false;
//获取
private List<AccordionElement> GetAccordionElementList(string modular)
@@ -1291,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);
+ }
+ }),
}
};
@@ -1434,12 +1446,12 @@
{
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 TemplateMgr();
+ var page = new ModelTemplatePage();
page.PageGuid = guid;
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
@@ -1451,22 +1463,34 @@
{
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);
@@ -1525,6 +1549,23 @@
case "DataAnalysis":
{
+ var analysis = Get("能耗分析", new PageGuid()
+ {
+ Modular = "DataAnalysis",
+ MoudingType = eMoudingType.Tab,
+ 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 analysis1 = Get("流量压力比对分析", new PageGuid()
{
Modular = "DataAnalysis",
@@ -1560,7 +1601,7 @@
CreatePage(page, guid);
}
});
-
+ list.Add(analysis);
list.Add(analysis1);
list.Add(analysis2);
}
@@ -1568,14 +1609,6 @@
case "SmartHardware":
{
- var guid = new PageGuid();
- var page = new IBoxHomeMgr();
- page.PageGuid = guid;
- page.PageTitle.Caption = "首页";
- // page.PageTitle.HeaderSvgImage = svg;
- // page.PageTitle.SvgImageSize = size;
- CreatePage(page, guid);
-
// 创建一个列表来存储所有需要操作的 AccordionElement 对象
List<AccordionElement> allAccordionElements = new List<AccordionElement>();
AccordionElement accordionElement_Facility = new();
@@ -1587,6 +1620,7 @@
}, 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;
@@ -1595,16 +1629,35 @@
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 = "检测分析",
+ Caption = "监测分析",
SvgImage = svgImgGroup32[0],
SvgImageSize = new Size(24, 24),
AllowGlyphSkinning = true,
@@ -1694,12 +1747,12 @@
{
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
- Function = "DataProcessingMgr",
+ Function = "DataFilterMgr",
}, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
- var page = new DataProcessingMgr();
+ var page = new DataFilter();
page.PageGuid = guid;
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
@@ -1723,7 +1776,7 @@
page.PageTitle.SvgImageSize = size;
CreatePage(page, guid);
}
- }),Get("智控数据", new PageGuid()
+ }),/*Get("智控数据", new PageGuid()
{
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
@@ -1759,7 +1812,8 @@
if (!IsExistPage(guid, true))
{
}
- }),Get("基础信息", new PageGuid()
+ })*/
+ Get("基础信息", new PageGuid()
{
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
@@ -1795,18 +1849,46 @@
}
};
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",
+ }, 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:
@@ -1816,7 +1898,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)
@@ -1833,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