From 3ec9dc154c79b015a249509e84b2768bc52ec6e3 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期一, 21 四月 2025 10:58:21 +0800
Subject: [PATCH] 增加首页图标
---
WinFrmUI/PBS.WinFrmUI/03-elecPrice/ElecPriceMgr.cs | 32 +++++++++-
BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice_Instance.cs | 6 +-
Desktop/PBS.Desktop/MainForm.Designer.cs | 4 +
Desktop/PBS.Desktop/MainForm.resx | 106 +++++++++++++++++++++++++++++++++++
Desktop/PBS.Desktop/MainForm.cs | 10 +-
WinFrmUI/PBS.WinFrmUI/03-elecPrice/AddElectricDlg.cs | 4
6 files changed, 146 insertions(+), 16 deletions(-)
diff --git a/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice_Instance.cs b/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice_Instance.cs
index 42915a8..fad7716 100644
--- a/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice_Instance.cs
+++ b/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice_Instance.cs
@@ -41,10 +41,10 @@
var mapper = new MapperConfiguration(cfg =>
{
cfg.CreateMap<PBS.Vmo.ElecPriceSetting, PBS.Dto.ElecPriceSetting>();
- cfg.CreateMap<PBS.Vmo.ElecPriceVmo, PBS.Dto.UpdateElecPriceInput>();
+ cfg.CreateMap<PBS.Vmo.ElecPriceVmo, PBS.Dto.AddElecPriceInput>();
cfg.CreateMap<PBS.Vmo.ElecPriceMonthSetting, PBS.Dto.ElecPriceMonthSetting>();
cfg.CreateMap<PBS.Vmo.ElecPriceHourSetting, PBS.Dto.ElecPriceHourSetting>();
- cfg.CreateMap<PBS.Vmo.ElecPriceVmo, PBS.Dto.UpdateElecPriceInput>()
+ cfg.CreateMap<PBS.Vmo.ElecPriceVmo, PBS.Dto.AddElecPriceInput>()
.ForMember(dest => dest.Settings, opt => opt.MapFrom(src => src.Settings));
}).CreateMapper();
var dto = mapper.Map<PBS.Vmo.ElecPriceVmo, PBS.Dto.AddElecPriceInput>(vmo);
@@ -100,7 +100,7 @@
cfg.CreateMap<PBS.Vmo.ElecPriceVmo, PBS.Dto.UpdateElecPriceInput>()
.ForMember(dest => dest.Settings, opt => opt.MapFrom(src => src.Settings));
}).CreateMapper();
- var dtoList = mapper.Map<List<PBS.Vmo.ElecPriceVmo>, List<PBS.Dto.UpdateElecPriceInput>>(vmoList);
+ var dtoList = mapper.Map<List<PBS.Vmo.ElecPriceVmo>, List<PBS.Dto.UpdateElecPriceInput>>(vmoList);
return dtoList;
}
}
diff --git a/Desktop/PBS.Desktop/MainForm.Designer.cs b/Desktop/PBS.Desktop/MainForm.Designer.cs
index b0c3d62..6006638 100644
--- a/Desktop/PBS.Desktop/MainForm.Designer.cs
+++ b/Desktop/PBS.Desktop/MainForm.Designer.cs
@@ -356,6 +356,7 @@
svgImgItem32.Add("Shaping Profile", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgItem32.Shaping Profile"));
svgImgItem32.Add("闃�闂� (1)", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgItem32.闃�闂� (1)"));
svgImgItem32.Add("闂峰ご绠″牭", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgItem32.闂峰ご绠″牭"));
+ svgImgItem32.Add("鐢佃垂", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgItem32.鐢佃垂"));
//
// accordionControlFunction
//
@@ -409,6 +410,9 @@
svgImageIBox.Add("鏁版嵁绠＄悊", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImageIBox.鏁版嵁绠＄悊"));
svgImageIBox.Add("璇︽儏", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImageIBox.璇︽儏"));
svgImageIBox.Add("鍗忚閰嶇疆", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImageIBox.鍗忚閰嶇疆"));
+ svgImageIBox.Add("渚涙按鍘嬪姏鍒嗘瀽", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImageIBox.渚涙按鍘嬪姏鍒嗘瀽"));
+ svgImageIBox.Add("瀵规瘮鍒嗘瀽", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImageIBox.瀵规瘮鍒嗘瀽"));
+ svgImageIBox.Add("鑳借�楀垎鏋� (1)", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImageIBox.鑳借�楀垎鏋� (1)"));
//
// svgImageHome
//
diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index e7c6163..29df251 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -1303,7 +1303,7 @@
Modular = "BasicData",
MoudingType = eMoudingType.Tab,
Function = "ElecPriceMgr",
- }, svgImgItem32[12], new Size(18, 18), (caption,guid,svg,size) =>
+ }, svgImgItem32[44], new Size(18, 18), (caption,guid,svg,size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1511,7 +1511,7 @@
Modular = "DataAnalysis",
MoudingType = eMoudingType.Tab,
Function = "EnergyAnalysis",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[14], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1528,7 +1528,7 @@
Modular = "DataAnalysis",
MoudingType = eMoudingType.Tab,
Function = "FlowPressAnalysis",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[13], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1546,7 +1546,7 @@
Modular = "DataAnalysis",
MoudingType = eMoudingType.Tab,
Function = "EndPressAnalysis",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[12], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1855,7 +1855,7 @@
AllowGlyphSkinning = true,
Elements = new List<AccordionElement>()
{
- Get("水力场景", new PageGuid()
+ Get("水力场景", new PageGuid()
{
Modular = "ModelManage",
MoudingType = eMoudingType.Tab,
diff --git a/Desktop/PBS.Desktop/MainForm.resx b/Desktop/PBS.Desktop/MainForm.resx
index faafe9d..e7f4a5b 100644
--- a/Desktop/PBS.Desktop/MainForm.resx
+++ b/Desktop/PBS.Desktop/MainForm.resx
@@ -353,6 +353,9 @@
<metadata name="documentManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
+ <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>101</value>
+ </metadata>
<metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>259, 17</value>
</metadata>
@@ -1721,6 +1724,43 @@
Pg0KPC9zdmc+Cw==
</value>
</data>
+ <data name="svgImgItem32.鐢佃垂" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAQHAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTU1NC42NjY2NjcgNTEydjQyLjY2NjY2
+ N2g2NGMxMi44IDAgMjEuMzMzMzMzIDguNTMzMzMzIDIxLjMzMzMzMyAyMS4zMzMzMzNzLTguNTMzMzMz
+ IDIxLjMzMzMzMy0yMS4zMzMzMzMgMjEuMzMzMzMzSDU1NC42NjY2Njd2NjRjMCAxMi44LTguNTMzMzMz
+ IDIxLjMzMzMzMy0yMS4zMzMzMzQgMjEuMzMzMzM0cy0yMS4zMzMzMzMtOC41MzMzMzMtMjEuMzMzMzMz
+ LTIxLjMzMzMzNFY1OTcuMzMzMzMzaC02NGMtMTIuOCAwLTIxLjMzMzMzMy04LjUzMzMzMy0yMS4zMzMz
+ MzMtMjEuMzMzMzMzczguNTMzMzMzLTIxLjMzMzMzMyAyMS4zMzMzMzMtMjEuMzMzMzMzSDUxMlY1MTJo
+ LTY0Yy0xMi44IDAtMjEuMzMzMzMzLTguNTMzMzMzLTIxLjMzMzMzMy0yMS4zMzMzMzNzOC41MzMzMzMt
+ MjEuMzMzMzMzIDIxLjMzMzMzMy0yMS4zMzMzMzRoNTUuNDY2NjY3bC00Ni45MzMzMzQtNDYuOTMzMzMz
+ Yy04LjUzMzMzMy04LjUzMzMzMy04LjUzMzMzMy0yMS4zMzMzMzMgMC0yOS44NjY2NjdzMjEuMzMzMzMz
+ LTguNTMzMzMzIDI5Ljg2NjY2NyAwbDQ2LjkzMzMzMyA0Ni45MzMzMzQgNDYuOTMzMzM0LTQ2LjkzMzMz
+ NGM4LjUzMzMzMy04LjUzMzMzMyAyMS4zMzMzMzMtOC41MzMzMzMgMjkuODY2NjY2IDAgOC41MzMzMzMg
+ OC41MzMzMzMgOC41MzMzMzMgMjEuMzMzMzMzIDAgMjkuODY2NjY3TDU2My4yIDQ2OS4zMzMzMzNoNTUu
+ NDY2NjY3YzEyLjggMCAyMS4zMzMzMzMgOC41MzMzMzMgMjEuMzMzMzMzIDIxLjMzMzMzNHMtOC41MzMz
+ MzMgMjEuMzMzMzMzLTIxLjMzMzMzMyAyMS4zMzMzMzNINTU0LjY2NjY2N3ogbTM4NCAwYzAgMjM0LjY2
+ NjY2Ny0xOTIgNDI2LjY2NjY2Ny00MjYuNjY2NjY3IDQyNi42NjY2NjdTODUuMzMzMzMzIDc0Ni42NjY2
+ NjcgODUuMzMzMzMzIDUxMiAyNzcuMzMzMzMzIDg1LjMzMzMzMyA1MTIgODUuMzMzMzMzdjEyOGMtMTY2
+ LjQgMC0yOTguNjY2NjY3IDEzMi4yNjY2NjctMjk4LjY2NjY2NyAyOTguNjY2NjY3czEzMi4yNjY2Njcg
+ Mjk4LjY2NjY2NyAyOTguNjY2NjY3IDI5OC42NjY2NjcgMjk4LjY2NjY2Ny0xMzIuMjY2NjY3IDI5OC42
+ NjY2NjctMjk4LjY2NjY2N2gxMjh6IG0tNDYuOTMzMzM0IDQyLjY2NjY2N2gtNDIuNjY2NjY2Yy0yMS4z
+ MzMzMzMgMTY2LjQtMTY2LjQgMjk4LjY2NjY2Ny0zMzcuMDY2NjY3IDI5OC42NjY2NjYtMTg3LjczMzMz
+ MyAwLTM0MS4zMzMzMzMtMTUzLjYtMzQxLjMzMzMzMy0zNDEuMzMzMzMzQzE3MC42NjY2NjcgMzM3LjA2
+ NjY2NyAzMDIuOTMzMzMzIDE5Ni4yNjY2NjcgNDY5LjMzMzMzMyAxNzQuOTMzMzMzdi00Mi42NjY2NjZD
+ Mjc3LjMzMzMzMyAxNTMuNiAxMjggMzE1LjczMzMzMyAxMjggNTEyYzAgMjEzLjMzMzMzMyAxNzAuNjY2
+ NjY3IDM4NCAzODQgMzg0IDE5Ni4yNjY2NjcgMCAzNTguNC0xNDkuMzMzMzMzIDM3OS43MzMzMzMtMzQx
+ LjMzMzMzM3ogbS04OS42LTEwNi42NjY2NjdsMTIzLjczMzMzNC0yOS44NjY2NjdDODkxLjczMzMzMyAy
+ NTYgNzYzLjczMzMzMyAxMjggNjAxLjYgOTMuODY2NjY3bC0yOS44NjY2NjcgMTIzLjczMzMzM2MxMTku
+ NDY2NjY3IDI5Ljg2NjY2NyAyMDQuOCAxMTUuMiAyMzAuNCAyMzAuNHoiIC8+DQo8L3N2Zz4L
+</value>
+ </data>
<metadata name="svgImgGroup32.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>455, 17</value>
</metadata>
@@ -1800,7 +1840,7 @@
</value>
</data>
<metadata name="svgImageIBox.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
- <value>823, 17</value>
+ <value>848, 16</value>
</metadata>
<data name="svgImageIBox.鍙傛暟閰嶇疆" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
@@ -2226,6 +2266,70 @@
IC8+DQo8L3N2Zz4L
</value>
</data>
+ <data name="svgImageIBox.渚涙按鍘嬪姏鍒嗘瀽" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIMFAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTkzMS40NCA3ODYuMTJINzk1Ljc5YTMy
+ IDMyIDAgMCAxIDAtNjRoMTM1LjY1YTMyIDMyIDAgMCAxIDAgNjR6TTIzNi4xNyA3ODYuMTJIMTAwYTMy
+ IDMyIDAgMCAxIDAtNjRoMTM2LjE3YTMyIDMyIDAgMSAxIDAgNjR6TTUxNiA3NjguNDdBMjI0LjQ1IDIy
+ NC40NSAwIDAgMSAyOTEuNTMgNTQ0YzAtNDkuNjcgMzIuNTQtMTQwLjU2IDk5LjQ2LTI3Ny44OSA0OC05
+ OC40NCA5Ni42Mi0xODUgOTcuMS0xODUuODRhMzIgMzIgMCAwIDEgNTUuNzcgMGMwLjQ5IDAuODYgNDku
+ MTMgODcuNCA5Ny4xIDE4NS44NCA2Ni45MyAxMzcuMzYgOTkuNDYgMjI4LjI1IDk5LjQ2IDI3Ny44OUEy
+ MjQuNDUgMjI0LjQ1IDAgMCAxIDUxNiA3NjguNDd6IG0wLTYwNS43NWMtMTguMTYgMzMuODMtNDMgODEu
+ MTktNjcuNTkgMTMxLjcyQzM2Ny42IDQ2MC4yNyAzNTUuNTMgNTIyIDM1NS41MyA1NDRjMCA4OC40NyA3
+ MiAxNjAuNDQgMTYwLjQ1IDE2MC40NFM2NzYuNDIgNjMyLjUgNjc2LjQyIDU0NGMwLTIyLTEyLjA2LTgz
+ Ljc2LTkyLjg2LTI0OS41OS0yNC42Mi01MC41LTQ5LjQzLTk3Ljg2LTY3LjU2LTEzMS42OXoiIGZpbGw9
+ IiNGRjNFM0UiIC8+DQogIDxwYXRoIGQ9Ik01MTYgOTYwYy04NS45MyAwLTE2Ni45NC0yOC41Ny0yMjgu
+ MTItODAuNDUtMzAuMjYtMjUuNjYtNTQuMDgtNTUuNjctNzAuOC04OS4xOGEyNDYuOTQgMjQ2Ljk0IDAg
+ MCAxLTI2LjQyLTExMS4xMSAzMiAzMiAwIDAgMSA2NCAwQzI1NC42NCA3OTguNzcgMzcxLjg4IDg5NiA1
+ MTYgODk2czI2MS4zMy05Ny4yMyAyNjEuMzMtMjE2Ljc0YTMyIDMyIDAgMCAxIDY0IDAgMjQ2Ljk0IDI0
+ Ni45NCAwIDAgMS0yNi40MiAxMTEuMTFjLTE2LjcyIDMzLjUyLTQwLjU0IDYzLjUyLTcwLjggODkuMThD
+ NjgyLjkxIDkzMS40MyA2MDEuOSA5NjAgNTE2IDk2MHpNNTE2IDYxMS4yMWE1My42MSA1My42MSAwIDAg
+ MS0zOC4xNi0xNS44bC03MC4zNC03MC4zNWEzMiAzMiAwIDEgMSA0NS4yNS00NS4yNUw1MTYgNTQzLjA1
+ bDYzLjI0LTYzLjI0YTMyIDMyIDAgMSAxIDQ1LjI2IDQ1LjI1bC03MC4zNSA3MC4zNWE1My42IDUzLjYg
+ MCAwIDEtMzguMTUgMTUuOHoiIGZpbGw9IiNGRjNFM0UiIC8+DQogIDxwYXRoIGQ9Ik01MTYgNTgyYTMy
+ IDMyIDAgMCAxLTMyLTMyVjM4Ni40YTMyIDMyIDAgMCAxIDY0IDBWNTUwYTMyIDMyIDAgMCAxLTMyIDMy
+ eiIgZmlsbD0iI0ZGM0UzRSIgLz4NCjwvc3ZnPgs=
+</value>
+ </data>
+ <data name="svgImageIBox.瀵规瘮鍒嗘瀽" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANcBAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTc3LjcxNDI4NTk0IDE2OS4xNDI4NTY4
+ OGg4NjguNTcxNDI4MTJ2Njg1LjcxNDI4NjI1SDc3LjcxNDI4NTk0VjE2OS4xNDI4NTY4OHogbTQzMiA4
+ NS43MTQyODYyNHY1MTQuMjg1NzEzNzVoMzQ5LjcxNDI4NTMxVjI1NC44NTcxNDMxMkg1MDkuNzE0Mjg1
+ OTR6IiBmaWxsPSIjMzMzMzMzIiAvPg0KICA8cGF0aCBkPSJNNDQzLjQyODU3MTU2IDMyaDkxLjQyODU3
+ MDk0djk2MEg0NDMuNDI4NTcxNTZ6IiBmaWxsPSIjMzMzMzMzIiAvPg0KPC9zdmc+Cw==
+</value>
+ </data>
+ <data name="svgImageIBox.鑳借�楀垎鏋� (1)" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGQCAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTk5My45NzEgNDEzLjAzbC0yMy44MTMt
+ MTguNjY2IDAuMTU2LTAuMjczTDUxMy42NTYgNi4yOFY2LjE0bC0wLjExNyAwLjA0LTAuMDQtMC4wNHYw
+ LjE0MUw1Ni44NDUgMzk0LjA5MWwwLjE5NiAwLjI3My0yMy43MzYgMTguNjY3LTE1LjcxOCAxMi4yNTd2
+ OTMuMTEzaDg2Ljc2N3Y0OTguODgxSDkyMi45NlY1MTguNGg4Ni43Mjd2LTkzLjExM2wtMTUuNzE3LTEy
+ LjI1NnpNODQxLjUwMyA5NDAuMjJIMTg1LjczNFY0MDEuMzM4TDUxMy41NCAxMTQuNzkybDMyNy45NjMg
+ Mjg2LjU0NlY5NDAuMjJ6TTQ1My40MTkgMzU3LjU2MmwtMTE4LjcxMyAyNjcuMjdoMTAyLjUyMWwtNzIu
+ ODUyIDI2Ny4yOUw2NjEuMjEyIDU2NS40Mkg1NTIuMzY1TDY5MC44OCAzNTcuNTYyaC0yMzcuNDZ6IiAv
+ Pg0KPC9zdmc+Cw==
+</value>
+ </data>
<metadata name="svgImageHome.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 58</value>
</metadata>
diff --git a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/AddElectricDlg.cs b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/AddElectricDlg.cs
index b741438..f8a86f6 100644
--- a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/AddElectricDlg.cs
+++ b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/AddElectricDlg.cs
@@ -103,7 +103,7 @@
return;
}*/
Eleprice.EndMonth = Endmonth;
- Eleprice.HourList = _allBindingList.ToList(); //鎶婄粦瀹氬垪琛ㄧ殑鍊艰祴缁檋ourlist
+ Eleprice.HourList = _allBindingList.ToList();
var isok = await this.ReloadDataEvent.Invoke(Eleprice);
if (isok == false)
{
@@ -111,7 +111,7 @@
return;
}
XtraMessageBox.Show("娣诲姞鎴愬姛");
- this.DialogResult = System.Windows.Forms.DialogResult.OK; //纭畾ok,鐒跺悗鍏抽棴
+ this.DialogResult = System.Windows.Forms.DialogResult.OK;
this.Close();
}
diff --git a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/ElecPriceMgr.cs b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/ElecPriceMgr.cs
index a616d57..835daab 100644
--- a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/ElecPriceMgr.cs
+++ b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/ElecPriceMgr.cs
@@ -60,11 +60,12 @@
}
}
}
- else
- {
- _elecPrice.Settings = new Vmo.ElecPriceSetting();
- _elecPrice.Settings.MonthList = new List<Vmo.ElecPriceMonthSetting> { new Vmo.ElecPriceMonthSetting() };
- }
+ }
+ else
+ {
+ _elecPrice = new Vmo.ElecPriceVmo();
+ _elecPrice.Settings = new Vmo.ElecPriceSetting();
+ _elecPrice.Settings.MonthList = new List<Vmo.ElecPriceMonthSetting>();
}
this.elecPriceViewModelBindingSource.DataSource = _allBindingList;
this.elecPriceViewModelBindingSource.ResetBindings(false);
@@ -80,6 +81,27 @@
{
var bll = new BLL.ElecPrice();
_elecPrice.Settings.MonthList.Add(price);
+ if (_elecPrice.ID == 0)
+ {
+ var id = await bll.Insert(_elecPrice);
+ if (id > 0)
+ {
+ _elecPrice.ID = id;
+ foreach (var item in price.HourList)
+ {
+ this._allBindingList.Add(new ElecPriceViewModel
+ {
+ BelongName = $"{price.StartMonth}~{price.EndMonth}(鏈�)",
+ StartHour = item.StartHour,
+ EndHour = item.EndHour,
+ Price = item.Price
+ });
+ }
+ this.elecPriceViewModelBindingSource.ResetBindings(false);
+ return true;
+ }
+ return false;
+ }
var bol = await bll.Update(_elecPrice);
if (bol)
{
--
Gitblit v1.9.3