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 |   27 ++++++++++++++++++++++++---
 1 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index 0c7350b..7edc0d0 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -1286,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);
+                            }
+                        }),
                      }
                         };
 
@@ -1457,18 +1474,23 @@
                                 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);
@@ -1752,7 +1774,6 @@
                                 page.PageTitle.Caption = caption;
                                 page.PageTitle.HeaderSvgImage = svg;
                                 page.PageTitle.SvgImageSize = size;
-
                                 CreatePage(page, guid);
                             }
                         }),/*Get("智控数据", new PageGuid()

--
Gitblit v1.9.3