From 146ca8c7eefe74d3b73c00a73e99e94e903be401 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 06 二月 2025 15:04:21 +0800
Subject: [PATCH] 增加工况管理功能和计算结果自由压力与绝对压力切换

---
 Desktop/PBS.Desktop.Core/MainForm.cs |   26 ++++++++++++++++++--------
 1 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/Desktop/PBS.Desktop.Core/MainForm.cs b/Desktop/PBS.Desktop.Core/MainForm.cs
index a9b6f87..cc0eac7 100644
--- a/Desktop/PBS.Desktop.Core/MainForm.cs
+++ b/Desktop/PBS.Desktop.Core/MainForm.cs
@@ -5,7 +5,10 @@
 using DevExpress.XtraEditors;
 using DevExpress.XtraTab;
 using DevExpress.XtraTab.ViewInfo;
+using HStation.WinFrmUI;
+using HStation.WinFrmUI.Assets;
 using HStation.WinFrmUI.Xhs.PumpProduct;
+using PBS.WinFrmUI.WE;
 using System.Drawing.Drawing2D;
 using System.IO;
 using Yw.WinFrmUI;
@@ -34,7 +37,8 @@
             this.xtraTabContrl.AllowGlyphSkinning = DevExpress.Utils.DefaultBoolean.True;
         }
 
-        HatchBrush myHatchBrush1 = new HatchBrush(HatchStyle.BackwardDiagonal, Color.LightGray, Color.AliceBlue);
+        private HatchBrush myHatchBrush1 = new HatchBrush(HatchStyle.BackwardDiagonal, Color.LightGray, Color.AliceBlue);
+
         private void TabbedView1_CustomDrawTabHeader(object sender, DevExpress.XtraTab.TabHeaderCustomDrawEventArgs e)
         {
             e.Cache.FillRectangle(myHatchBrush1, e.Bounds);
@@ -561,7 +565,6 @@
             return false;
         }
 
-
         //获取
         private List<AccordionElement> GetAccordionElementList(string modular)
         {
@@ -648,6 +651,8 @@
                         {
                             if (!IsExistPage(guid, true))
                             {
+                                var page=new WaterUtensilMainPage();
+                                CreatePage(page, guid);
                             }
                         }),
                         Get("用水当量",new PageGuid()
@@ -659,6 +664,8 @@
                         {
                             if (!IsExistPage(guid, true))
                             {
+                                var page=new WaterWEMgr();
+                                CreatePage(page, guid);
                             }
                         })
                     }
@@ -681,12 +688,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);
                             }
                         }),
                         Get("水泵管理",new PageGuid()
@@ -715,7 +722,13 @@
                         {
                             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);
+                             }
                         })
                     }
                 };
@@ -849,8 +862,5 @@
         }
 
         #endregion Modular
-
-
-
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3