From 0b0f37c86f484b10d911b56b77968f832ce69bbb Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期四, 27 三月 2025 11:51:22 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs | 2
WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.Designer.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.Designer.cs | 66 +
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.resx | 3
WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.cs | 8
WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs | 2
Desktop/PBS.Desktop/MainForm.cs | 26
WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs | 55
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs | 624 ++++++++++++------
WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.resx | 19
WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.Designer.cs | 294 +++++---
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs | 138 +++-
WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs | 8
BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice.cs | 2
WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user | 2
Desktop/PBS.Desktop/MainForm.Designer.cs | 19
Desktop/PBS.Desktop/MainForm.resx | 427 +++++++++++++
WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs | 6
WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs | 31
WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.resx | 116 +-
WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyViewModel.cs | 4
WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs | 6
22 files changed, 1,336 insertions(+), 528 deletions(-)
diff --git a/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice.cs b/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice.cs
index 445ac15..efa2411 100644
--- a/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice.cs
+++ b/BLL/PBS.BLL/04-bll/04-elec-price/ElecPrice.cs
@@ -3,7 +3,7 @@
namespace PBS.BLL
{
/// <summary>
- /// 璁炬柦
+ /// 鐢佃垂
///</summary>
public partial class ElecPrice
{
diff --git a/Desktop/PBS.Desktop/MainForm.Designer.cs b/Desktop/PBS.Desktop/MainForm.Designer.cs
index 34c333b..f6ed4c1 100644
--- a/Desktop/PBS.Desktop/MainForm.Designer.cs
+++ b/Desktop/PBS.Desktop/MainForm.Designer.cs
@@ -52,6 +52,7 @@
toolboxItem3 = new DevExpress.XtraToolbox.ToolboxItem();
toolboxItem5 = new DevExpress.XtraToolbox.ToolboxItem();
svgImgGroup32 = new DevExpress.Utils.SvgImageCollection(components);
+ svgImageIBox = new DevExpress.Utils.SvgImageCollection(components);
((System.ComponentModel.ISupportInitialize)tileNavPane).BeginInit();
((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit();
((System.ComponentModel.ISupportInitialize)tabbedView1).BeginInit();
@@ -62,6 +63,7 @@
((System.ComponentModel.ISupportInitialize)svgImgItem32).BeginInit();
((System.ComponentModel.ISupportInitialize)accordionControlFunction).BeginInit();
((System.ComponentModel.ISupportInitialize)svgImgGroup32).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)svgImageIBox).BeginInit();
SuspendLayout();
//
// tileNavPane
@@ -380,6 +382,21 @@
svgImgGroup32.Add("ExploitProtectionSettings.svg", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgGroup32.ExploitProtectionSettings.svg"));
svgImgGroup32.Add("Admin.svg", (DevExpress.Utils.Svg.SvgImage)resources.GetObject("svgImgGroup32.Admin.svg"));
//
+ // 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("鐩戞祴鍒嗘瀽", (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("鏁版嵁绠＄悊", (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.鍗忚閰嶇疆"));
+ //
// MainForm
//
Appearance.BackColor = Color.White;
@@ -408,6 +425,7 @@
((System.ComponentModel.ISupportInitialize)svgImgItem32).EndInit();
((System.ComponentModel.ISupportInitialize)accordionControlFunction).EndInit();
((System.ComponentModel.ISupportInitialize)svgImgGroup32).EndInit();
+ ((System.ComponentModel.ISupportInitialize)svgImageIBox).EndInit();
ResumeLayout(false);
}
@@ -435,5 +453,6 @@
private DevExpress.XtraBars.Navigation.NavButton nbModelManage;
private DevExpress.XtraBars.Navigation.NavButton nbWaterSupplyAnalysis;
private DevExpress.XtraBars.Navigation.NavButton nbDataAnalysis;
+ private DevExpress.Utils.SvgImageCollection svgImageIBox;
}
}
diff --git a/Desktop/PBS.Desktop/MainForm.cs b/Desktop/PBS.Desktop/MainForm.cs
index 7edc0d0..5bca20a 100644
--- a/Desktop/PBS.Desktop/MainForm.cs
+++ b/Desktop/PBS.Desktop/MainForm.cs
@@ -1490,7 +1490,7 @@
page.PageTitle.Caption = caption;
page.PageTitle.HeaderSvgImage = svg;
page.PageTitle.SvgImageSize = size;
- CreatePage(page, guid);
+ CreatePage(page, guid);
}
});
list.Add(hydraulicScenario);
@@ -1617,7 +1617,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "FlowPressAnalysis",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[7], new Size(18, 18), (caption, guid, svg, size) =>
{
var dlg = new PBS.WinFrmUI.Box.ChoiceFacilityDlg();
dlg.SetDataSource();
@@ -1641,7 +1641,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "IBoxInfo",
- }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[10], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1658,7 +1658,7 @@
{
Id = "monitor",
Caption = "监测分析",
- SvgImage = svgImgGroup32[0],
+ SvgImage = svgImageIBox[4],
SvgImageSize = new Size(24, 24),
AllowGlyphSkinning = true,
Elements = new List<AccordionElement>()
@@ -1668,7 +1668,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "MonitorMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[3], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1685,7 +1685,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "AnalysisMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[1], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1704,7 +1704,7 @@
{
Id = "management",
Caption = "数据管理",
- SvgImage = svgImgGroup32[0],
+ SvgImage = svgImageIBox[9],
SvgImageSize = new Size(24, 24),
AllowGlyphSkinning = true,
Elements = new List<AccordionElement>()
@@ -1714,7 +1714,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "ProtocolMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[11], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1731,7 +1731,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "MonitorConfigurationMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[5], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1748,7 +1748,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "DataFilterMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ },svgImageIBox[8], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1765,7 +1765,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "ParameterMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[0], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1818,7 +1818,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "BasicInfoMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[2], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
@@ -1834,7 +1834,7 @@
Modular = "SmartHardware",
MoudingType = eMoudingType.Tab,
Function = "LogManagentMgr",
- }, svgImgItem32[2], new Size(18, 18), (caption, guid, svg, size) =>
+ }, svgImageIBox[6], new Size(18, 18), (caption, guid, svg, size) =>
{
if (!IsExistPage(guid, true))
{
diff --git a/Desktop/PBS.Desktop/MainForm.resx b/Desktop/PBS.Desktop/MainForm.resx
index 73370a2..c70e8c0 100644
--- a/Desktop/PBS.Desktop/MainForm.resx
+++ b/Desktop/PBS.Desktop/MainForm.resx
@@ -1436,4 +1436,431 @@
Pg0KPC9zdmc+Cw==
</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>
+ </metadata>
+ <data name="svgImageIBox.鍙傛暟閰嶇疆" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANAEAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTgzNS42OTkwOTMgMTAyMy4yNzE1NjNh
+ MTg3LjM5MDM2MSAxODcuMzkwMzYxIDAgMCAxLTEzMi43NTc2MDMtNTQuNjMyNzU4bC0yMjQuMDU1MDEy
+ LTIyNC4xMTU3MTVBMzc3LjkzNzI4MSAzNzcuOTM3MjgxIDAgMCAxIDMxLjYyNjI5NyAyMjkuMDkzMzY3
+ YTQ1LjQ2NjU5NiA0NS40NjY1OTYgMCAwIDEgMzMuMjA0NTc2LTI2LjY0ODY0NiA0NS45NTIyMiA0NS45
+ NTIyMiAwIDAgMSA0MC43MzE3NTcgMTIuNTA0ODMxbDE2MC40MzgyIDE2MC4zNzc0OTggMTA5LjI2NTUx
+ Ny0xMDkuMjY1NTE3LTE2MC40MzgyMDEtMTYwLjM3NzQ5N0E0NS41ODgwMDIgNDUuNTg4MDAyIDAgMCAx
+ IDIyOC45NzE5NiAzMS42ODdhMzc3LjUxMjM2IDM3Ny41MTIzNiAwIDAgMSA0MTguODUxMTQ3IDc5LjM5
+ OTYwOSAzODAuOTcyNDM1IDM4MC45NzI0MzUgMCAwIDEgOTcuMTI0OTA0IDM2Ny44NjA1NzJsMjI0LjA1
+ NTAxMiAyMjQuMTE1NzE1YTE4Ny42MzMxNzMgMTg3LjYzMzE3MyAwIDAgMS0xMzIuNjk2ODk5IDMyMC4z
+ MzAwNzN6IG0tMzQ0LjEyNTY3NC0zNzYuMzU5MDAxYTQ1LjU4ODAwMiA0NS41ODgwMDIgMCAwIDEgMzIu
+ MTcyNjI0IDEzLjM1NDY3NGwyNDMuNjAxMzk5IDI0My42MDEzOTlhOTYuNjM5Mjc5IDk2LjYzOTI3OSAw
+ IDAgMCAxMzYuNzAzMzAyLTEzNi42NDI1OTlMNjYwLjQ0OTM0NSA1MjMuNjI0NjM3YTQ1LjQwNTg5MiA0
+ NS40MDU4OTIgMCAwIDEtMTAuNjgzNzM5LTQ3LjQ2OTc5NyAyODcuMDA0MDkgMjg3LjAwNDA5IDAgMCAw
+ LTMxNi44MDkyOTYtMzgxLjIxNTI0N2wxMzguNzY3MjA3IDEzOC43MDY1MDNhNDUuNDY2NTk2IDQ1LjQ2
+ NjU5NiAwIDAgMSAwIDY0LjM0NTI0OUwyOTguMTczNDU0IDQ3MS41NDE0MDdhNDYuNzQxMzYgNDYuNzQx
+ MzYgMCAwIDEtNjQuMzQ1MjQ4IDBMOTUuMDYwOTk5IDMzMi44OTU2MDdhMjg2Ljk0MzM4NyAyODYuOTQz
+ Mzg3IDAgMCAwIDM4MS4xNTQ1NDQgMzE2LjY4Nzg4OSA0Ni40OTg1NDggNDYuNDk4NTQ4IDAgMCAxIDE1
+ LjM1Nzg3Ni0yLjU0OTUyOHoiIC8+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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAIDAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTE0Ni4yODU3MTQgMTA5LjcxNDI4NnY3
+ NjhoNzY4YTM2LjU3MTQyOSAzNi41NzE0MjkgMCAxIDEgMCA3My4xNDI4NTdIMTQ2LjI4NTcxNGE3My4x
+ NDI4NTcgNzMuMTQyODU3IDAgMCAxLTczLjE0Mjg1Ny03My4xNDI4NTdWMTA5LjcxNDI4NmEzNi41NzE0
+ MjkgMzYuNTcxNDI5IDAgMSAxIDczLjE0Mjg1NyAweiBtMjkyLjg2NCAyMDUuNDU4Mjg1bDI0Ny4xNDk3
+ MTUgMTQ5LjQ2NzQyOSAxMjQuODU0ODU3LTIyNi41MjM0MjlhMzQuODE2IDM0LjgxNiAwIDAgMSA0OC43
+ MTMxNDMtMTMuNjc3NzE0YzE3LjA3ODg1NyAxMC4zMTMxNDMgMjIuOTMwMjg2IDMzLjE3MDI4NiAxMy4w
+ NTYgNTEuMDUzNzE0bC0xNjAuNTQ4NTcyIDI5MS4yNTQ4NTgtMjQ3LjExMzE0My0xNDkuNDY3NDI5LTE0
+ Mi43MDE3MTQgMjU4Ljg4OTE0M2EzNC44MTYgMzQuODE2IDAgMCAxLTQ4LjcxMzE0MyAxMy42Nzc3MTRj
+ LTE3LjA3ODg1Ny0xMC4zMTMxNDMtMjIuOTMwMjg2LTMzLjE3MDI4Ni0xMy4wNTYtNTEuMDUzNzE0bDE3
+ OC4zNTg4NTctMzIzLjYyMDU3MnoiIGZpbGw9IiM4MDhCQjUiIC8+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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAEcEAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTgzOS43IDEwMDMuNUgxODQuM2MtNjcu
+ OCAwLTEyMi45LTU1LjEtMTIyLjktMTIyLjlWMjI1LjNjMC02Ny44IDU1LjEtMTIyLjkgMTIyLjktMTIy
+ LjkgMjIuNiAwIDQxIDE4LjMgNDEgNDFzLTE4LjMgNDEtNDEgNDFjLTIyLjYgMC00MSAxOC40LTQxIDQx
+ djY1NS40YzAgMjIuNiAxOC40IDQxIDQxIDQxaDY1NS40YzIyLjYgMCA0MS0xOC40IDQxLTQxVjIyNS4z
+ YzAtMjIuNi0xOC40LTQxLTQxLTQxcy00MS0xOC4zLTQxLTQxIDE4LjMtNDEgNDEtNDFjNjcuOCAwIDEy
+ Mi45IDU1LjEgMTIyLjkgMTIyLjl2NjU1LjRjMCA2Ny44LTU1LjIgMTIyLjktMTIyLjkgMTIyLjl6IiAv
+ Pg0KICA8cGF0aCBkPSJNNjA0LjIgMjY2LjJINDE5LjhjLTYyLjEgMC0xMTIuNi01MC41LTExMi42LTEx
+ Mi42di0yMC41YzAtNjIuMSA1MC41LTExMi42IDExMi42LTExMi42aDE4NC4zYzYyLjEgMCAxMTIuNiA1
+ MC41IDExMi42IDExMi42djIwLjVjMC4xIDYyLjEtNTAuNCAxMTIuNi0xMTIuNSAxMTIuNnpNNDE5Ljgg
+ MTAyLjRjLTE2LjkgMC0zMC43IDEzLjgtMzAuNyAzMC43djIwLjVjMCAxNi45IDEzLjggMzAuNyAzMC43
+ IDMwLjdoMTg0LjNjMTYuOSAwIDMwLjctMTMuOCAzMC43LTMwLjd2LTIwLjVjMC0xNi45LTEzLjgtMzAu
+ Ny0zMC43LTMwLjdINDE5Ljh6TTczNy4zIDQ5MS41SDI4Ni43Yy0yMi41IDAtNDEtMTguNC00MS00MSAw
+ LTIyLjUgMTguNC00MSA0MS00MWg0NTAuNmMyMi41IDAgNDEgMTguNCA0MSA0MS0wLjEgMjIuNi0xOC41
+ IDQxLTQxIDQxek02MTQuNCA3MzcuM0gyODYuN2MtMjIuNSAwLTQxLTE4LjQtNDEtNDEgMC0yMi41IDE4
+ LjQtNDEgNDEtNDFoMzI3LjdjMjIuNSAwIDQxIDE4LjQgNDEgNDEgMCAyMi41LTE4LjUgNDEtNDEgNDF6
+ IiAvPg0KPC9zdmc+Cw==
+</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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFcGAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTUxMiAxNy4wNjY2NjdDMjM4LjkzMzMz
+ MyAxNy4wNjY2NjcgMTcuMDY2NjY3IDIzOC45MzMzMzMgMTcuMDY2NjY3IDUxMlMyMzguOTMzMzMzIDEw
+ MDYuOTMzMzMzIDUxMiAxMDA2LjkzMzMzMyAxMDA2LjkzMzMzMyA3ODUuMDY2NjY3IDEwMDYuOTMzMzMz
+ IDUxMiA3ODUuMDY2NjY3IDE3LjA2NjY2NyA1MTIgMTcuMDY2NjY3eiBtMCA5MjUuMDEzMzMzQzI3Ni40
+ OCA5NDIuMDggODEuOTIgNzQ3LjUyIDgxLjkyIDUxMlMyNzYuNDggODEuOTIgNTEyIDgxLjkyIDk0Mi4w
+ OCAyNzYuNDggOTQyLjA4IDUxMiA3NDcuNTIgOTQyLjA4IDUxMiA5NDIuMDh6IiAvPg0KICA8cGF0aCBk
+ PSJNNzIwLjIxMzMzMyAzMDAuMzczMzMzbDgxLjkyLTg4Ljc0NjY2Ni0zNy41NDY2NjYtMzQuMTMzMzM0
+ TDY4Mi42NjY2NjcgMjY2LjI0Yy00Ny43ODY2NjctMzQuMTMzMzMzLTEwNS44MTMzMzMtNTQuNjEzMzMz
+ LTE3MC42NjY2NjctNTQuNjEzMzMzLTE2My44NCAwLTI5Ni45NiAxMzMuMTItMjk2Ljk2IDI5Ni45NnMx
+ MzMuMTIgMjk2Ljk2IDI5Ni45NiAyOTYuOTZoNi44MjY2NjdjMTMuNjUzMzMzIDIwLjQ4IDM3LjU0NjY2
+ NyAzNy41NDY2NjcgNjQuODUzMzMzIDM3LjU0NjY2NiA0MC45NiAwIDc1LjA5MzMzMy0zNC4xMzMzMzMg
+ NzguNTA2NjY3LTc1LjA5MzMzMyA4OC43NDY2NjctNTEuMiAxNTAuMTg2NjY3LTE0Ni43NzMzMzMgMTUw
+ LjE4NjY2Ni0yNTkuNDEzMzMzLTMuNDEzMzMzLTc4LjUwNjY2Ny0zNy41NDY2NjctMTUzLjYtOTIuMTYt
+ MjA4LjIxMzMzNHogbS03OC41MDY2NjYgNDE5Ljg0Yy0xMy42NTMzMzMtMTcuMDY2NjY3LTM0LjEzMzMz
+ My0yNy4zMDY2NjctNTguMDI2NjY3LTI3LjMwNjY2Ni0zNy41NDY2NjcgMC03MS42OCAyNy4zMDY2Njct
+ NzUuMDkzMzMzIDY0Ljg1MzMzMy0xMzMuMTItMy40MTMzMzMtMjM4LjkzMzMzMy0xMTIuNjQtMjM4Ljkz
+ MzMzNC0yNDUuNzYgMC0xMzYuNTMzMzMzIDEwOS4yMjY2NjctMjQ1Ljc2IDI0NS43Ni0yNDUuNzYgNTEu
+ MiAwIDk1LjU3MzMzMyAxMy42NTMzMzMgMTM2LjUzMzMzNCA0MC45NmwtMTAyLjQgMTEyLjY0Yy0xMC4y
+ NC0zLjQxMzMzMy0yMC40OC02LjgyNjY2Ny0zNC4xMzMzMzQtNi44MjY2NjctNTQuNjEzMzMzIDAtOTgu
+ OTg2NjY3IDQ0LjM3MzMzMy05OC45ODY2NjYgOTguOTg2NjY3IDAgNTQuNjEzMzMzIDQ0LjM3MzMzMyA5
+ OC45ODY2NjcgOTguOTg2NjY2IDk4Ljk4NjY2N1M2MTQuNCA1NjYuNjEzMzMzIDYxNC40IDUxMmMwLTIz
+ Ljg5MzMzMy0xMC4yNC00Ny43ODY2NjctMjMuODkzMzMzLTY0Ljg1MzMzM2w5OC45ODY2NjYtMTA5LjIy
+ NjY2N2M0NC4zNzMzMzMgNDQuMzczMzMzIDcxLjY4IDEwNS44MTMzMzMgNzEuNjggMTc0LjA4LTMuNDEz
+ MzMzIDg4Ljc0NjY2Ny01MS4yIDE2My44NC0xMTkuNDY2NjY2IDIwOC4yMTMzMzN6IiAvPg0KPC9zdmc+
+ Cw==
+</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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKoLAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwOS43NjU2
+ MjVweCIgaGVpZ2h0PSIyMDBweCIgdmlld0JveD0iMCAwIDEwNzQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4
+ bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3Lncz
+ Lm9yZy8xOTk5L3hsaW5rIiBjbGFzcz0iaWNvbiI+DQogIDxwYXRoIGQ9Ik0yNDMuNDczNjM0IDUyOS41
+ MTI1ODljMjMuNDcxNzM0IDAgNDIuNTY1MzIxLTIxLjY0NzUwNiA0Mi41NjUzMjEtNDguMjgxMjM1IDAt
+ Ni40NDU2MDYtMS4wOTQ1MzctMTIuNTI2MzY2LTMuMDQwMzgtMTguMjQyMjhsODMuOTE0NDg5LTEwOS42
+ OTY5MTJjNC4wMTMzMDIgMS40NTkzODIgOC4zOTE0NDkgMi4xODkwNzQgMTIuNzY5NTk2IDIuMTg5MDcz
+ IDEyLjQwNDc1MSAwIDIzLjQ3MTczNC01Ljk1OTE0NSAzMS4yNTUxMDctMTUuNjg4MzYxbDc5LjI5MzEx
+ MiA0NS4yNDA4NTVjMC4yNDMyMyAyNi4zOTA0OTkgMTkuMjE1MjAyIDQ3Ljc5NDc3NCA0Mi41NjUzMjEg
+ NDcuNzk0Nzc1IDIzLjQ3MTczNCAwIDQyLjU2NTMyMS0yMS42NDc1MDYgNDIuNTY1MzItNDguMjgxMjM2
+ VjM4MS44NzE3MzRsMTEwLjQyNjYwNC0xMDcuNzUxMDY5YzUuMzUxMDY5IDIuNjc1NTM0IDExLjE4ODU5
+ OSA0LjAxMzMwMiAxNy4yNjkzNTggNC4xMzQ5MTcgMjMuNDcxNzM0IDAgNDIuNTY1MzIxLTIxLjY0NzUw
+ NiA0Mi41NjUzMjEtNDguMjgxMjM1IDAtMjYuNzU1MzQ0LTE5LjA5MzU4Ny00OC4yODEyMzUtNDIuNTY1
+ MzIxLTQ4LjI4MTIzNXMtNDIuNTY1MzIxIDIxLjY0NzUwNi00Mi41NjUzMiA0OC4yODEyMzVjMCA1LjQ3
+ MjY4NCAwLjg1MTMwNiAxMC44MjM3NTMgMi4zMTA2ODggMTUuNjg4MzYxbC0xMDMuMzcyOTIxIDEwMS4x
+ ODM4NDhjLTcuMjk2OTEyLTYuNjg4ODM2LTE2LjY2MTI4My0xMC40NTg5MDctMjYuNTEyMTE0LTEwLjU4
+ MDUyMy0xMS40MzE4MjkgMC4xMjE2MTUtMjIuMjU1NTgyIDUuMTA3ODM4LTI5LjY3NDExIDEzLjc0MjUx
+ OEw0MjIuMDA0NzUxIDMwMy45MTYzOWMtMS40NTkzODItMjUuMTc0MzQ3LTE5Ljk0NDg5My00NC45OTc2
+ MjUtNDIuNDQzNzA2LTQ0Ljk5NzYyNS0yMy40NzE3MzQgMC00Mi41NjUzMjEgMjEuNjQ3NTA2LTQyLjU2
+ NTMyMSA0OC4yODEyMzUgMCA3LjI5NjkxMiAxLjQ1OTM4MiAxNC4yMjg5NzkgNC4wMTMzMDIgMjAuNTUy
+ OTY5bC04Mi42OTgzMzcgMTA4LjIzNzUzYy00Ljc0Mjk5My0yLjA2NzQ1OC05Ljg1MDgzMS0zLjA0MDM4
+ LTE0Ljk1ODY3LTMuMDQwMzgtMjMuNDcxNzM0IDAtNDIuNTY1MzIxIDIxLjY0NzUwNi00Mi41NjUzMjEg
+ NDguMjgxMjM1IDAuMTIxNjE1IDI2LjYzMzcyOSAxOS4yMTUyMDIgNDguMjgxMjM1IDQyLjY4NjkzNiA0
+ OC4yODEyMzV6IiAvPg0KICA8cGF0aCBkPSJNNzQ2LjcxNzM0IDkxOS41MzI1NDJjLTEzNi44MTcxMDIg
+ MC0yNDguMDk1MDEyLTExMS4yNzc5MS0yNDguMDk1MDEyLTI0OC4wOTUwMTJzMTExLjI3NzkxLTI0OC4w
+ OTUwMTIgMjQ4LjA5NTAxMi0yNDguMDk1MDEyIDI0OC4wOTUwMTIgMTExLjI3NzkxIDI0OC4wOTUwMTIg
+ MjQ4LjA5NTAxMi0xMTEuMjc3OTEgMjQ4LjA5NTAxMi0yNDguMDk1MDEyIDI0OC4wOTUwMTJ6IG0wLTQz
+ NS4wMTc1NzhjLTEwMy4xMjk2OTEgMC0xODcuMDQ0MTgxIDgzLjkxNDQ4OS0xODcuMDQ0MTgxIDE4Ny4w
+ NDQxODEgMCAxMDMuMTI5NjkxIDgzLjkxNDQ4OSAxODcuMDQ0MTgxIDE4Ny4wNDQxODEgMTg3LjA0NDE4
+ czE4Ny4wNDQxODEtODMuOTE0NDg5IDE4Ny4wNDQxOC0xODcuMDQ0MThjMC0xMDMuMTI5NjkxLTgzLjkx
+ NDQ4OS0xODcuMDQ0MTgxLTE4Ny4wNDQxOC0xODcuMDQ0MTgxeiBtMCAwIiAvPg0KICA8cGF0aCBkPSJN
+ MTAzNi40MDQ3NTEgOTk4LjgyNTY1M2MtOS42MDc2MDEgMC0xOS4yMTUyMDItMy42NDg0NTYtMjYuNTEy
+ MTE0LTEwLjk0NTM2OEw4ODAuMjUwODMxIDg1OC4yMzg0OGMtMTQuNzE1NDM5LTE0LjcxNTQzOS0xNC43
+ MTU0MzktMzguNDMwNDA0IDAtNTMuMTQ1ODQzIDE0LjcxNTQzOS0xNC43MTU0MzkgMzguNDMwNDA0LTE0
+ LjcxNTQzOSA1My4xNDU4NDQgMGwxMjkuNjQxODA1IDEyOS42NDE4MDVjMTQuNzE1NDM5IDE0LjcxNTQz
+ OSAxNC43MTU0MzkgMzguNDMwNDA0IDAgNTMuMTQ1ODQzLTcuNDE4NTI3IDcuMjk2OTEyLTE3LjAyNjEy
+ OCAxMC45NDUzNjgtMjYuNjMzNzI5IDEwLjk0NTM2OCIgLz4NCiAgPHBhdGggZD0iTTgzMC4xNDUzNjgg
+ MTI1Ljc1MDExOWgtNzEzLjg4MTIzNWMtOS4yNDI3NTUgMC0xNi42NjEyODMgNy40MTg1MjctMTYuNjYx
+ MjgzIDE2LjY2MTI4MnY0NjQuODEzMzAyYzAgOS4yNDI3NTUgNy40MTg1MjcgMTYuNjYxMjgzIDE2LjY2
+ MTI4MyAxNi42NjEyODNoMzMyLjAwOTUwMXYxOTkuMjA1N2g0MS40NzA3ODRjMjIuODYzNjU4IDM5Ljg4
+ OTc4NiA1NC40ODM2MSA3My45NDIwNDMgOTIuNTQ5MTY5IDk5LjYwMjg1MUgxMDAuMzMyNTQyYy0xNS4z
+ MjM1MTUgMC0zMC4wMzg5NTUtNi42ODg4MzYtMzkuNjQ2NTU2LTE4LjYwNzEyNmE1MC4wODcyMjEgNTAu
+ MDg3MjIxIDAgMCAxLTQuMzc4MTQ4LTU2LjE4NjIyM2M4Ljg3NzkxLTE1LjQ0NTEzMSAyNS4yOTU5NjIt
+ MjQuOTMxMTE2IDQzLjE3MzM5Ny0yNC45MzExMTdoMjQ5LjA2NzkzNHYtOTkuNjAyODVIMjEuMTYxMDQ1
+ Yy0xMS42NzUwNTkgMC0yMS4xNjEwNDUtOS40ODU5ODYtMjEuMTYxMDQ1LTIxLjE2MTA0NVY0Ny4zMDgz
+ MTRjMC0xMS42NzUwNTkgOS40ODU5ODYtMjEuMTYxMDQ1IDIxLjE2MTA0NS0yMS4xNjEwNDZoOTA0LjA4
+ NzQxMWMxMS42NzUwNTkgMCAyMS4xNjEwNDUgOS40ODU5ODYgMjEuMTYxMDQ1IDIxLjE2MTA0NlY0NTIu
+ NDA4NTUxYy0yOC45NDQ0MTgtMjYuMTQ3MjY4LTYyLjg3NTA1OS00Ni4yMTM3NzctOTkuNjAyODUtNTku
+ MjI2NjAzVjE0Mi40MTE0MDFjMC05LjI0Mjc1NS03LjU0MDE0My0xNi42NjEyODMtMTYuNjYxMjgzLTE2
+ LjY2MTI4MnogbS04Mi45NDE1NjggNTQ3Ljg3NjQ4NCIgLz4NCjwvc3ZnPgs=
+</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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPkJAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTYxNS42IDgyOS41SDE0Ny41Yy0yNi45
+ IDAtNDguOC0yMS44LTQ4LjgtNDguOFYxOTUuNmMwLTI2LjkgMjEuOC00OC44IDQ4LjgtNDguOGg1ODUu
+ MWMyNi45IDAgNDguOCAyMS44IDQ4LjggNDguOHYzMzMuMWMtNi41LTAuNy0xMy4xLTEuMS0xOS44LTEu
+ MS0zLjEgMC02LjEgMC4xLTkuMiAwLjJWMTk1LjZjMC0xMC45LTguOC0xOS44LTE5LjgtMTkuOEgxNDcu
+ NWMtMTAuOSAwLTE5LjggOC44LTE5LjggMTkuOHY1ODUuMWMwIDEwLjkgOC44IDE5LjggMTkuOCAxOS44
+ aDQ0OS43YzUuMiAxMC4zIDExLjQgMjAgMTguNCAyOXogbS0yMi41LTE4OC4yYy00LjkgMTAuOS04Ljcg
+ MjIuMy0xMS40IDM0LjFIMzg3LjZjMS40LTUuNSAyLjEtMTEuMiAyLjEtMTcuMXMtMC43LTExLjYtMi4x
+ LTE3LjFoMjA1LjV2MC4xeiBtLTMzOS41LTM0MWMtMS40IDUuNS0yLjEgMTEuMi0yLjEgMTcuMXMwLjcg
+ MTEuNiAyLjEgMTcuMWgtNTIuNGMtOS40IDAtMTcuMS03LjYtMTcuMS0xNy4xczcuNi0xNy4xIDE3LjEt
+ MTcuMWg1Mi40eiBtMTM0IDBINjc5YzkuNCAwIDE3LjEgNy42IDE3LjEgMTcuMXMtNy42IDE3LjEtMTcu
+ MSAxNy4xSDM4Ny42YzEuNC01LjUgMi4xLTExLjIgMi4xLTE3LjFzLTAuNy0xMS42LTIuMS0xNy4xeiBt
+ LTY3LjQgNjguNGMtMjguMyAwLTUxLjItMjIuOS01MS4yLTUxLjJzMjIuOS01MS4yIDUxLjItNTEuMiA1
+ MS4yIDIyLjkgNTEuMiA1MS4yLTIyLjkgNTEuMi01MS4yIDUxLjJ6IG0tNjYuNiAyNzIuNmMtMS40IDUu
+ NS0yLjEgMTEuMi0yLjEgMTcuMXMwLjcgMTEuNiAyLjEgMTcuMWgtNTIuNGMtOS40IDAtMTcuMS03LjYt
+ MTcuMS0xNy4xczcuNi0xNy4xIDE3LjEtMTcuMWg1Mi40eiBtNjYuNiA2OC40Yy0yOC4zIDAtNTEuMi0y
+ Mi45LTUxLjItNTEuMnMyMi45LTUxLjIgNTEuMi01MS4yIDUxLjIgMjIuOSA1MS4yIDUxLjItMjIuOSA1
+ MS4yLTUxLjIgNTEuMnogbTE3Mi4zLTIzOC42Yy0xLjQgNS41LTIuMSAxMS4yLTIuMSAxNy4xczAuNyAx
+ MS42IDIuMSAxNy4xSDIwMS4xYy05LjQgMC0xNy4xLTcuNi0xNy4xLTE3LjFzNy42LTE3LjEgMTcuMS0x
+ Ny4xaDI5MS40eiBtMTM0LjEgMEg2NzljOS40IDAgMTcuMSA3LjYgMTcuMSAxNy4xcy03LjYgMTcuMS0x
+ Ny4xIDE3LjFoLTUyLjRjMS40LTUuNSAyLjEtMTEuMiAyLjEtMTcuMXMtMC44LTExLjYtMi4xLTE3LjF6
+ IG0tNjcuMSA2OC4zYy0yOC4zIDAtNTEuMi0yMi45LTUxLjItNTEuMiAwLTI4LjMgMjIuOS01MS4yIDUx
+ LjItNTEuMnM1MS4yIDIyLjkgNTEuMiA1MS4yYzAgMjguMy0yMi45IDUxLjItNTEuMiA1MS4yeiIgZmls
+ bD0iIzMzNDQ1MyIgLz4NCiAgPHBhdGggZD0iTTc2NS4yIDY1MC44Yy0zMi41IDAtNTkgMjcuNy01OSA2
+ MS41czI2LjYgNjEuNSA1OSA2MS41YzMyLjUgMCA1OS0yNy43IDU5LTYxLjVzLTI2LjYtNjEuNS01OS02
+ MS41ek03MTggNTUwLjljNS45IDAgMTIuNSAyLjMgMTYuMiA2LjIgNC40IDUuNCAxOS45IDE5LjIgMzEu
+ NyAxOS4yczI3LjMtMTMuOCAzMS43LTE4LjVjMy43LTQuNiAxMC4zLTYuOSAxNi4yLTYuOSAzLjcgMCA1
+ LjkgMCA4LjkgMS42aDAuN2w0MC41IDIzLjhoMC43YzguMSA2LjIgMTEuMSAxNy43IDcuNCAyNi45IDAg
+ MC0zLjcgOC41LTMuNyAxNi4yIDAgMjMuMSAxNy43IDQxLjUgMzkuOCA0MS41aDEuNWM3LjQgMCAxMy4z
+ IDYuOSAxNS41IDE3LjcgMC43IDAuOCAzLjcgMTkuMiAzLjcgMzMuOCAwIDE1LjQtMy43IDMzLjgtMy43
+ IDMzLjgtMS41IDEwLjctOC4xIDE3LjctMTUuNSAxNy43aC0xLjVjLTIyLjEgMC0zOS44IDE4LjUtMzku
+ OCA0MS41IDAgNy43IDMuNyAxNi4yIDMuNyAxNi4yIDMuNyA5LjIgMC43IDIwLTcuNCAyNi4xaC0wLjZs
+ LTQwLjUgMjMuOGgtMC43Yy0yLjIgMC44LTUuMiAxLjYtOC4xIDEuNi02LjYgMC0xMy4zLTMuMS0xNy03
+ LjctNC40LTUuNC0yMC43LTIwLTMyLjUtMjAtMTEuMSAwLTI1LjggMTMuOC0zMS43IDIwLTMuNyA0LjYt
+ OS42IDcuNy0xNi4yIDcuNy0zLjcgMC01LjkgMC04LjktMS42aC0wLjdsLTM5LjgtMjMuMWgtMC43Yy04
+ LjItNi4xLTExLjEtMTcuNy03LjQtMjYuOSAwIDAgMy43LTguNSAzLjctMTYuMiAwLTIzLjEtMTcuNy00
+ MS41LTM5LjgtNDEuNWgtMS41Yy03LjQgMC0xMy4zLTYuOS0xNS41LTE3LjctMC43LTAuOC0zLjctMTku
+ Mi0zLjctMzMuOCAwLTEzLjggMy0zMi4zIDMuNy0zMy44IDEuNS0xMC43IDguMS0xNy43IDE1LjUtMTcu
+ N2gwLjdjMjIuMSAwIDM5LjgtMTguNSAzOS44LTQxLjUgMC03LjctMy43LTE2LjItMy43LTE2LjItMy43
+ LTkuMi0wLjctMjAgNy40LTI2LjFoMC43bDQyLjEtMjQuNmgwLjdjMi4yLTAuOCA1LjEtMS41IDguMS0x
+ LjV6IiBmaWxsPSIjMzM0NDUzIiAvPg0KPC9zdmc+Cw==
+</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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJsMAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwNi4yNXB4
+ IiBoZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTA1NiAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5z
+ PSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3Jn
+ LzE5OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTEwLjk1NTc2MiA1MTIuNjIzODAx
+ aDgwLjI4NjE3OWExMC45NTU3NCAxMC45NTU3NCAwIDAgMSAxMC45NTU3NCAxMC45NzY3MDh2MTIuMTUw
+ OTExYTEwLjk1NTc0IDEwLjk1NTc0IDAgMCAxLTEwLjk1NTc0IDEwLjkxMzgwNUgxMC45NTU3NjJBMTAu
+ OTU1NzQgMTAuOTU1NzQgMCAwIDEgMC4wMDAwMjMgNTM1LjcwOTQ4NXYtMTIuMTA4OTc2YTEwLjk1NTc0
+ IDEwLjk1NTc0IDAgMCAxIDEwLjk1NTczOS0xMC45NzY3MDh6IG0wLTM0MC4zMDkzOTZoODAuMjg2MTc5
+ YTEwLjk1NTc0IDEwLjk1NTc0IDAgMCAxIDEwLjk1NTc0IDEwLjk1NTc0djEyLjE4MjM2M2ExMC45NTU3
+ NCAxMC45NTU3NCAwIDAgMS0xMC45NTU3NCAxMC45NTU3NEgxMC45NTU3NjJBMTAuOTU1NzQgMTAuOTU1
+ NzQgMCAwIDEgMC4wMDAwMjMgMTk1LjQ1MjUwOFYxODMuMjcwMTQ1YTEwLjk1NTc0IDEwLjk1NTc0IDAg
+ MCAxIDEwLjk1NTczOS0xMC45NTU3NHogbTAgMTcwLjIwNzExOGg4MC4yODYxNzlhMTAuOTU1NzQgMTAu
+ OTU1NzQgMCAwIDEgMTAuOTU1NzQgMTAuOTU1NzR2MTIuMTUwOTExYTEwLjk1NTc0IDEwLjk1NTc0IDAg
+ MCAxLTEwLjk1NTc0IDEwLjk1NTc0SDEwLjk1NTc2MkExMC45NTU3NCAxMC45NTU3NCAwIDAgMSAwLjAw
+ MDAyMyAzNjUuNjI4MTc0di0xMi4xNDA0MjdhMTAuOTU1NzQgMTAuOTU1NzQgMCAwIDEgMTAuOTU1NzM5
+ LTEwLjk1NTc0eiBtMCAzNDAuMTgzNTg4aDgwLjI4NjE3OWExMC45NTU3NCAxMC45NTU3NCAwIDAgMSAx
+ MC45NTU3NCAxMC45NTU3NHYxMi4xNTA5MTJhMTAuOTU1NzQgMTAuOTU1NzQgMCAwIDEtMTAuOTU1NzQg
+ MTAuOTU1NzRIMTAuOTU1NzYyQTEwLjk1NTc0IDEwLjk1NTc0IDAgMCAxIDAuMDAwMDIzIDcwNS44MTE3
+ NjN2LTEyLjE0MDQyOGExMC45NTU3NCAxMC45NTU3NCAwIDAgMSAxMC45NTU3MzktMTAuOTU1NzR6IG0t
+ MTAuOTU1NzM5IDAiIC8+DQogIDxwYXRoIGQ9Ik04MTUuMDY1MTQgNjguMDE5OTU0SDc1NS4xNTk3ODNh
+ OC41NTQ5MTMgOC41NTQ5MTMgMCAwIDEtOC41MjM0NjEtNy41Nzk5MDRBNjguMDgyODQ3IDY4LjA4Mjg0
+ NyAwIDAgMCA2NzkuMDM1NzM3IDAuMDAwMDFIMTA4Ljk4MDgwNGE3Ni42MDYzMDggNzYuNjA2MzA4IDAg
+ MCAwLTc2LjYzNzc2IDc2LjYxNjc5MnY1MC44MjYyNDdhOC41ODYzNjUgOC41ODYzNjUgMCAwIDAgOC41
+ ODYzNjUgOC41ODYzNjRoNTAuODM2NzNhNDIuNjU5MjQgNDIuNjU5MjQgMCAwIDEgNDIuNjkwNjkyIDQy
+ LjY0ODc1NnYyNS40NzYwMjdhMzQuMTM1Nzc5IDM0LjEzNTc3OSAwIDAgMS0zNC4wNjIzOTEgMzQuMDYy
+ MzkySDQwLjk3MTM0NWE4LjU4NjM2NSA4LjU4NjM2NSAwIDAgMC04LjYyODMwMSA4LjYwNzMzMnY1MC44
+ MzY3MzFhOC41ODYzNjUgOC41ODYzNjUgMCAwIDAgOC41ODYzNjUgOC41ODYzNjRoNTAuODM2NzNhNDIu
+ NjU5MjQgNDIuNjU5MjQgMCAwIDEgNDIuNjU5MjQgNDIuNjU5MjR2MTYuODg5NjYzYTQyLjY1OTI0IDQy
+ LjY1OTI0IDAgMCAxLTQyLjY1OTI0IDQyLjY1OTI0SDQwLjk3MTM0NWE4LjU4NjM2NSA4LjU4NjM2NSAw
+ IDAgMC04LjU4NjM2NSA4LjU4NjM2NHY1MC44MjYyNDdhOC41ODYzNjUgOC41ODYzNjUgMCAwIDAgOC41
+ ODYzNjUgOC41ODYzNjRoNTAuODM2NzNhNDIuNjU5MjQgNDIuNjU5MjQgMCAwIDEgNDIuNjU5MjQgNDIu
+ NjU5MjR2MjUuNDU1MDU5YTM0LjEzNTc3OSAzNC4xMzU3NzkgMCAwIDEtMzQuMDYyMzkxIDM0LjA3Mjg3
+ Nkg0MC45NzEzNDVhOC41ODYzNjUgOC41ODYzNjUgMCAwIDAtOC41ODYzNjUgOC41ODYzNjR2NTAuOTUy
+ MDU0YTguNTg2MzY1IDguNTg2MzY1IDAgMCAwIDguNTg2MzY1IDguNTg2MzY1aDUwLjgzNjczYTQyLjY1
+ OTI0IDQyLjY1OTI0IDAgMCAxIDQyLjY1OTI0IDQyLjY1OTI0djI1LjI0NTM4YTM0LjEzNTc3OSAzNC4x
+ MzU3NzkgMCAwIDEtMzQuMDYyMzkxIDM0LjA2MjM5MUg0MC45NzEzNDVhOC41ODYzNjUgOC41ODYzNjUg
+ MCAwIDAtOC42MjgzMDEgOC42NTk3NTJ2MTE5LjAzNDkwMWE3Ni42MDYzMDggNzYuNjA2MzA4IDAgMCAw
+ IDc2LjYwNjMwOCA3Ni42MDYzMDhoNjk3LjUyOTQyM2E3Ni42MDYzMDggNzYuNjA2MzA4IDAgMCAwIDc2
+ LjYwNjMwOC03Ni42MDYzMDhWMTM2LjAzOTg5N2E2OC4wNzIzNjMgNjguMDcyMzYzIDAgMCAwLTY4LjAx
+ OTk0My02OC4wMDk0NTl6IG0tMjk1Ljg2Nzg4MyA4NC42ODk0NDJjOC4zODcxNjktMTQuMTc0MzE2IDMz
+ LjExODgzNS0yMC40OTYxNDUgNDcuNjM5MTIyLTEyLjUwNzM2Nmw4MS4yNDAyMTkgNDUuNTAwMzk0YzE0
+ LjUzMDc3MSA4LjIxOTQyNiAyMS4yMDkwNTQgMzIuMTY0Nzk0IDEyLjg2MzgyMSA0Ni4zMzkxMUw0MDQu
+ MjMwMTMzIDY2NS43ODM5OTdhOC41ODYzNjUgOC41ODYzNjUgMCAwIDEtMTEuNTg0Nzc3IDMuMTQ1MTg5
+ bC0xMjYuNzUxMDk3LTcwLjkzNDQ4NWE4LjU4NjM2NSA4LjU4NjM2NSAwIDAgMS0zLjE0NTE4OS0xMS44
+ Njc4NDV6TTM2NS4wMDk2MzMgNzA4Ljg5NDA0OGwtMTAzLjA2NzgyOCAzOC4yOTc5MTJhOC41ODYzNjUg
+ OC41ODYzNjUgMCAwIDEtMTEuNTMyMzU4LTcuMzM4Nzc0bC04LjM4NzE2OS0xMDAuNTYyMTZhOC41ODYz
+ NjUgOC41ODYzNjUgMCAwIDEgMTIuNzQ4NDk3LTguMjA4OTQybDExMS40MjM1NDUgNjIuMjY0MjQ4YTgu
+ NTg2MzY1IDguNTg2MzY1IDAgMCAxLTEuMTg0Njg3IDE1LjU0NzcxNnogbTQ1MC4wNTU1MDcgMTQxLjgw
+ NjA2NWMwIDM3LjUyMjA5OS0yLjA5Njc5MiA2OC4wMDk0NTktNjguMDA5NDYgNjguMDA5NDZIMTM0LjQ1
+ NjgzMWE2OC4xNDU3NTEgNjguMTQ1NzUxIDAgMCAxLTY3LjI5NjU1LTU4LjExMjYgOC42MTc4MTcgOC42
+ MTc4MTcgMCAwIDEgOC41MDI0OTMtOS44OTY4Nmg1OTQuNjcxMjc1YTc2LjYwNjMwOCA3Ni42MDYzMDgg
+ MCAwIDAgNzYuNjA2MzA4LTc2LjYwNjMwOFYxMTAuODI1OTY5YTguNjA3MzMzIDguNjA3MzMzIDAgMCAx
+ IDguNzAxNjg4LTguNTk2ODQ4YzMzLjQyMjg3IDAuMzQ1OTcxIDU5LjMwNzc3MSA0Ljk5MDM2NiA1OS4z
+ MDc3NzEgNjcuOTg4NDkxdjY4MC40ODI1MDF6IG0wIDAiIC8+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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAG0DAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTMzNi44ODUgNjgxLjk5NGgxODEuNzE5
+ djc2LjQ2N0gzMzYuODg1eiIgZmlsbD0iI0YyOTYwMCIgLz4NCiAgPHBhdGggZD0iTTcyOC44ODYgOTM5
+ LjA4N2MwIDEuMS0wLjkgMi0yIDJINDYzLjI1NGMtMS4xIDAtMi0wLjktMi0yVjgyLjcxNWMwLTEuMSAw
+ LjktMiAyLTJoMjYzLjYzMmMxLjEgMCAyIDAuOSAyIDJ2ODU2LjM3MnogbS0xOTEuMTY1LTc2LjQ2NmMw
+ IDEuMSAwLjkgMiAyIDJoMTEwLjY5OGMxLjEgMCAyLTAuOSAyLTJ2LTcwNi40NGMwLTEuMS0wLjktMi0y
+ LTJINTM5LjcyMWMtMS4xIDAtMiAwLjktMiAydjcwNi40NHpNMzQ2LjU1NSA5MzkuMDg3YzAgMS4xLTAu
+ OSAyLTIgMkg4MC45MjRjLTEuMSAwLTItMC45LTItMlY4Mi43MTVjMC0xLjEgMC45LTIgMi0yaDI2My42
+ MzFjMS4xIDAgMiAwLjkgMiAydjg1Ni4zNzJ6TTE1NS4zOSA4NjIuNjIxYzAgMS4xIDAuOSAyIDIgMmgx
+ MTAuNjk5YzEuMSAwIDItMC45IDItMnYtNzA2LjQ0YzAtMS4xLTAuOS0yLTItMkgxNTcuMzljLTEuMSAw
+ LTIgMC45LTIgMnY3MDYuNDR6TTk1MC4zODQgOTM5LjA4N2MwIDEuMS0wLjkgMi0yIDJIODM3LjY4NWMt
+ MS4xIDAtMi0wLjktMi0yVjg0YzAtMS4xIDAuOS0yIDItMmgxMTAuNjk5YzEuMSAwIDIgMC45IDIgMnY4
+ NTUuMDg3eiIgZmlsbD0iI0YyOTYwMCIgLz4NCjwvc3ZnPgs=
+</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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAMIFAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTczNiA2MjUuOTJjMCA3MC43Mi0xMDcu
+ NDU2IDEyOC0yNDAgMTI4LTEzMi41NDQgMC0yNDAtNTcuMjgtMjQwLTEyOHYtMjI0Ljg2NGMwLTcwLjcy
+ IDEwNy40NTYtMTI4IDI0MC0xMjggMTMyLjU0NCAwIDI0MCA1Ny4yOCAyNDAgMTI4djIyNC44NjR6IiBm
+ aWxsPSIjRkZGRkZGIiAvPg0KICA8cGF0aCBkPSJNMjg0LjIyNCA0NDQuMjg4VjUxMmMwIDQ2LjQzMiA5
+ Mi45MjggOTYgMjExLjc3NiA5NiAxMTguODQ4IDAgMjExLjc3Ni00OS41NjggMjExLjc3Ni05NnYtNjcu
+ NzEyQzY2Ny4zNiA0ODQuNjA4IDU4Ny42OCA1MTIgNDk2IDUxMnMtMTcxLjM2LTI3LjQyNC0yMTEuNzc2
+ LTY3LjcxMnpNMjU2IDM4NGMwLTcwLjcyIDEwNy40NTYtMTI4IDI0MC0xMjggMTMyLjU0NCAwIDI0MCA1
+ Ny4yOCAyNDAgMTI4djI1NmMwIDcwLjcyLTEwNy40NTYgMTI4LTI0MCAxMjgtMTMyLjU0NCAwLTI0MC01
+ Ny4yOC0yNDAtMTI4di0yNTZ6IG0yNDAgOTZjMTE4Ljg0OCAwIDIxMS43NzYtNDkuNTY4IDIxMS43NzYt
+ OTZTNjE0Ljg0OCAyODggNDk2IDI4OGMtMTE4Ljg0OCAwLTIxMS43NzYgNDkuNTY4LTIxMS43NzYgOTZz
+ OTIuOTI4IDk2IDIxMS43NzYgOTZ6IG0yMTEuNzc2IDkyLjI4OEM2NjcuMzYgNjEyLjYwOCA1ODcuNjgg
+ NjQwIDQ5NiA2NDBzLTE3MS4zNi0yNy40MjQtMjExLjc3Ni02Ny43MTJWNjQwYzAgNDYuNDMyIDkyLjky
+ OCA5NiAyMTEuNzc2IDk2IDExOC44NDggMCAyMTEuNzc2LTQ5LjU2OCAyMTEuNzc2LTk2di02Ny43MTJ6
+ IiBmaWxsPSIjNUQ2RDdFIiAvPg0KICA8cGF0aCBkPSJNMzUxLjc3NiAxNTkuOTM2Yy0xNTAuMTc2IDYy
+ Ljc1Mi0yNTUuNzEyIDIxMS4wNzItMjU1LjcxMiAzODQgMCAxNzMuMDU2IDEwNS42NjQgMzIxLjQ0IDI1
+ NiAzODQuMTI4Vjg5My4xMmMtMTMyLjE5Mi02MC42NzItMjI0LTE5NC4yMDgtMjI0LTM0OS4xODQgMC0x
+ NTQuOTc2IDkxLjgwOC0yODguNTEyIDIyNC0zNDkuMTg0djYxLjE4NGgzMnYtMTI4aC0xMjh2MzJoOTUu
+ NzEyeiIgZmlsbD0iIzI3QTJERiIgLz4NCiAgPHBhdGggZD0iTTY3Mi4zMiA4OTYuMDY0YzE1MC4yMDgt
+ NjIuNzUyIDI1NS43NDQtMjExLjA3MiAyNTUuNzQ0LTM4NCAwLTE3My4wNTYtMTA1LjY2NC0zMjEuNDQt
+ MjU2LTM4NC4xMjhWMTYyLjg4YzEzMi4xNiA2MC42NzIgMjI0IDE5NC4yMDggMjI0IDM0OS4xODQgMCAx
+ NTQuOTc2LTkxLjg0IDI4OC41MTItMjI0IDM0OS4xODR2LTYxLjE4NGgtMzJ2MTI4aDEyOHYtMzJINjcy
+ LjMyeiIgZmlsbD0iIzMwQUQ5OCIgLz4NCjwvc3ZnPgs=
+</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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAACgHAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTQ5MC42NjY2NjcgODUuMzMzMzMzYy0x
+ OTEuMzYgMC0zNDEuMzMzMzMzIDkzLjc2LTM0MS4zMzMzMzQgMjEzLjMzMzMzNHY0MjYuNjY2NjY2YzAg
+ MTE5LjU3MzMzMyAxNDkuOTczMzMzIDIxMy4zMzMzMzMgMzQxLjMzMzMzNCAyMTMuMzMzMzM0czM0MS4z
+ MzMzMzMtOTMuNzYgMzQxLjMzMzMzMy0yMTMuMzMzMzM0VjI5OC42NjY2NjdjMC0xMTkuNTczMzMzLTE0
+ OS45NzMzMzMtMjEzLjMzMzMzMy0zNDEuMzMzMzMzLTIxMy4zMzMzMzR6IG0yNzcuMzMzMzMzIDY0MGMw
+ IDEzLjk3MzMzMy0zLjczMzMzMyAyNy41Mi0xMC44OCA0MC40MjY2NjctMi40NTMzMzMgNC42OTMzMzMt
+ NS40NCA5LjM4NjY2Ny04Ljk2IDEzLjg2NjY2N0M3MDYuOTg2NjY3IDgzNC42NjY2NjcgNjA1LjY1MzMz
+ MyA4NzQuNjY2NjY3IDQ5MC42NjY2NjcgODc0LjY2NjY2N3MtMjE2LjMyLTQwLTI1Ny40OTMzMzQtOTUu
+ MDRjLTMuNTItNC40OC02LjUwNjY2Ny05LjE3MzMzMy04Ljk2LTEzLjg2NjY2N0MyMTcuMDY2NjY3IDc1
+ Mi44NTMzMzMgMjEzLjMzMzMzMyA3MzkuMzA2NjY3IDIxMy4zMzMzMzMgNzI1LjMzMzMzM3YtODcuNzg2
+ NjY2YzIuMzQ2NjY3IDIuMTMzMzMzIDQuNjkzMzMzIDQuMTYgNy4xNDY2NjcgNi4wOEMyODUuMDEzMzMz
+ IDY5NS41NzMzMzMgMzgzLjQ2NjY2NyA3MjUuMzMzMzMzIDQ5MC42NjY2NjcgNzI1LjMzMzMzM3MyMDUu
+ NjUzMzMzLTI5Ljc2IDI3MC4xODY2NjYtODEuNzA2NjY2YzIuNDUzMzMzLTEuOTIgNC44LTMuOTQ2NjY3
+ IDcuMTQ2NjY3LTYuMDhWNzI1LjMzMzMzM3ogbTAtMjEzLjMzMzMzM2MwIDM2LjI2NjY2Ny0yNS43MDY2
+ NjcgNjQuNDI2NjY3LTQ3LjI1MzMzMyA4MS43MDY2NjdDNjY4LjE2IDYzNi4wNTMzMzMgNTgyLjE4NjY2
+ NyA2NjEuMzMzMzMzIDQ5MC42NjY2NjcgNjYxLjMzMzMzM3MtMTc3LjQ5MzMzMy0yNS4yOC0yMzAuMDgt
+ NjcuNjI2NjY2QzIzOS4wNCA1NzYuNDI2NjY3IDIxMy4zMzMzMzMgNTQ4LjI2NjY2NyAyMTMuMzMzMzMz
+ IDUxMlY0MjQuNDI2NjY3QzI3NC43NzMzMzMgNDc3Ljg2NjY2NyAzNzUuMTQ2NjY3IDUxMiA0OTAuNjY2
+ NjY3IDUxMnMyMTUuODkzMzMzLTM0LjEzMzMzMyAyNzcuMzMzMzMzLTg3LjU3MzMzM1Y1MTJ6TTQ5MC42
+ NjY2NjcgNDQ4QzM0MC4zNzMzMzMgNDQ4IDIxMy4zMzMzMzMgMzc5LjYyNjY2NyAyMTMuMzMzMzMzIDI5
+ OC42NjY2NjdzMTI3LjA0LTE0OS4zMzMzMzMgMjc3LjMzMzMzNC0xNDkuMzMzMzM0IDI3Ny4zMzMzMzMg
+ NjguMzczMzMzIDI3Ny4zMzMzMzMgMTQ5LjMzMzMzNFM2NDAuOTYgNDQ4IDQ5MC42NjY2NjcgNDQ4eiIg
+ Lz4NCiAgPHBhdGggZD0iTTIzMy4xNzMzMzMgNzc5LjYyNjY2N2MtMy41Mi00LjQ4LTYuNTA2NjY3LTku
+ MTczMzMzLTguOTYtMTMuODY2NjY3IDAuNDI2NjY3IDAuMzIgMC43NDY2NjcgMC42NCAxLjA2NjY2NyAw
+ Ljk2IDMuNjI2NjY3IDMuNjI2NjY3IDYuMjkzMzMzIDguMTA2NjY3IDcuODkzMzMzIDEyLjkwNjY2N3pN
+ NzU3LjEyIDc2NS43NmMtMi40NTMzMzMgNC42OTMzMzMtNS40NCA5LjM4NjY2Ny04Ljk2IDEzLjg2NjY2
+ NyAxLjYtNC44IDQuMjY2NjY3LTkuMjggNy44OTMzMzMtMTIuOTA2NjY3IDAuMzItMC4zMiAwLjY0LTAu
+ NjQgMS4wNjY2NjctMC45NnoiIC8+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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJoCAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTgxNC44IDg5Mi43NGgtOC42NGwtMjgz
+ LjUxLTE4Mi0yODMuNTEgMTgyaC04LjY0QTY5Ljg1IDY5Ljg1IDAgMCAxIDE2MC43MiA4MjNWMTg4LjIy
+ YTY5Ljg1IDY5Ljg1IDAgMCAxIDY5Ljc3LTY5Ljc3SDgxNC44YTY5Ljg1IDY5Ljg1IDAgMCAxIDY5Ljc3
+ IDY5Ljc3VjgyM2E2OS44NSA2OS44NSAwIDAgMS02OS43NyA2OS43NHpNMjMwLjUgMTc3LjM1YTEwLjg3
+ IDEwLjg3IDAgMCAwLTEwLjg2IDEwLjg2VjgyM2ExMC44NiAxMC44NiAwIDAgMCA1IDkuMTFsMjk4LjAx
+ LTE5MS40MiAyOTguMDYgMTkxLjM4YTEwLjg2IDEwLjg2IDAgMCAwIDUtOS4xMVYxODguMjJhMTAuODcg
+ MTAuODcgMCAwIDAtMTAuODYtMTAuODZ6IiAvPg0KICA8cGF0aCBkPSJNMzE0LjgxIDMwNC4wMWg0MTUu
+ ODZ2NTguOTFIMzE0Ljgxek0zMTQuODEgNDQwLjI0aDQxNS44NnY1OC45MUgzMTQuODF6IiAvPg0KPC9z
+ dmc+Cw==
+</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
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJ4GAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgd2lkdGg9IjIwMHB4IiBo
+ ZWlnaHQ9IjIwMHB4IiB2aWV3Qm94PSIwIDAgMTAyNCAxMDI0IiB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJo
+ dHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5
+ OTkveGxpbmsiIGNsYXNzPSJpY29uIj4NCiAgPHBhdGggZD0iTTUxMiAxMDI0Yy0yNS42IDAtNTEuMi00
+ LjI2NjY2Ny04MS4wNjY2NjctOC41MzMzMzNsLTI1LjYtNC4yNjY2NjctMjUuNi04MS4wNjY2NjctNjQt
+ MjUuNi03Ni44IDM4LjQtMjUuNi0xNy4wNjY2NjZjLTI1LjYtMTcuMDY2NjY3LTQyLjY2NjY2Ny0zNC4x
+ MzMzMzMtNjQtNTEuMi0xNy4wNjY2NjctMjEuMzMzMzMzLTM0LjEzMzMzMy0zOC40LTUxLjItNjRsLTE3
+ LjA2NjY2Ni0yMS4zMzMzMzQgMzguNC03Ni44Yy0xMi44LTIxLjMzMzMzMy0yMS4zMzMzMzMtNDIuNjY2
+ NjY3LTI1LjYtNjRsLTgxLjA2NjY2Ny0yNS42LTQuMjY2NjY3LTI1LjZjLTQuMjY2NjY3LTM0LjEzMzMz
+ My04LjUzMzMzMy01OS43MzMzMzMtOC41MzMzMzMtODUuMzMzMzMzIDAtMjUuNiA0LjI2NjY2Ny01MS4y
+ IDguNTMzMzMzLTgxLjA2NjY2N2w0LjI2NjY2Ny0yNS42IDgxLjA2NjY2Ny0yNS42IDI1LjYtNjQtMzgu
+ NC04MS4wNjY2NjYgMTcuMDY2NjY2LTIxLjMzMzMzNEMxMjggMTY2LjQgMTY2LjQgMTI4IDIxMy4zMzMz
+ MzMgOTguMTMzMzMzbDIxLjMzMzMzNC0xNy4wNjY2NjYgNzYuOCAzOC40YzIxLjMzMzMzMy04LjUzMzMz
+ MyA0Mi42NjY2NjctMjEuMzMzMzMzIDY0LTI1LjZMNDAxLjA2NjY2NyAxMi44bDI1LjYtNC4yNjY2Njdj
+ MzQuMTMzMzMzLTQuMjY2NjY3IDU5LjczMzMzMy04LjUzMzMzMyA4NS4zMzMzMzMtOC41MzMzMzMgMjUu
+ NiAwIDUxLjIgNC4yNjY2NjcgODEuMDY2NjY3IDguNTMzMzMzbDI1LjYgNC4yNjY2NjcgMjUuNiA4MS4w
+ NjY2NjcgNjQgMjUuNiA3Ni44LTM4LjQgMjUuNiAxNy4wNjY2NjZjNDYuOTMzMzMzIDI5Ljg2NjY2NyA4
+ NS4zMzMzMzMgNjguMjY2NjY3IDExNS4yIDExNS4ybDE3LjA2NjY2NiAyMS4zMzMzMzQtMzguNCA3Ni44
+ YzQuMjY2NjY3IDguNTMzMzMzIDguNTMzMzMzIDIxLjMzMzMzMyAxMi44IDI5Ljg2NjY2Nkg1MTJjLTkz
+ Ljg2NjY2NyAwLTE3MC42NjY2NjcgNzYuOC0xNzAuNjY2NjY3IDE3MC42NjY2NjdzNzYuOCAxNzAuNjY2
+ NjY3IDE3MC42NjY2NjcgMTcwLjY2NjY2N3YzNDEuMzMzMzMzeiBtMTA2LjY2NjY2Ny01OTcuMzMzMzMz
+ aDM0MS4zMzMzMzNjMzQuMTMzMzMzIDAgNjQgMjkuODY2NjY3IDY0IDY0cy0yOS44NjY2NjcgNjQtNjQg
+ NjRoLTM0MS4zMzMzMzNjLTM0LjEzMzMzMyAwLTY0LTI5Ljg2NjY2Ny02NC02NHMyOS44NjY2NjctNjQg
+ NjQtNjR6IG0wIDIxMy4zMzMzMzNoMjEzLjMzMzMzM2MzNC4xMzMzMzMgMCA2NCAyOS44NjY2NjcgNjQg
+ NjRzLTI5Ljg2NjY2NyA2NC02NCA2NGgtMjEzLjMzMzMzM2MtMzQuMTMzMzMzIDAtNjQtMjkuODY2NjY3
+ LTY0LTY0czI5Ljg2NjY2Ny02NCA2NC02NHogbTAgMjEzLjMzMzMzM2g4NS4zMzMzMzNjMzQuMTMzMzMz
+ IDAgNjQgMjkuODY2NjY3IDY0IDY0cy0yOS44NjY2NjcgNjQtNjQgNjRoLTg1LjMzMzMzM2MtMzQuMTMz
+ MzMzIDAtNjQtMjkuODY2NjY3LTY0LTY0czI5Ljg2NjY2Ny02NCA2NC02NHoiIGZpbGw9IiM1MTUxNTIi
+ IC8+DQo8L3N2Zz4L
+</value>
+ </data>
</root>
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.Designer.cs
index 2005321..a329722 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.Designer.cs
@@ -78,11 +78,12 @@
layoutControl1.Controls.Add(treeList1);
layoutControl1.Controls.Add(searchControl1);
layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(0, 24);
+ layoutControl1.Location = new Point(0, 30);
+ layoutControl1.Margin = new Padding(3, 4, 3, 4);
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(539, 371, 650, 400);
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(235, 636);
+ layoutControl1.Size = new Size(269, 819);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
//
@@ -96,9 +97,10 @@
btnImportProject.ImageOptions.ImageToTextAlignment = ImageAlignToText.LeftCenter;
btnImportProject.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("btnImportProject.ImageOptions.SvgImage");
btnImportProject.ImageOptions.SvgImageSize = new Size(24, 24);
- btnImportProject.Location = new Point(0, 612);
+ btnImportProject.Location = new Point(0, 788);
+ btnImportProject.Margin = new Padding(3, 4, 3, 4);
btnImportProject.Name = "btnImportProject";
- btnImportProject.Size = new Size(235, 23);
+ btnImportProject.Size = new Size(269, 30);
btnImportProject.StyleController = layoutControl1;
btnImportProject.TabIndex = 6;
btnImportProject.Text = "瀵煎叆椤圭洰";
@@ -107,8 +109,10 @@
// treeList1
//
treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName });
- treeList1.Location = new Point(0, 24);
+ treeList1.Location = new Point(0, 29);
+ treeList1.Margin = new Padding(3, 4, 3, 4);
treeList1.MenuManager = barManager1;
+ treeList1.MinWidth = 23;
treeList1.Name = "treeList1";
treeList1.OptionsMenu.EnableNodeMenu = false;
treeList1.OptionsSelection.EnableAppearanceFocusedCell = false;
@@ -117,8 +121,9 @@
treeList1.OptionsView.ShowIndentAsRowStyle = true;
treeList1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] { repositoryItemButtonEdit1 });
treeList1.SelectImageList = imageCollection1;
- treeList1.Size = new Size(235, 586);
+ treeList1.Size = new Size(269, 757);
treeList1.TabIndex = 5;
+ treeList1.TreeLevelWidth = 21;
treeList1.TreeViewFieldName = "Name";
treeList1.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
treeList1.FocusedNodeChanged += treeList1_FocusedNodeChanged;
@@ -131,10 +136,11 @@
colName.Caption = "鍚嶇О";
colName.FieldName = "Name";
colName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("colName.ImageOptions.SvgImage");
+ colName.MinWidth = 23;
colName.Name = "colName";
colName.Visible = true;
colName.VisibleIndex = 0;
- colName.Width = 172;
+ colName.Width = 197;
//
// barManager1
//
@@ -210,31 +216,35 @@
barDockControlTop.Dock = DockStyle.Top;
barDockControlTop.Location = new Point(0, 0);
barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(235, 24);
+ barDockControlTop.Margin = new Padding(3, 4, 3, 4);
+ barDockControlTop.Size = new Size(269, 30);
//
// barDockControlBottom
//
barDockControlBottom.CausesValidation = false;
barDockControlBottom.Dock = DockStyle.Bottom;
- barDockControlBottom.Location = new Point(0, 660);
+ barDockControlBottom.Location = new Point(0, 849);
barDockControlBottom.Manager = barManager1;
- barDockControlBottom.Size = new Size(235, 0);
+ barDockControlBottom.Margin = new Padding(3, 4, 3, 4);
+ barDockControlBottom.Size = new Size(269, 0);
//
// barDockControlLeft
//
barDockControlLeft.CausesValidation = false;
barDockControlLeft.Dock = DockStyle.Left;
- barDockControlLeft.Location = new Point(0, 24);
+ barDockControlLeft.Location = new Point(0, 30);
barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 636);
+ barDockControlLeft.Margin = new Padding(3, 4, 3, 4);
+ barDockControlLeft.Size = new Size(0, 819);
//
// barDockControlRight
//
barDockControlRight.CausesValidation = false;
barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(235, 24);
+ barDockControlRight.Location = new Point(269, 30);
barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 636);
+ barDockControlRight.Margin = new Padding(3, 4, 3, 4);
+ barDockControlRight.Size = new Size(0, 819);
//
// repositoryItemButtonEdit1
//
@@ -253,12 +263,13 @@
// searchControl1
//
searchControl1.Client = treeList1;
- searchControl1.Location = new Point(0, 2);
+ searchControl1.Location = new Point(0, 3);
+ searchControl1.Margin = new Padding(3, 4, 3, 4);
searchControl1.MenuManager = barManager1;
searchControl1.Name = "searchControl1";
searchControl1.Properties.Buttons.AddRange(new EditorButton[] { new DevExpress.XtraEditors.Repository.ClearButton(), new DevExpress.XtraEditors.Repository.SearchButton() });
searchControl1.Properties.Client = treeList1;
- searchControl1.Size = new Size(235, 20);
+ searchControl1.Size = new Size(269, 24);
searchControl1.StyleController = layoutControl1;
searchControl1.TabIndex = 4;
//
@@ -269,7 +280,7 @@
Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- Root.Size = new Size(235, 636);
+ Root.Size = new Size(269, 819);
Root.TextVisible = false;
//
// layoutControlItem1
@@ -277,45 +288,46 @@
layoutControlItem1.Control = searchControl1;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 2, 1);
- layoutControlItem1.Size = new Size(235, 23);
+ layoutControlItem1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 3, 1);
+ layoutControlItem1.Size = new Size(269, 28);
layoutControlItem1.TextSize = new Size(0, 0);
layoutControlItem1.TextVisible = false;
//
// layoutControlItem2
//
layoutControlItem2.Control = treeList1;
- layoutControlItem2.Location = new Point(0, 23);
+ layoutControlItem2.Location = new Point(0, 28);
layoutControlItem2.Name = "layoutControlItem2";
layoutControlItem2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 1, 1);
- layoutControlItem2.Size = new Size(235, 588);
+ layoutControlItem2.Size = new Size(269, 759);
layoutControlItem2.TextSize = new Size(0, 0);
layoutControlItem2.TextVisible = false;
//
// layoutControlItem3
//
layoutControlItem3.Control = btnImportProject;
- layoutControlItem3.Location = new Point(0, 611);
- layoutControlItem3.MaxSize = new Size(0, 25);
- layoutControlItem3.MinSize = new Size(82, 25);
+ layoutControlItem3.Location = new Point(0, 787);
+ layoutControlItem3.MaxSize = new Size(0, 32);
+ layoutControlItem3.MinSize = new Size(94, 32);
layoutControlItem3.Name = "layoutControlItem3";
layoutControlItem3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 1, 1);
- layoutControlItem3.Size = new Size(235, 25);
+ layoutControlItem3.Size = new Size(269, 32);
layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
layoutControlItem3.TextSize = new Size(0, 0);
layoutControlItem3.TextVisible = false;
//
// HomeXhsProjectTreeListCtrl
//
- AutoScaleDimensions = new SizeF(7F, 14F);
+ AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
Controls.Add(barDockControlLeft);
Controls.Add(barDockControlRight);
Controls.Add(barDockControlBottom);
Controls.Add(barDockControlTop);
+ Margin = new Padding(3, 4, 3, 4);
Name = "HomeXhsProjectTreeListCtrl";
- Size = new Size(235, 660);
+ Size = new Size(269, 849);
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
((ISupportInitialize)treeList1).EndInit();
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.resx b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.resx
index 63ba352..6796a97 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.resx
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/01-home/01-project/HomeXhsProjectTreeListCtrl.resx
@@ -283,16 +283,15 @@
a2VuPWIwM2Y1ZjdmMTFkNTBhM2EFAQAAAChEZXZFeHByZXNzLlV0aWxzLkltYWdlQ29sbGVjdGlvblN0
cmVhbWVyAgAAAAlJbWFnZVNpemUERGF0YQQHE1N5c3RlbS5EcmF3aW5nLlNpemUDAAAAAgIAAAAF/P//
/xNTeXN0ZW0uRHJhd2luZy5TaXplAgAAAAV3aWR0aAZoZWlnaHQAAAgIAwAAABAAAAAQAAAACQUAAAAP
- BQAAADICAAACDwEAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAARnQU1BAACxjwv8
- YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACxSURBVDhPYyAEvhQUSEKZpIOvmZm+IAzlkg5gBpBlCLJm
- qhhAkiHImm5ahvyHsf/l5vJBleAHyJpB+FN6eiBMDKoEN4ApRDYA2RXfMzMdoUoxwf/4eA5smkH4rmP4
- dpgcVDkmgCkA4UeZtf+RAbIrQBiqBQG+5uZawCTRbUfGuA2ASrwIScjHphGGYepQDEEWxKYJGSOrhWpH
- NYBUDNJsii5ICga74FtmphU5+H58PAcA/rw5+hte4AwAAAAASUVORK5CYIIbAQAAiVBORw0KGgoAAAAN
- SUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAA
- DsMAAA7DAcdvqGQAAACwSURBVDhPtZKxDcIwEEUtZRsWYgVqxmEASioqVkgTMQSODUWqlGc465zYlx8n
- DV96Te6/sxzZ/CU2uKEPPmgsuYtUcF7Un5CokXqZvXJCtDmotIWo63fOacfn4tsvTVygBxqWzf0Qjt25
- nJF3uxawzMAZWpALNZmBC26fxyTWZAYuYNK90Sxh6X2NC/iFocIWUU5BhRqWfCfqHFRcQ5RlUDkHnqzD
- L4wfSSnKDytizBdBx6SB89N3AAAAAABJRU5ErkJgggs=
+ BQAAABICAAACAAEAAIlQTkcNChoKAAAADUlIRFIAAAAQAAAAEAgGAAAAH/P/YQAAAARnQU1BAACxjwv8
+ YQUAAAAJcEhZcwAADrwAAA68AZW8ckkAAACiSURBVDhPY2AgAL4UFEiiixENvmZm+oIwujjRAGYAWYYg
+ a6aKASQZgqzppmXIfxj7X24uH7parABZMwh/Sk8PJNoV6LbDMEzse2amI7oeOPgfH8+BTTMI33UM307Q
+ Fci2P8qs/Y8MkF2B1ZCvubkWuGzH5hV0/XDbX4Qk5KNrwmYAiiHIguga0DFBA0jFIM2m6IKkYLALvmVm
+ WpGD78fHcwAA/rw5+nXFLjIAAAAASUVORK5CYIIKAQAAiVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYA
+ AAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAOwgAADsIBFShKgAAAAKxJREFUOE+1kj0OgzAM
+ hSNxGy7UKzD3OByAsRNTr9AF9RANSTswdbQrA42SR0LdgSe9xfb3rPwYc4Qsu2lkz2hLrsXZRA8aG4Ry
+ Rm6WFi6G4IDGAS6dOfbtfd/UmLlSbRfY9DWfhnPaI+9UAQKLsT73cgExsAcXAy6vawD34GKA+HturMe2
+ 9OyWVyDXYlPj9REXYfOXLfkhCfg3BNkgHERnN6Pkh8knScH1wkAfQcekgYCMgb0AAAAASUVORK5CYIIL
</value>
</data>
</root>
\ No newline at end of file
diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs
index 9c5362b..b19a39a 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/01-ele-price/ElecPriceHelper.cs
@@ -205,11 +205,13 @@
if (hour == 23)
{
var item = hourList.Find(x => x.EndHour == 23);
+
return el * item.Price;
}
else
{
var item = hourList.Find(x => hour >= x.StartHour && hour < x.EndHour);
+
return el * item.Price;
}
}
diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
index a9ad8ec..591c5c8 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
@@ -31,35 +31,36 @@
/// </summary>
private void InitializeComponent()
{
+ components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnergyAnalysis));
- XYDiagram xyDiagram2 = new XYDiagram();
- LayoutDefinition layoutDefinition5 = new LayoutDefinition();
- LayoutDefinition layoutDefinition6 = new LayoutDefinition();
- LayoutDefinition layoutDefinition7 = new LayoutDefinition();
- LayoutDefinition layoutDefinition8 = new LayoutDefinition();
- XYDiagramPane xyDiagramPane3 = new XYDiagramPane();
- XYDiagramPane xyDiagramPane4 = new XYDiagramPane();
- SecondaryAxisY secondaryAxisy4 = new SecondaryAxisY();
- SecondaryAxisY secondaryAxisy5 = new SecondaryAxisY();
- SecondaryAxisY secondaryAxisy6 = new SecondaryAxisY();
- Series series10 = new Series();
- SplineSeriesView splineSeriesView10 = new SplineSeriesView();
- Series series11 = new Series();
- SplineSeriesView splineSeriesView11 = new SplineSeriesView();
- Series series12 = new Series();
- SplineSeriesView splineSeriesView12 = new SplineSeriesView();
- Series series13 = new Series();
- SplineSeriesView splineSeriesView13 = new SplineSeriesView();
- Series series14 = new Series();
- SplineSeriesView splineSeriesView14 = new SplineSeriesView();
- Series series15 = new Series();
- SplineSeriesView splineSeriesView15 = new SplineSeriesView();
- Series series16 = new Series();
- SplineSeriesView splineSeriesView16 = new SplineSeriesView();
- Series series17 = new Series();
- SplineSeriesView splineSeriesView17 = new SplineSeriesView();
- Series series18 = new Series();
- SplineSeriesView splineSeriesView18 = new SplineSeriesView();
+ XYDiagram xyDiagram1 = new XYDiagram();
+ LayoutDefinition layoutDefinition1 = new LayoutDefinition();
+ LayoutDefinition layoutDefinition2 = new LayoutDefinition();
+ LayoutDefinition layoutDefinition3 = new LayoutDefinition();
+ LayoutDefinition layoutDefinition4 = new LayoutDefinition();
+ XYDiagramPane xyDiagramPane1 = new XYDiagramPane();
+ XYDiagramPane xyDiagramPane2 = new XYDiagramPane();
+ SecondaryAxisY secondaryAxisy1 = new SecondaryAxisY();
+ SecondaryAxisY secondaryAxisy2 = new SecondaryAxisY();
+ SecondaryAxisY secondaryAxisy3 = new SecondaryAxisY();
+ Series series1 = new Series();
+ SplineSeriesView splineSeriesView1 = new SplineSeriesView();
+ Series series2 = new Series();
+ SplineSeriesView splineSeriesView2 = new SplineSeriesView();
+ Series series3 = new Series();
+ SplineSeriesView splineSeriesView3 = new SplineSeriesView();
+ Series series4 = new Series();
+ SplineSeriesView splineSeriesView4 = new SplineSeriesView();
+ Series series5 = new Series();
+ SplineSeriesView splineSeriesView5 = new SplineSeriesView();
+ Series series6 = new Series();
+ SplineSeriesView splineSeriesView6 = new SplineSeriesView();
+ Series series7 = new Series();
+ SplineSeriesView splineSeriesView7 = new SplineSeriesView();
+ Series series8 = new Series();
+ SplineSeriesView splineSeriesView8 = new SplineSeriesView();
+ Series series9 = new Series();
+ SplineSeriesView splineSeriesView9 = new SplineSeriesView();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
@@ -80,6 +81,8 @@
textEditPriceBefore = new DevExpress.XtraEditors.TextEdit();
textEditEffAfter = new DevExpress.XtraEditors.TextEdit();
textEditPriceAfter = new DevExpress.XtraEditors.TextEdit();
+ textEditEffPercent = new DevExpress.XtraEditors.TextEdit();
+ textEditPricePercent = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -91,46 +94,59 @@
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- emptySpaceItem4 = new DevExpress.XtraLayout.EmptySpaceItem();
+ layoutControlGroup5 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
gridControl1 = new DevExpress.XtraGrid.GridControl();
gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ bindingSource1 = new BindingSource(components);
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)chartControl1).BeginInit();
- ((System.ComponentModel.ISupportInitialize)xyDiagram2).BeginInit();
- ((System.ComponentModel.ISupportInitialize)xyDiagramPane3).BeginInit();
- ((System.ComponentModel.ISupportInitialize)xyDiagramPane4).BeginInit();
- ((System.ComponentModel.ISupportInitialize)secondaryAxisy4).BeginInit();
- ((System.ComponentModel.ISupportInitialize)secondaryAxisy5).BeginInit();
- ((System.ComponentModel.ISupportInitialize)secondaryAxisy6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series10).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView10).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series11).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView11).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series12).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView12).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series13).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView13).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series14).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView14).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series15).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView15).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series16).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView16).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series17).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView17).BeginInit();
- ((System.ComponentModel.ISupportInitialize)series18).BeginInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView18).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagram1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagramPane1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagramPane2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series4).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView4).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series5).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView5).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series6).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView6).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series7).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView7).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series8).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView8).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series9).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView9).BeginInit();
((System.ComponentModel.ISupportInitialize)xtraTabControl1).BeginInit();
xtraTabControl1.SuspendLayout();
xtraTabPage1.SuspendLayout();
@@ -151,6 +167,8 @@
((System.ComponentModel.ISupportInitialize)textEditPriceBefore.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditEffAfter.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)textEditPriceAfter.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditEffPercent.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditPricePercent.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
@@ -162,11 +180,14 @@
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem15).BeginInit();
xtraTabPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
@@ -176,6 +197,7 @@
((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)bindingSource1).BeginInit();
SuspendLayout();
//
// ribbonControl1
@@ -238,58 +260,58 @@
// chartControl1
//
chartControl1.BorderOptions.Visibility = DevExpress.Utils.DefaultBoolean.False;
- xyDiagram2.AxisX.Alignment = AxisAlignment.Zero;
- xyDiagram2.AxisX.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.True;
- xyDiagram2.AxisX.Title.Text = "鏃堕棿";
- xyDiagram2.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
- xyDiagram2.AxisX.VisibleInPanesSerializable = "-1;0;1";
- xyDiagram2.AxisY.Color = Color.DodgerBlue;
- xyDiagram2.AxisY.Label.TextColor = Color.DodgerBlue;
- xyDiagram2.AxisY.Title.Alignment = StringAlignment.Far;
- xyDiagram2.AxisY.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.False;
- xyDiagram2.AxisY.Title.Text = "娴侀噺(m鲁/h)";
- xyDiagram2.AxisY.Title.TextColor = Color.DodgerBlue;
- xyDiagram2.AxisY.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
- xyDiagram2.AxisY.VisibleInPanesSerializable = "-1";
- xyDiagram2.DefaultPane.BorderVisible = false;
- xyDiagram2.DefaultPane.Title.Text = "鏃犳暟鎹�";
- xyDiagram2.PaneLayout.AutoLayoutMode = PaneAutoLayoutMode.Grid;
- xyDiagram2.PaneLayout.ColumnDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition5, layoutDefinition6 });
- xyDiagram2.PaneLayout.RowDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition7, layoutDefinition8 });
- xyDiagramPane3.LayoutOptions.Column = 0;
- xyDiagramPane3.LayoutOptions.ColumnSpan = 2;
- xyDiagramPane3.LayoutOptions.Row = 1;
- xyDiagramPane3.Name = "Pane 1";
- xyDiagramPane3.PaneID = 0;
- xyDiagramPane4.LayoutOptions.Column = 1;
- xyDiagramPane4.LayoutOptions.Row = 0;
- xyDiagramPane4.Name = "Pane 2";
- xyDiagramPane4.PaneID = 1;
- xyDiagram2.Panes.AddRange(new XYDiagramPane[] { xyDiagramPane3, xyDiagramPane4 });
- xyDiagram2.RangeControlTimeSpanGridOptions.GridAlignment = TimeSpanGridAlignment.Second;
- xyDiagram2.RangeControlTimeSpanGridOptions.GridMode = ChartRangeControlClientGridMode.Manual;
- secondaryAxisy4.AxisID = 0;
- secondaryAxisy4.Color = Color.Green;
- secondaryAxisy4.Label.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
- secondaryAxisy4.Label.TextColor = Color.Green;
- secondaryAxisy4.Name = "AxisYEff";
- secondaryAxisy4.Title.Text = "鍘嬪姏(MPa)";
- secondaryAxisy4.Title.TextColor = Color.Green;
- secondaryAxisy4.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
- secondaryAxisy4.VisibleInPanesSerializable = "-1";
- secondaryAxisy5.AxisID = 1;
- secondaryAxisy5.Name = "Secondary AxisY 1";
- secondaryAxisy5.Title.Text = "鐢ㄧ數閲忥紙搴︼級";
- secondaryAxisy5.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
- secondaryAxisy5.Visibility = DevExpress.Utils.DefaultBoolean.True;
- secondaryAxisy5.VisibleInPanesSerializable = "1";
- secondaryAxisy6.AxisID = 2;
- secondaryAxisy6.Name = "Secondary AxisY 2";
- secondaryAxisy6.Title.Text = "鐢佃垂锛堝厓锛�";
- secondaryAxisy6.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
- secondaryAxisy6.VisibleInPanesSerializable = "0";
- xyDiagram2.SecondaryAxesY.AddRange(new SecondaryAxisY[] { secondaryAxisy4, secondaryAxisy5, secondaryAxisy6 });
- chartControl1.Diagram = xyDiagram2;
+ xyDiagram1.AxisX.Alignment = AxisAlignment.Zero;
+ xyDiagram1.AxisX.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.True;
+ xyDiagram1.AxisX.Title.Text = "鏃堕棿";
+ xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
+ xyDiagram1.AxisX.VisibleInPanesSerializable = "-1;0;1";
+ xyDiagram1.AxisY.Color = Color.DodgerBlue;
+ xyDiagram1.AxisY.Label.TextColor = Color.DodgerBlue;
+ xyDiagram1.AxisY.Title.Alignment = StringAlignment.Far;
+ xyDiagram1.AxisY.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.False;
+ xyDiagram1.AxisY.Title.Text = "娴侀噺(m鲁/h)";
+ xyDiagram1.AxisY.Title.TextColor = Color.DodgerBlue;
+ xyDiagram1.AxisY.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ xyDiagram1.AxisY.VisibleInPanesSerializable = "-1";
+ xyDiagram1.DefaultPane.BorderVisible = false;
+ xyDiagram1.DefaultPane.Title.Text = "鏃犳暟鎹�";
+ xyDiagram1.PaneLayout.AutoLayoutMode = PaneAutoLayoutMode.Grid;
+ xyDiagram1.PaneLayout.ColumnDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition1, layoutDefinition2 });
+ xyDiagram1.PaneLayout.RowDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition3, layoutDefinition4 });
+ xyDiagramPane1.LayoutOptions.Column = 0;
+ xyDiagramPane1.LayoutOptions.ColumnSpan = 2;
+ xyDiagramPane1.LayoutOptions.Row = 1;
+ xyDiagramPane1.Name = "Pane 1";
+ xyDiagramPane1.PaneID = 0;
+ xyDiagramPane2.LayoutOptions.Column = 1;
+ xyDiagramPane2.LayoutOptions.Row = 0;
+ xyDiagramPane2.Name = "Pane 2";
+ xyDiagramPane2.PaneID = 1;
+ xyDiagram1.Panes.AddRange(new XYDiagramPane[] { xyDiagramPane1, xyDiagramPane2 });
+ xyDiagram1.RangeControlTimeSpanGridOptions.GridAlignment = TimeSpanGridAlignment.Second;
+ xyDiagram1.RangeControlTimeSpanGridOptions.GridMode = ChartRangeControlClientGridMode.Manual;
+ secondaryAxisy1.AxisID = 0;
+ secondaryAxisy1.Color = Color.Green;
+ secondaryAxisy1.Label.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
+ secondaryAxisy1.Label.TextColor = Color.Green;
+ secondaryAxisy1.Name = "AxisYEff";
+ secondaryAxisy1.Title.Text = "鍘嬪姏(MPa)";
+ secondaryAxisy1.Title.TextColor = Color.Green;
+ secondaryAxisy1.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
+ secondaryAxisy1.VisibleInPanesSerializable = "-1";
+ secondaryAxisy2.AxisID = 1;
+ secondaryAxisy2.Name = "Secondary AxisY 1";
+ secondaryAxisy2.Title.Text = "鐢ㄧ數閲忥紙搴︼級";
+ secondaryAxisy2.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ secondaryAxisy2.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ secondaryAxisy2.VisibleInPanesSerializable = "1";
+ secondaryAxisy3.AxisID = 2;
+ secondaryAxisy3.Name = "Secondary AxisY 2";
+ secondaryAxisy3.Title.Text = "鐢佃垂锛堝厓锛�";
+ secondaryAxisy3.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ secondaryAxisy3.VisibleInPanesSerializable = "0";
+ xyDiagram1.SecondaryAxesY.AddRange(new SecondaryAxisY[] { secondaryAxisy1, secondaryAxisy2, secondaryAxisy3 });
+ chartControl1.Diagram = xyDiagram1;
chartControl1.Dock = DockStyle.Fill;
chartControl1.Legend.AlignmentHorizontal = LegendAlignmentHorizontal.Right;
chartControl1.Legend.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
@@ -300,62 +322,62 @@
chartControl1.Location = new Point(0, 0);
chartControl1.Margin = new Padding(2, 3, 2, 3);
chartControl1.Name = "chartControl1";
- series10.Name = "娴侀噺";
- series10.SeriesID = 0;
- splineSeriesView10.Color = Color.FromArgb(84, 141, 212);
- series10.View = splineSeriesView10;
- series11.Name = "鍑哄彛鍘嬪姏";
- series11.SeriesID = 1;
- splineSeriesView11.AxisYName = "AxisYEff";
- splineSeriesView11.Color = Color.FromArgb(155, 187, 89);
- series11.View = splineSeriesView11;
- series12.Name = "鏀归�犲墠(搴�)";
- series12.SeriesID = 2;
- splineSeriesView12.AxisYName = "Secondary AxisY 1";
- splineSeriesView12.PaneName = "Pane 2";
- series12.View = splineSeriesView12;
- series13.Name = "鏀归�犲悗(搴�)";
- series13.SeriesID = 3;
- splineSeriesView13.AxisYName = "Secondary AxisY 1";
- splineSeriesView13.PaneName = "Pane 2";
- series13.View = splineSeriesView13;
- series14.Name = "鑺傜渷鍊�(搴�)";
- series14.SeriesID = 4;
- splineSeriesView14.AxisYName = "Secondary AxisY 1";
- splineSeriesView14.PaneName = "Pane 2";
- series14.View = splineSeriesView14;
- series15.Name = "鏀归�犲墠(鍏�)";
- series15.SeriesID = 5;
- splineSeriesView15.AxisYName = "Secondary AxisY 2";
- splineSeriesView15.PaneName = "Pane 1";
- series15.View = splineSeriesView15;
- series16.Name = "鏀归�犲悗(鍏�)";
- series16.SeriesID = 6;
- splineSeriesView16.AxisYName = "Secondary AxisY 2";
- splineSeriesView16.PaneName = "Pane 1";
- series16.View = splineSeriesView16;
- series17.Name = "鑺傜渷鍊�(鍏�)";
- series17.SeriesID = 7;
- splineSeriesView17.AxisYName = "Secondary AxisY 2";
- splineSeriesView17.PaneName = "Pane 1";
- series17.View = splineSeriesView17;
- series18.Name = "鍘熸车鍚庡帇鍔�";
- series18.SeriesID = 8;
- splineSeriesView18.AxisYName = "AxisYEff";
- series18.View = splineSeriesView18;
+ series1.Name = "娴侀噺";
+ series1.SeriesID = 0;
+ splineSeriesView1.Color = Color.FromArgb(84, 141, 212);
+ series1.View = splineSeriesView1;
+ series2.Name = "鍑哄彛鍘嬪姏";
+ series2.SeriesID = 1;
+ splineSeriesView2.AxisYName = "AxisYEff";
+ splineSeriesView2.Color = Color.FromArgb(155, 187, 89);
+ series2.View = splineSeriesView2;
+ series3.Name = "鏀归�犲墠(搴�)";
+ series3.SeriesID = 2;
+ splineSeriesView3.AxisYName = "Secondary AxisY 1";
+ splineSeriesView3.PaneName = "Pane 2";
+ series3.View = splineSeriesView3;
+ series4.Name = "鏀归�犲悗(搴�)";
+ series4.SeriesID = 3;
+ splineSeriesView4.AxisYName = "Secondary AxisY 1";
+ splineSeriesView4.PaneName = "Pane 2";
+ series4.View = splineSeriesView4;
+ series5.Name = "鑺傜渷鍊�(搴�)";
+ series5.SeriesID = 4;
+ splineSeriesView5.AxisYName = "Secondary AxisY 1";
+ splineSeriesView5.PaneName = "Pane 2";
+ series5.View = splineSeriesView5;
+ series6.Name = "鏀归�犲墠(鍏�)";
+ series6.SeriesID = 5;
+ splineSeriesView6.AxisYName = "Secondary AxisY 2";
+ splineSeriesView6.PaneName = "Pane 1";
+ series6.View = splineSeriesView6;
+ series7.Name = "鏀归�犲悗(鍏�)";
+ series7.SeriesID = 6;
+ splineSeriesView7.AxisYName = "Secondary AxisY 2";
+ splineSeriesView7.PaneName = "Pane 1";
+ series7.View = splineSeriesView7;
+ series8.Name = "鑺傜渷鍊�(鍏�)";
+ series8.SeriesID = 7;
+ splineSeriesView8.AxisYName = "Secondary AxisY 2";
+ splineSeriesView8.PaneName = "Pane 1";
+ series8.View = splineSeriesView8;
+ series9.Name = "鍘熸车鍚庡帇鍔�";
+ series9.SeriesID = 8;
+ splineSeriesView9.AxisYName = "AxisYEff";
+ series9.View = splineSeriesView9;
chartControl1.SeriesSerializable = new Series[]
{
- series10,
- series11,
- series12,
- series13,
- series14,
- series15,
- series16,
- series17,
- series18
+ series1,
+ series2,
+ series3,
+ series4,
+ series5,
+ series6,
+ series7,
+ series8,
+ series9
};
- chartControl1.Size = new Size(884, 697);
+ chartControl1.Size = new Size(832, 697);
chartControl1.TabIndex = 0;
//
// xtraTabControl1
@@ -395,7 +417,7 @@
splitContainerControl1.Panel2.Controls.Add(dataLayoutControl1);
splitContainerControl1.Panel2.Text = "Panel2";
splitContainerControl1.Size = new Size(1144, 697);
- splitContainerControl1.SplitterPosition = 248;
+ splitContainerControl1.SplitterPosition = 300;
splitContainerControl1.TabIndex = 1;
//
// dataLayoutControl1
@@ -409,12 +431,14 @@
dataLayoutControl1.Controls.Add(textEditPriceBefore);
dataLayoutControl1.Controls.Add(textEditEffAfter);
dataLayoutControl1.Controls.Add(textEditPriceAfter);
+ dataLayoutControl1.Controls.Add(textEditEffPercent);
+ dataLayoutControl1.Controls.Add(textEditPricePercent);
dataLayoutControl1.Dock = DockStyle.Fill;
dataLayoutControl1.Location = new Point(0, 0);
dataLayoutControl1.Margin = new Padding(3, 4, 3, 4);
dataLayoutControl1.Name = "dataLayoutControl1";
dataLayoutControl1.Root = Root;
- dataLayoutControl1.Size = new Size(248, 697);
+ dataLayoutControl1.Size = new Size(300, 697);
dataLayoutControl1.TabIndex = 0;
dataLayoutControl1.Text = "dataLayoutControl1";
//
@@ -424,7 +448,7 @@
textEdit4.Margin = new Padding(3, 4, 3, 4);
textEdit4.MenuManager = ribbonControl1;
textEdit4.Name = "textEdit4";
- textEdit4.Size = new Size(62, 24);
+ textEdit4.Size = new Size(115, 24);
textEdit4.StyleController = dataLayoutControl1;
textEdit4.TabIndex = 4;
//
@@ -434,7 +458,7 @@
textEdit5.Margin = new Padding(3, 4, 3, 4);
textEdit5.MenuManager = ribbonControl1;
textEdit5.Name = "textEdit5";
- textEdit5.Size = new Size(62, 24);
+ textEdit5.Size = new Size(115, 24);
textEdit5.StyleController = dataLayoutControl1;
textEdit5.TabIndex = 5;
//
@@ -444,7 +468,7 @@
textEdit3.Margin = new Padding(3, 4, 3, 4);
textEdit3.MenuManager = ribbonControl1;
textEdit3.Name = "textEdit3";
- textEdit3.Size = new Size(62, 24);
+ textEdit3.Size = new Size(115, 24);
textEdit3.StyleController = dataLayoutControl1;
textEdit3.TabIndex = 3;
//
@@ -454,7 +478,7 @@
textEdit2.Margin = new Padding(3, 4, 3, 4);
textEdit2.MenuManager = ribbonControl1;
textEdit2.Name = "textEdit2";
- textEdit2.Size = new Size(62, 24);
+ textEdit2.Size = new Size(115, 24);
textEdit2.StyleController = dataLayoutControl1;
textEdit2.TabIndex = 2;
//
@@ -464,7 +488,7 @@
textEdit1.Margin = new Padding(3, 4, 3, 4);
textEdit1.MenuManager = ribbonControl1;
textEdit1.Name = "textEdit1";
- textEdit1.Size = new Size(62, 24);
+ textEdit1.Size = new Size(115, 24);
textEdit1.StyleController = dataLayoutControl1;
textEdit1.TabIndex = 0;
//
@@ -473,7 +497,7 @@
textEditEffBefore.Location = new Point(79, 240);
textEditEffBefore.MenuManager = ribbonControl1;
textEditEffBefore.Name = "textEditEffBefore";
- textEditEffBefore.Size = new Size(154, 24);
+ textEditEffBefore.Size = new Size(62, 24);
textEditEffBefore.StyleController = dataLayoutControl1;
textEditEffBefore.TabIndex = 6;
//
@@ -482,35 +506,53 @@
textEditPriceBefore.Location = new Point(79, 268);
textEditPriceBefore.MenuManager = ribbonControl1;
textEditPriceBefore.Name = "textEditPriceBefore";
- textEditPriceBefore.Size = new Size(154, 24);
+ textEditPriceBefore.Size = new Size(62, 24);
textEditPriceBefore.StyleController = dataLayoutControl1;
textEditPriceBefore.TabIndex = 7;
//
// textEditEffAfter
//
- textEditEffAfter.Location = new Point(79, 362);
+ textEditEffAfter.Location = new Point(224, 240);
textEditEffAfter.MenuManager = ribbonControl1;
textEditEffAfter.Name = "textEditEffAfter";
- textEditEffAfter.Size = new Size(154, 24);
+ textEditEffAfter.Size = new Size(62, 24);
textEditEffAfter.StyleController = dataLayoutControl1;
textEditEffAfter.TabIndex = 8;
//
// textEditPriceAfter
//
- textEditPriceAfter.Location = new Point(79, 390);
+ textEditPriceAfter.Location = new Point(224, 268);
textEditPriceAfter.MenuManager = ribbonControl1;
textEditPriceAfter.Name = "textEditPriceAfter";
- textEditPriceAfter.Size = new Size(154, 24);
+ textEditPriceAfter.Size = new Size(62, 24);
textEditPriceAfter.StyleController = dataLayoutControl1;
textEditPriceAfter.TabIndex = 9;
+ //
+ // textEditEffPercent
+ //
+ textEditEffPercent.Location = new Point(79, 361);
+ textEditEffPercent.MenuManager = ribbonControl1;
+ textEditEffPercent.Name = "textEditEffPercent";
+ textEditEffPercent.Size = new Size(207, 24);
+ textEditEffPercent.StyleController = dataLayoutControl1;
+ textEditEffPercent.TabIndex = 10;
+ //
+ // textEditPricePercent
+ //
+ textEditPricePercent.Location = new Point(79, 389);
+ textEditPricePercent.MenuManager = ribbonControl1;
+ textEditPricePercent.Name = "textEditPricePercent";
+ textEditPricePercent.Size = new Size(207, 24);
+ textEditPricePercent.StyleController = dataLayoutControl1;
+ textEditPricePercent.TabIndex = 11;
//
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, layoutControlGroup4, emptySpaceItem4 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, emptySpaceItem4, layoutControlGroup4, layoutControlGroup5 });
Root.Name = "Root";
- Root.Size = new Size(257, 676);
+ Root.Size = new Size(310, 676);
Root.TextVisible = false;
//
// layoutControlGroup1
@@ -518,7 +560,7 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(237, 190);
+ layoutControlGroup1.Size = new Size(290, 190);
layoutControlGroup1.Text = "鎬昏";
//
// layoutControlItem1
@@ -526,7 +568,7 @@
layoutControlItem1.Control = textEdit1;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(213, 28);
+ layoutControlItem1.Size = new Size(266, 28);
layoutControlItem1.Text = "鏁版嵁澶╂暟锛堝ぉ锛夛細";
layoutControlItem1.TextSize = new Size(135, 18);
//
@@ -535,7 +577,7 @@
layoutControlItem2.Control = textEdit2;
layoutControlItem2.Location = new Point(0, 28);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(213, 28);
+ layoutControlItem2.Size = new Size(266, 28);
layoutControlItem2.Text = "鎬荤敤姘撮噺锛坢鲁锛夛細";
layoutControlItem2.TextSize = new Size(135, 18);
//
@@ -544,7 +586,7 @@
layoutControlItem3.Control = textEdit3;
layoutControlItem3.Location = new Point(0, 56);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(213, 28);
+ layoutControlItem3.Size = new Size(266, 28);
layoutControlItem3.Text = "鎬昏妭鐢甸噺锛坘W锛夛細";
layoutControlItem3.TextSize = new Size(135, 18);
//
@@ -553,7 +595,7 @@
layoutControlItem4.Control = textEdit4;
layoutControlItem4.Location = new Point(0, 84);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(213, 28);
+ layoutControlItem4.Size = new Size(266, 28);
layoutControlItem4.Text = "鑺傝兘鐜囷紙%锛�";
layoutControlItem4.TextSize = new Size(135, 18);
//
@@ -562,7 +604,7 @@
layoutControlItem5.Control = textEdit5;
layoutControlItem5.Location = new Point(0, 112);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(213, 28);
+ layoutControlItem5.Size = new Size(266, 28);
layoutControlItem5.Text = "鎬昏妭鐢佃垂鐢紙鍏冿級锛�";
layoutControlItem5.TextSize = new Size(135, 18);
//
@@ -573,7 +615,7 @@
layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem1, layoutControlItem8, layoutControlItem9 });
layoutControlGroup2.Location = new Point(0, 190);
layoutControlGroup2.Name = "layoutControlGroup2";
- layoutControlGroup2.Size = new Size(237, 122);
+ layoutControlGroup2.Size = new Size(145, 121);
layoutControlGroup2.Text = "鏀归�犲墠";
//
// emptySpaceItem1
@@ -581,7 +623,7 @@
emptySpaceItem1.AllowHotTrack = false;
emptySpaceItem1.Location = new Point(0, 56);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(213, 16);
+ emptySpaceItem1.Size = new Size(121, 15);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem8
@@ -591,7 +633,7 @@
layoutControlItem8.Control = textEditEffBefore;
layoutControlItem8.Location = new Point(0, 0);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(213, 28);
+ layoutControlItem8.Size = new Size(121, 28);
layoutControlItem8.Text = "鐢ㄧ數閲�:";
layoutControlItem8.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem8.TextSize = new Size(50, 18);
@@ -602,18 +644,26 @@
layoutControlItem9.Control = textEditPriceBefore;
layoutControlItem9.Location = new Point(0, 28);
layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(213, 28);
+ layoutControlItem9.Size = new Size(121, 28);
layoutControlItem9.Text = "鐢佃垂:";
layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem9.TextSize = new Size(50, 20);
layoutControlItem9.TextToControlDistance = 5;
//
+ // emptySpaceItem4
+ //
+ emptySpaceItem4.AllowHotTrack = false;
+ emptySpaceItem4.Location = new Point(0, 417);
+ emptySpaceItem4.Name = "emptySpaceItem4";
+ emptySpaceItem4.Size = new Size(290, 239);
+ emptySpaceItem4.TextSize = new Size(0, 0);
+ //
// layoutControlGroup4
//
layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem2, layoutControlItem12, layoutControlItem13 });
- layoutControlGroup4.Location = new Point(0, 312);
+ layoutControlGroup4.Location = new Point(145, 190);
layoutControlGroup4.Name = "layoutControlGroup4";
- layoutControlGroup4.Size = new Size(237, 135);
+ layoutControlGroup4.Size = new Size(145, 121);
layoutControlGroup4.Text = "鏀归�犲悗";
//
// emptySpaceItem2
@@ -621,7 +671,7 @@
emptySpaceItem2.AllowHotTrack = false;
emptySpaceItem2.Location = new Point(0, 56);
emptySpaceItem2.Name = "emptySpaceItem2";
- emptySpaceItem2.Size = new Size(213, 29);
+ emptySpaceItem2.Size = new Size(121, 15);
emptySpaceItem2.TextSize = new Size(0, 0);
//
// layoutControlItem12
@@ -629,7 +679,7 @@
layoutControlItem12.Control = textEditEffAfter;
layoutControlItem12.Location = new Point(0, 0);
layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(213, 28);
+ layoutControlItem12.Size = new Size(121, 28);
layoutControlItem12.Text = "鐢ㄧ數閲�:";
layoutControlItem12.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem12.TextSize = new Size(50, 20);
@@ -640,19 +690,41 @@
layoutControlItem13.Control = textEditPriceAfter;
layoutControlItem13.Location = new Point(0, 28);
layoutControlItem13.Name = "layoutControlItem13";
- layoutControlItem13.Size = new Size(213, 28);
+ layoutControlItem13.Size = new Size(121, 28);
layoutControlItem13.Text = "鐢佃垂:";
layoutControlItem13.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
layoutControlItem13.TextSize = new Size(50, 20);
layoutControlItem13.TextToControlDistance = 5;
//
- // emptySpaceItem4
+ // layoutControlGroup5
//
- emptySpaceItem4.AllowHotTrack = false;
- emptySpaceItem4.Location = new Point(0, 447);
- emptySpaceItem4.Name = "emptySpaceItem4";
- emptySpaceItem4.Size = new Size(237, 209);
- emptySpaceItem4.TextSize = new Size(0, 0);
+ layoutControlGroup5.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem14, layoutControlItem15 });
+ layoutControlGroup5.Location = new Point(0, 311);
+ layoutControlGroup5.Name = "layoutControlGroup5";
+ layoutControlGroup5.Size = new Size(290, 106);
+ layoutControlGroup5.Text = "鑺傜渷姣�";
+ //
+ // layoutControlItem14
+ //
+ layoutControlItem14.Control = textEditEffPercent;
+ layoutControlItem14.Location = new Point(0, 0);
+ layoutControlItem14.Name = "layoutControlItem14";
+ layoutControlItem14.Size = new Size(266, 28);
+ layoutControlItem14.Text = "鐢ㄧ數閲�:";
+ layoutControlItem14.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
+ layoutControlItem14.TextSize = new Size(50, 20);
+ layoutControlItem14.TextToControlDistance = 5;
+ //
+ // layoutControlItem15
+ //
+ layoutControlItem15.Control = textEditPricePercent;
+ layoutControlItem15.Location = new Point(0, 28);
+ layoutControlItem15.Name = "layoutControlItem15";
+ layoutControlItem15.Size = new Size(266, 28);
+ layoutControlItem15.Text = "鐢佃垂锛�";
+ layoutControlItem15.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
+ layoutControlItem15.TextSize = new Size(50, 20);
+ layoutControlItem15.TextToControlDistance = 5;
//
// xtraTabPage2
//
@@ -677,6 +749,7 @@
//
// gridView1
//
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn4, gridColumn1, gridColumn2, gridColumn3, gridColumn9, gridColumn8, gridColumn5, gridColumn6, gridColumn7 });
gridView1.DetailHeight = 450;
gridView1.GridControl = gridControl1;
gridView1.Name = "gridView1";
@@ -685,6 +758,96 @@
gridView1.OptionsDragDrop.AllowSortedDataDragDrop = false;
gridView1.OptionsEditForm.PopupEditFormWidth = 914;
gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn4
+ //
+ gridColumn4.Caption = "鏀归�犲墠鐢ㄧ數閲�(搴�)";
+ gridColumn4.FieldName = "BeforeEff";
+ gridColumn4.MinWidth = 25;
+ gridColumn4.Name = "gridColumn4";
+ gridColumn4.Visible = true;
+ gridColumn4.VisibleIndex = 3;
+ gridColumn4.Width = 94;
+ //
+ // gridColumn1
+ //
+ gridColumn1.Caption = "鏃堕棿";
+ gridColumn1.FieldName = "Time";
+ gridColumn1.MinWidth = 25;
+ gridColumn1.Name = "gridColumn1";
+ gridColumn1.Visible = true;
+ gridColumn1.VisibleIndex = 0;
+ gridColumn1.Width = 94;
+ //
+ // gridColumn2
+ //
+ gridColumn2.Caption = "娴侀噺";
+ gridColumn2.FieldName = "Flow";
+ gridColumn2.MinWidth = 25;
+ gridColumn2.Name = "gridColumn2";
+ gridColumn2.Visible = true;
+ gridColumn2.VisibleIndex = 1;
+ gridColumn2.Width = 94;
+ //
+ // gridColumn3
+ //
+ gridColumn3.Caption = "鍘嬪姏";
+ gridColumn3.FieldName = "Power";
+ gridColumn3.MinWidth = 25;
+ gridColumn3.Name = "gridColumn3";
+ gridColumn3.Visible = true;
+ gridColumn3.VisibleIndex = 2;
+ gridColumn3.Width = 94;
+ //
+ // gridColumn9
+ //
+ gridColumn9.Caption = "鐢ㄧ數閲忚妭鐪佸��";
+ gridColumn9.FieldName = "EffPercent";
+ gridColumn9.MinWidth = 25;
+ gridColumn9.Name = "gridColumn9";
+ gridColumn9.Visible = true;
+ gridColumn9.VisibleIndex = 5;
+ gridColumn9.Width = 94;
+ //
+ // gridColumn8
+ //
+ gridColumn8.Caption = "鐢佃垂鑺傜渷鍊�";
+ gridColumn8.FieldName = "PricePercent";
+ gridColumn8.MinWidth = 25;
+ gridColumn8.Name = "gridColumn8";
+ gridColumn8.Visible = true;
+ gridColumn8.VisibleIndex = 8;
+ gridColumn8.Width = 94;
+ //
+ // gridColumn5
+ //
+ gridColumn5.Caption = "鏀归�犲悗鐢ㄧ數閲�(搴�)";
+ gridColumn5.FieldName = "AfterEff";
+ gridColumn5.MinWidth = 25;
+ gridColumn5.Name = "gridColumn5";
+ gridColumn5.Visible = true;
+ gridColumn5.VisibleIndex = 4;
+ gridColumn5.Width = 94;
+ //
+ // gridColumn6
+ //
+ gridColumn6.Caption = "鏀归�犲墠鐢佃垂(鍏�)";
+ gridColumn6.FieldName = "BeforePrice";
+ gridColumn6.MinWidth = 25;
+ gridColumn6.Name = "gridColumn6";
+ gridColumn6.Visible = true;
+ gridColumn6.VisibleIndex = 6;
+ gridColumn6.Width = 94;
+ //
+ // gridColumn7
+ //
+ gridColumn7.Caption = "鏀归�犲悗鐢佃垂(鍏�)";
+ gridColumn7.FieldName = "AfterPrice";
+ gridColumn7.MinWidth = 25;
+ gridColumn7.Name = "gridColumn7";
+ gridColumn7.Visible = true;
+ gridColumn7.VisibleIndex = 7;
+ gridColumn7.Width = 94;
//
// layoutControlItem6
//
@@ -758,30 +921,30 @@
Name = "EnergyAnalysis";
Size = new Size(1146, 886);
((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
- ((System.ComponentModel.ISupportInitialize)xyDiagramPane3).EndInit();
- ((System.ComponentModel.ISupportInitialize)xyDiagramPane4).EndInit();
- ((System.ComponentModel.ISupportInitialize)secondaryAxisy4).EndInit();
- ((System.ComponentModel.ISupportInitialize)secondaryAxisy5).EndInit();
- ((System.ComponentModel.ISupportInitialize)secondaryAxisy6).EndInit();
- ((System.ComponentModel.ISupportInitialize)xyDiagram2).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView10).EndInit();
- ((System.ComponentModel.ISupportInitialize)series10).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView11).EndInit();
- ((System.ComponentModel.ISupportInitialize)series11).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView12).EndInit();
- ((System.ComponentModel.ISupportInitialize)series12).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView13).EndInit();
- ((System.ComponentModel.ISupportInitialize)series13).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView14).EndInit();
- ((System.ComponentModel.ISupportInitialize)series14).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView15).EndInit();
- ((System.ComponentModel.ISupportInitialize)series15).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView16).EndInit();
- ((System.ComponentModel.ISupportInitialize)series16).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView17).EndInit();
- ((System.ComponentModel.ISupportInitialize)series17).EndInit();
- ((System.ComponentModel.ISupportInitialize)splineSeriesView18).EndInit();
- ((System.ComponentModel.ISupportInitialize)series18).EndInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagramPane1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagramPane2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagram1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView4).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series4).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView5).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series5).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView6).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series6).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView7).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series7).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView8).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series8).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView9).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series9).EndInit();
((System.ComponentModel.ISupportInitialize)chartControl1).EndInit();
((System.ComponentModel.ISupportInitialize)xtraTabControl1).EndInit();
xtraTabControl1.ResumeLayout(false);
@@ -803,6 +966,8 @@
((System.ComponentModel.ISupportInitialize)textEditPriceBefore.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditEffAfter.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)textEditPriceAfter.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditEffPercent.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditPricePercent.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
@@ -814,11 +979,14 @@
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
+ ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
- ((System.ComponentModel.ISupportInitialize)emptySpaceItem4).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup5).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem14).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem15).EndInit();
xtraTabPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
@@ -828,6 +996,7 @@
((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
+ ((System.ComponentModel.ISupportInitialize)bindingSource1).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -879,5 +1048,20 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraBars.BarButtonItem BtnRefresh;
+ private DevExpress.XtraEditors.TextEdit textEditEffPercent;
+ private DevExpress.XtraEditors.TextEdit textEditPricePercent;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private BindingSource bindingSource1;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs
index 5454a24..17e8752 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs
@@ -16,6 +16,9 @@
{
InitializeComponent();
InitialChart();
+ this.gridView1.SetNormalView(30);
+ // 鍋囪 chartControl1 鏄綘鍦ㄧ晫闈笂娣诲姞鐨� ChartControl 鎺т欢瀹炰緥
+ this.chartControl1.Legend.Visible = false;
}
private List<FlowPressChartViewModel> _datalist;
@@ -54,13 +57,33 @@
private class PowerData
{
- public double Power;
+ public double Value;
public DateTime Time;
}
private List<PowerData> _oldData;
private List<PowerData> _newData;
+
+ public class ViewModel
+ {
+ public string Time { get; set; }
+ public double Power { get; set; }
+
+ public double Flow { get; set; }
+
+ public double BeforeEff { get; set; }
+ public double AfterEff { get; set; }
+
+ public string EffPercent { get; set; }
+
+ public double BeforePrice { get; set; }
+ public double AfterPrice { get; set; }
+
+ public string PricePercent { get; set; }
+ }
+
+ private List<ViewModel> _allBindingData;
/// <summary>
/// 鍒濆鍖栧浘琛�
@@ -97,8 +120,10 @@
/// </summary>
public void SetBindingData(List<FlowPressChartViewModel> vm_list, DataTable dataTable)
{
- var view = gridControl1.MainView as GridView;
- view.Columns.Clear();
+ _allBindingData = new List<ViewModel>();
+
+ //var view = gridControl1.MainView as GridView;
+ //view.Columns.Clear();
this.chartControl1.BeginInit();
//this.chartControl1.Series.Clear();
@@ -118,13 +143,14 @@
AxisXBase axis_x = null;
AxisYBase axis_y = null;
XYDiagramPaneBase pane = null;
-
- var colTime = new GridColumn();
- colTime.FieldName = "鏃堕棿";
- colTime.Caption = "鏃堕棿";
- colTime.Visible = true;
- view.Columns.Add(colTime);
var totalFlow = new List<double>();
+
+ /* var colTime = new GridColumn();
+ colTime.FieldName = "鏃堕棿";
+ colTime.Caption = "鏃堕棿";
+ colTime.Visible = true;
+ view.Columns.Add(colTime);
+ */
foreach (var vm in vm_list)
{
if (!vm.Name.Contains("鍘嬪姏"))
@@ -140,12 +166,12 @@
axis_y = _axis_y_eff;
pane = _default_pane;
}
- var col = new GridColumn();
- col.FieldName = vm.Name;
- col.Caption = vm.Name;
- col.Visible = true;
- view.Columns.Add(col);
-
+ /* var col = new GridColumn();
+ col.FieldName = vm.Name;
+ col.Caption = vm.Name;
+ col.Visible = true;
+ view.Columns.Add(col);
+ */
AddLineSeries(vm.Name, axis_x, axis_y, pane, vm.Datas);
}
@@ -166,18 +192,18 @@
var newel = Yw.Pump.CalculationHelper.CalcuP(flow.Y, newpressM, Efficiency);
_oldData.Add(new PowerData
{
- Power = oldel / 60,
+ Value = oldel / 60,
Time = DateTime.Parse(item.Time)
});
_newData.Add(new PowerData
{
- Power = newel / 60,
+ Value = newel / 60,
Time = DateTime.Parse(item.Time)
});
var el = oldel / 60 - newel / 60;
totalOldEl += oldel / 60;
totalEl += el;
- var Fy = ElecPriceHelper.CalcuShysElectricityFees(DateTime.Parse(item.Time), el);
+ //var Fy = ElecPriceHelper.CalcuShysElectricityFees(DateTime.Parse(item.Time), el);
//totalFy += Fy;
}
//item.Y = Press;//Yw.Pump.CalculationHelper.CalcuP();
@@ -203,6 +229,26 @@
this.chartControl1.EndInit();
SetEffData();
SetEffPriceData();
+ for (int i = 0; i < _oldData.Count; i++)
+ {
+ var model = new ViewModel()
+ {
+ Time = _oldData[i].Time.ToString("yyyy-MM-dd HH:mm:ss"),
+ Power = tempdatas.Datas[i].Y,
+ Flow = tempflow.Datas[i].Y,
+ BeforeEff = Math.Round(_oldData[i].Value, 5),
+ AfterEff = Math.Round(_newData[i].Value, 5),
+ EffPercent = ((Math.Abs(_newData[i].Value - _oldData[i].Value) / ((_newData[i].Value + _oldData[i].Value) / 2)) * 100).ToString("F2") + "%",
+ BeforePrice = Math.Round(_oldPrice[i].Value, 5),
+ AfterPrice = Math.Round(_newPrice[i].Value, 5),
+ PricePercent = ((Math.Abs(_newPrice[i].Value - _oldPrice[i].Value) / ((_newPrice[i].Value + _oldPrice[i].Value) / 2)) * 100).ToString("F2") + "%"
+ };
+ _allBindingData.Add(model);
+ }
+
+ this.bindingSource1.DataSource = _allBindingData;
+ this.gridControl1.DataSource = this.bindingSource1;
+ // this.bindingSource1.
}
private void SetEffData()
@@ -211,23 +257,25 @@
double totalEffAfter = 0;
var SeriseOld = this.chartControl1.GetSeriesByName("鏀归�犲墠(搴�)");
SeriseOld.Points.Clear();
+
if (_oldData != null)
{
foreach (var item in _oldData)
{
- totalEffBefore += item.Power;
- SeriseOld.Points.Add(new SeriesPoint(item.Time, item.Power));
+ totalEffBefore += item.Value;
+ SeriseOld.Points.Add(new SeriesPoint(item.Time, item.Value));
}
}
this.textEditEffBefore.Text = Math.Round(totalEffBefore).ToString();
var SeriseNew = this.chartControl1.GetSeriesByName("鏀归�犲悗(搴�)");
SeriseNew.Points.Clear();
+
if (_newData != null)
{
foreach (var item in _newData)
{
- totalEffAfter += item.Power;
- SeriseNew.Points.Add(new SeriesPoint(item.Time, item.Power));
+ totalEffAfter += item.Value;
+ SeriseNew.Points.Add(new SeriesPoint(item.Time, item.Value));
}
}
this.textEditEffAfter.Text = Math.Round(totalEffAfter).ToString();
@@ -239,59 +287,77 @@
{
for (int i = 0; i < _oldData.Count; i++)
{
- var def = _oldData[i].Power - _newData[i].Power;
+ var def = _oldData[i].Value - _newData[i].Value;
SeriesDef.Points.Add(new SeriesPoint(_newData[i].Time, def));
}
}
+ if (this.textEditEffBefore.EditValue != null && this.textEditEffAfter.EditValue != null)
+ {
+ double priceBefore = double.Parse(this.textEditEffBefore.EditValue.ToString());
+ double priceAfter = double.Parse(this.textEditEffAfter.EditValue.ToString());
+ double priceDifference = priceBefore - priceAfter;
+ double percentageChange = (priceDifference / ((priceBefore + priceAfter) / 2)) * 100;
+ this.textEditEffPercent.Text = percentageChange.ToString("F2") + "%";
+ }
}
+
+ private List<PowerData> _oldPrice = null;
+ private List<PowerData> _newPrice = null;
private void SetEffPriceData()
{
_totalPrice = default;
double totalBeforePrice = 0;
double totalAfterPrice = 0;
- List<PowerData> oldPrice = null;
- List<PowerData> newPrice = null;
var SeriseOld = this.chartControl1.GetSeriesByName("鏀归�犲墠(鍏�)");
+
SeriseOld.Points.Clear();
if (_oldData != null)
{
- oldPrice = new List<PowerData>();
+ _oldPrice = new List<PowerData>();
foreach (var item in _oldData)
{
- var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Power);
+ var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Value);
totalBeforePrice += price;
SeriseOld.Points.Add(new SeriesPoint(item.Time, price));
- oldPrice.Add(new PowerData { Time = item.Time, Power = item.Power });
+ _oldPrice.Add(new PowerData { Time = item.Time, Value = price });
}
}
this.textEditPriceBefore.Text = Math.Round(totalBeforePrice).ToString();
var SeriseNew = this.chartControl1.GetSeriesByName("鏀归�犲悗(鍏�)");
+
SeriseNew.Points.Clear();
if (_newData != null)
{
- newPrice = new List<PowerData>();
+ _newPrice = new List<PowerData>();
foreach (var item in _newData)
{
- var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Power);
+ var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Value);
totalAfterPrice += price;
SeriseNew.Points.Add(new SeriesPoint(item.Time, price));
- newPrice.Add(new PowerData { Time = item.Time, Power = item.Power });
+ _newPrice.Add(new PowerData { Time = item.Time, Value = price });
}
}
this.textEditPriceAfter.Text = Math.Round(totalAfterPrice).ToString();
var SeriesDef = this.chartControl1.GetSeriesByName("鑺傜渷鍊�(鍏�)");
SeriesDef.Points.Clear();
-
- if (oldPrice != null && newPrice != null)
+ if (_oldPrice != null && _newPrice != null)
{
- for (int i = 0; i < oldPrice.Count; i++)
+ for (int i = 0; i < _oldPrice.Count; i++)
{
- var def = oldPrice[i].Power - newPrice[i].Power;
+ var def = _oldPrice[i].Value - _newPrice[i].Value;
_totalPrice += def;
- SeriesDef.Points.Add(new SeriesPoint(oldPrice[i].Time, def));
+ SeriesDef.Points.Add(new SeriesPoint(_oldPrice[i].Time, def));
}
}
+ if (this.textEditPriceBefore.EditValue != null && this.textEditPriceAfter.EditValue != null)
+ {
+ double priceBefore = double.Parse(this.textEditPriceBefore.EditValue.ToString());
+ double priceAfter = double.Parse(this.textEditPriceAfter.EditValue.ToString());
+ double priceDifference = priceBefore - priceAfter;
+ double percentageChange = (priceDifference / ((priceBefore + priceAfter) / 2)) * 100;
+ this.textEditPricePercent.Text = percentageChange.ToString("F2") + "%";
+ }
textEdit5.Text = Math.Round(_totalPrice).ToString();
}
diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.resx b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.resx
index efa486d..4ac808b 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.resx
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.resx
@@ -184,4 +184,7 @@
bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
+ <metadata name="bindingSource1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+ <value>17, 17</value>
+ </metadata>
</root>
\ No newline at end of file
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.Designer.cs b/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.Designer.cs
index 971e0b7..d5188bd 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.Designer.cs
@@ -40,7 +40,7 @@
dockPanelRight = new DevExpress.XtraBars.Docking.DockPanel();
controlContainer1 = new DevExpress.XtraBars.Docking.ControlContainer();
dockManager1 = new DevExpress.XtraBars.Docking.DockManager(components);
- homeXhsProjectPropertyCtrl2 = new HomeXhsProjectPropertyCtrl();
+ homeXhsProjectPropertyCtrl2 = new HomePbsProjectPropertyCtrl();
((ISupportInitialize)svgImg32).BeginInit();
sidePanelBottom.SuspendLayout();
dockPanelFill.SuspendLayout();
@@ -164,7 +164,7 @@
}
#endregion
- private HomeXhsProjectPropertyCtrl homeXhsProjectPropertyCtrl1;
+ private HomePbsProjectPropertyCtrl homeXhsProjectPropertyCtrl1;
private DevExpress.Utils.SvgImageCollection svgImg32;
private DevExpress.XtraEditors.SidePanel sidePanelBottom;
private DevExpress.XtraBars.Docking.DockManager dockManager1;
@@ -173,6 +173,6 @@
private DevExpress.XtraBars.Docking.DockPanel dockPanelFill;
private DevExpress.XtraBars.Docking.ControlContainer controlContainer2;
private MapViewProjectListContainer mapViewProjectListContainer2;
- private HomeXhsProjectPropertyCtrl homeXhsProjectPropertyCtrl2;
+ private HomePbsProjectPropertyCtrl homeXhsProjectPropertyCtrl2;
}
}
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs b/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs
index 3a4a7c7..f5d97d7 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/00-core/HomePbsProjectPage.cs
@@ -24,7 +24,7 @@
public override async void InitialDataSource()
{
base.InitialDataSource();
- //_allProjectList = await BLLFactory<HStation.BLL.XhsProject>.Instance.GetAll();
+ _allProjectList = await new BLL.Facility().GetAll();
//this.xhsProjectHomeTitleCtrl1.SetBindingData();
await this.mapViewProjectListContainer2.InitialContainer();
}
@@ -37,14 +37,14 @@
base.RefreshData();
_allProjectList = await new BLL.Facility().GetAll();
// this.xhsProjectHomeTitleCtrl1.SetBindingData();
- // await this.mapViewProjectListContainer1.SetProjectList(_allProjectList);
+ await this.mapViewProjectListContainer2.SetProjectList(_allProjectList);
// this.homeXhsProjectTreeListCtrl1.SetBindingData(_allProjectList);
}
//鍦板浘鍔犺浇瀹屾垚
private async void MapViewProjectListContainer1_LoadCompletedEvent()
{
- // await this.mapViewProjectListContainer1.SetProjectList(_allProjectList);
+ await this.mapViewProjectListContainer2.SetProjectList(_allProjectList);
// this.homeXhsProjectTreeListCtrl1.SetBindingData(_allProjectList);
}
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs b/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs
index 113253b..a208c21 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapProjectViewModel.cs
@@ -14,16 +14,16 @@
/// <summary>
///
/// </summary>
- /* public MapProjectViewModel(XhsProjectVmo project, Yw.Vmo.MapInfoVmo mapInfo)
+ public MapProjectViewModel(Vmo.FacilityVmo project, Yw.Vmo.MapInfoVmo mapInfo)
{
this.Id = project.ID.ToString();
this.Name = project.Name;
- this.NO = project.NO;
+ //this.NO = project.NO;
this.Description = project.Description;
var marker = Yw.Model.Map.Marker.ToModel(mapInfo.Position);
this.Point = marker?.Point;
- this.Customer = project.Customer;
- }*/
+ //this.Customer = project.Customer;
+ }
/// <summary>
/// 椤圭洰id
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs b/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs
index a88add3..e902514 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/02-map/MapViewProjectListContainer.cs
@@ -91,38 +91,41 @@
this.HandingErrorEvent?.Invoke(obj);
}
- /* /// <summary>
- /// 璁剧疆椤圭洰鍒楄〃
- /// </summary>
- public async Task<bool> SetProjectList(List<XhsProjectVmo> allProjectList)
- {
- if (!_isInitialized)
- {
- return false;
- }
- var allProjectIds = allProjectList?.Select(x => x.ID).Distinct().ToList();
- var allMapInfoList = await new Yw.BLL.MapInfo().GetByObjectTypeAndObjectIdsOfKindPurpose
- (HStation.Xhs.DataType.XhsProject, allProjectIds, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
- var vmList = new List<MapProjectViewModel>();
- if (allMapInfoList != null && allMapInfoList.Count > 0)
- {
- foreach (var mapInfo in allMapInfoList)
- {
- var project = allProjectList.Find(x => x.ID == mapInfo.ObjectID);
- var vm = new MapProjectViewModel(project, mapInfo);
- vmList.Add(vm);
- }
- }
+ /// <summary>
+ /// 璁剧疆椤圭洰鍒楄〃
+ /// </summary>
+ public async Task<bool> SetProjectList(List<PBS.Vmo.FacilityVmo> allProjectList)
+ {
+ if (!_isInitialized)
+ {
+ return false;
+ }
+ var allProjectIds = allProjectList?.Select(x => x.PlaceID).Distinct().ToList();
+ var allMapInfoList = await new Yw.BLL.MapInfo().GetByObjectTypeAndObjectIdsOfKindPurpose
+ (PBS.DataType.PBSPlace, allProjectIds, Yw.Map.Kind.Gaodei, Yw.Map.Purpose.Location);
+ var vmList = new List<MapProjectViewModel>();
+ if (allMapInfoList != null && allMapInfoList.Count > 0)
+ {
+ foreach (var mapInfo in allMapInfoList)
+ {
+ var project = allProjectList.Find(x => x.PlaceID == mapInfo.ObjectID);
+ if (project != null)
+ {
+ var vm = new MapProjectViewModel(project, mapInfo);
+ vmList.Add(vm);
+ }
+ }
+ }
- return await this.webViewControl1.EvaluateScriptAsync<bool>("setProjectList", vmList);
- }*/
+ return await this.webViewControl2.EvaluateScriptAsync<bool>("setProjectList", vmList);
+ }
/// <summary>
/// 閫夋嫨椤圭洰
/// </summary>
public async Task<bool> SelectProject(long projectId)
{
- return await this.webViewControl1.EvaluateScriptAsync<bool>("selectProject", projectId.ToString());
+ return await this.webViewControl2.EvaluateScriptAsync<bool>("selectProject", projectId.ToString());
}
/// <summary>
@@ -130,7 +133,7 @@
/// </summary>
public async Task<bool> CancelSelectProject()
{
- return await this.webViewControl1.EvaluateScriptAsync<bool>("cancelSelectProject()");
+ return await this.webViewControl2.EvaluateScriptAsync<bool>("cancelSelectProject()");
}
}
}
\ No newline at end of file
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.Designer.cs
similarity index 74%
rename from WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs
rename to WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.Designer.cs
index c42c4da..23a3378 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.Designer.cs
@@ -2,7 +2,7 @@
namespace PBS.WinFrmUI
{
- partial class HomeXhsProjectPropertyCtrl
+ partial class HomePbsProjectPropertyCtrl
{
/// <summary>
/// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
@@ -31,19 +31,13 @@
private void InitializeComponent()
{
components = new Container();
- ComponentResourceManager resources = new ComponentResourceManager(typeof(HomeXhsProjectPropertyCtrl));
- DevExpress.Utils.SuperToolTip superToolTip1 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipTitleItem toolTipTitleItem1 = new DevExpress.Utils.ToolTipTitleItem();
- DevExpress.Utils.ToolTipItem toolTipItem1 = new DevExpress.Utils.ToolTipItem();
- DevExpress.Utils.SuperToolTip superToolTip2 = new DevExpress.Utils.SuperToolTip();
- DevExpress.Utils.ToolTipItem toolTipItem2 = new DevExpress.Utils.ToolTipItem();
+ ComponentResourceManager resources = new ComponentResourceManager(typeof(HomePbsProjectPropertyCtrl));
+ DevExpress.Utils.SuperToolTip superToolTip3 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipTitleItem toolTipTitleItem2 = new DevExpress.Utils.ToolTipTitleItem();
+ DevExpress.Utils.ToolTipItem toolTipItem3 = new DevExpress.Utils.ToolTipItem();
+ DevExpress.Utils.SuperToolTip superToolTip4 = new DevExpress.Utils.SuperToolTip();
+ DevExpress.Utils.ToolTipItem toolTipItem4 = new DevExpress.Utils.ToolTipItem();
layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
- propertyDescriptionControl1 = new DevExpress.XtraVerticalGrid.PropertyDescriptionControl();
- propertyGridControl1 = new DevExpress.XtraVerticalGrid.PropertyGridControl();
- layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- layoutProperty = new DevExpress.XtraLayout.LayoutControlItem();
- splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
- layoutDescription = new DevExpress.XtraLayout.LayoutControlItem();
barManager1 = new DevExpress.XtraBars.BarManager(components);
bar1 = new DevExpress.XtraBars.Bar();
barBtnExpandAll = new DevExpress.XtraBars.BarButtonItem();
@@ -54,105 +48,43 @@
barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ propertyDescriptionControl1 = new DevExpress.XtraVerticalGrid.PropertyDescriptionControl();
+ propertyGridControl1 = new DevExpress.XtraVerticalGrid.PropertyGridControl();
+ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutProperty = new DevExpress.XtraLayout.LayoutControlItem();
+ splitterItem1 = new DevExpress.XtraLayout.SplitterItem();
+ layoutDescription = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ gridControl1 = new DevExpress.XtraGrid.GridControl();
+ gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
((ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
+ ((ISupportInitialize)barManager1).BeginInit();
((ISupportInitialize)propertyGridControl1).BeginInit();
((ISupportInitialize)layoutControlGroup1).BeginInit();
((ISupportInitialize)layoutProperty).BeginInit();
((ISupportInitialize)splitterItem1).BeginInit();
((ISupportInitialize)layoutDescription).BeginInit();
- ((ISupportInitialize)barManager1).BeginInit();
+ ((ISupportInitialize)layoutControlItem1).BeginInit();
+ ((ISupportInitialize)gridView1).BeginInit();
+ ((ISupportInitialize)gridControl1).BeginInit();
SuspendLayout();
//
// layoutControl1
//
+ layoutControl1.Controls.Add(gridControl1);
layoutControl1.Controls.Add(propertyDescriptionControl1);
layoutControl1.Controls.Add(propertyGridControl1);
layoutControl1.Dock = DockStyle.Fill;
- layoutControl1.Location = new Point(0, 28);
+ layoutControl1.Location = new Point(0, 35);
+ layoutControl1.Margin = new Padding(3, 4, 3, 4);
layoutControl1.Name = "layoutControl1";
layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new Rectangle(567, 190, 714, 577);
layoutControl1.Root = layoutControlGroup1;
- layoutControl1.Size = new Size(260, 602);
+ layoutControl1.Size = new Size(297, 775);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
- //
- // propertyDescriptionControl1
- //
- propertyDescriptionControl1.Location = new Point(2, 529);
- propertyDescriptionControl1.Name = "propertyDescriptionControl1";
- propertyDescriptionControl1.PropertyGrid = propertyGridControl1;
- propertyDescriptionControl1.Size = new Size(256, 71);
- propertyDescriptionControl1.StyleController = layoutControl1;
- propertyDescriptionControl1.TabIndex = 5;
- propertyDescriptionControl1.TabStop = false;
- //
- // propertyGridControl1
- //
- propertyGridControl1.Appearance.FocusedCell.BackColor = Color.FromArgb(0, 122, 204);
- propertyGridControl1.Appearance.FocusedCell.ForeColor = Color.White;
- propertyGridControl1.Appearance.FocusedCell.Options.UseBackColor = true;
- propertyGridControl1.Appearance.FocusedCell.Options.UseForeColor = true;
- propertyGridControl1.Appearance.FocusedRow.BackColor = Color.FromArgb(0, 122, 204);
- propertyGridControl1.Appearance.FocusedRow.ForeColor = Color.White;
- propertyGridControl1.Appearance.FocusedRow.Options.UseBackColor = true;
- propertyGridControl1.Appearance.FocusedRow.Options.UseForeColor = true;
- propertyGridControl1.Appearance.ReadOnlyRecordValue.ForeColor = Color.Black;
- propertyGridControl1.Appearance.ReadOnlyRecordValue.Options.UseForeColor = true;
- propertyGridControl1.Appearance.ReadOnlyRow.ForeColor = Color.Black;
- propertyGridControl1.Appearance.ReadOnlyRow.Options.UseForeColor = true;
- propertyGridControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
- propertyGridControl1.Location = new Point(2, 2);
- propertyGridControl1.Name = "propertyGridControl1";
- propertyGridControl1.OptionsBehavior.Editable = false;
- propertyGridControl1.OptionsBehavior.PropertySort = DevExpress.XtraVerticalGrid.PropertySort.NoSort;
- propertyGridControl1.OptionsHint.ShowRowHeaderHints = false;
- propertyGridControl1.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.True;
- propertyGridControl1.OptionsView.ShowRootCategories = false;
- propertyGridControl1.RecordWidth = 120;
- propertyGridControl1.RowHeaderWidth = 80;
- propertyGridControl1.Size = new Size(256, 513);
- propertyGridControl1.TabIndex = 4;
- propertyGridControl1.CustomRecordCellEdit += propertyGridControl1_CustomRecordCellEdit;
- propertyGridControl1.CustomDrawRowValueCell += propertyGridControl1_CustomDrawRowValueCell;
- propertyGridControl1.ShowingEditor += propertyGridControl1_ShowingEditor;
- propertyGridControl1.CellValueChanging += propertyGridControl1_CellValueChanging;
- propertyGridControl1.CellValueChanged += propertyGridControl1_CellValueChanged;
- //
- // layoutControlGroup1
- //
- layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
- layoutControlGroup1.GroupBordersVisible = false;
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutProperty, splitterItem1, layoutDescription });
- layoutControlGroup1.Name = "Root";
- layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- layoutControlGroup1.Size = new Size(260, 602);
- layoutControlGroup1.TextVisible = false;
- //
- // layoutProperty
- //
- layoutProperty.Control = propertyGridControl1;
- layoutProperty.Location = new Point(0, 0);
- layoutProperty.Name = "layoutProperty";
- layoutProperty.Size = new Size(260, 517);
- layoutProperty.TextSize = new Size(0, 0);
- layoutProperty.TextVisible = false;
- //
- // splitterItem1
- //
- splitterItem1.AllowHotTrack = true;
- splitterItem1.Location = new Point(0, 517);
- splitterItem1.Name = "splitterItem1";
- splitterItem1.Size = new Size(260, 10);
- //
- // layoutDescription
- //
- layoutDescription.Control = propertyDescriptionControl1;
- layoutDescription.Location = new Point(0, 527);
- layoutDescription.Name = "layoutDescription";
- layoutDescription.Size = new Size(260, 75);
- layoutDescription.TextSize = new Size(0, 0);
- layoutDescription.TextVisible = false;
//
// barManager1
//
@@ -211,14 +143,14 @@
barBtnHelp.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnHelp.ImageOptions.SvgImage");
barBtnHelp.ImageOptions.SvgImageSize = new Size(20, 20);
barBtnHelp.Name = "barBtnHelp";
- toolTipTitleItem1.Appearance.Image = (Image)resources.GetObject("resource.Image");
- toolTipTitleItem1.Appearance.Options.UseImage = true;
- toolTipTitleItem1.ImageOptions.Image = (Image)resources.GetObject("resource.Image1");
- toolTipItem1.LeftIndent = 6;
- toolTipItem1.Text = "鎻忚堪淇℃伅";
- superToolTip1.Items.Add(toolTipTitleItem1);
- superToolTip1.Items.Add(toolTipItem1);
- barBtnHelp.SuperTip = superToolTip1;
+ toolTipTitleItem2.Appearance.Image = (Image)resources.GetObject("resource.Image");
+ toolTipTitleItem2.Appearance.Options.UseImage = true;
+ toolTipTitleItem2.ImageOptions.Image = (Image)resources.GetObject("resource.Image1");
+ toolTipItem3.LeftIndent = 6;
+ toolTipItem3.Text = "鎻忚堪淇℃伅";
+ superToolTip3.Items.Add(toolTipTitleItem2);
+ superToolTip3.Items.Add(toolTipItem3);
+ barBtnHelp.SuperTip = superToolTip3;
barBtnHelp.ItemClick += barBtnHelp_ItemClick;
//
// barBtnDirect
@@ -232,10 +164,10 @@
barBtnDirect.ItemAppearance.Normal.Options.UseFont = true;
barBtnDirect.Name = "barBtnDirect";
barBtnDirect.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph;
- toolTipItem2.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True;
- toolTipItem2.Text = "璺宠浆";
- superToolTip2.Items.Add(toolTipItem2);
- barBtnDirect.SuperTip = superToolTip2;
+ toolTipItem4.AllowHtmlText = DevExpress.Utils.DefaultBoolean.True;
+ toolTipItem4.Text = "璺宠浆";
+ superToolTip4.Items.Add(toolTipItem4);
+ barBtnDirect.SuperTip = superToolTip4;
barBtnDirect.ItemClick += barBtnDirect_ItemClick;
//
// barDockControlTop
@@ -244,51 +176,175 @@
barDockControlTop.Dock = DockStyle.Top;
barDockControlTop.Location = new Point(0, 0);
barDockControlTop.Manager = barManager1;
- barDockControlTop.Size = new Size(260, 28);
+ barDockControlTop.Margin = new Padding(3, 4, 3, 4);
+ barDockControlTop.Size = new Size(297, 35);
//
// barDockControlBottom
//
barDockControlBottom.CausesValidation = false;
barDockControlBottom.Dock = DockStyle.Bottom;
- barDockControlBottom.Location = new Point(0, 630);
+ barDockControlBottom.Location = new Point(0, 810);
barDockControlBottom.Manager = barManager1;
- barDockControlBottom.Size = new Size(260, 0);
+ barDockControlBottom.Margin = new Padding(3, 4, 3, 4);
+ barDockControlBottom.Size = new Size(297, 0);
//
// barDockControlLeft
//
barDockControlLeft.CausesValidation = false;
barDockControlLeft.Dock = DockStyle.Left;
- barDockControlLeft.Location = new Point(0, 28);
+ barDockControlLeft.Location = new Point(0, 35);
barDockControlLeft.Manager = barManager1;
- barDockControlLeft.Size = new Size(0, 602);
+ barDockControlLeft.Margin = new Padding(3, 4, 3, 4);
+ barDockControlLeft.Size = new Size(0, 775);
//
// barDockControlRight
//
barDockControlRight.CausesValidation = false;
barDockControlRight.Dock = DockStyle.Right;
- barDockControlRight.Location = new Point(260, 28);
+ barDockControlRight.Location = new Point(297, 35);
barDockControlRight.Manager = barManager1;
- barDockControlRight.Size = new Size(0, 602);
+ barDockControlRight.Margin = new Padding(3, 4, 3, 4);
+ barDockControlRight.Size = new Size(0, 775);
//
- // HomeXhsProjectPropertyCtrl
+ // propertyDescriptionControl1
//
- AutoScaleDimensions = new SizeF(7F, 14F);
+ propertyDescriptionControl1.Location = new Point(2, 679);
+ propertyDescriptionControl1.Margin = new Padding(3, 4, 3, 4);
+ propertyDescriptionControl1.Name = "propertyDescriptionControl1";
+ propertyDescriptionControl1.PropertyGrid = propertyGridControl1;
+ propertyDescriptionControl1.Size = new Size(293, 94);
+ propertyDescriptionControl1.StyleController = layoutControl1;
+ propertyDescriptionControl1.TabIndex = 5;
+ propertyDescriptionControl1.TabStop = false;
+ //
+ // propertyGridControl1
+ //
+ propertyGridControl1.Appearance.FocusedCell.BackColor = Color.FromArgb(0, 122, 204);
+ propertyGridControl1.Appearance.FocusedCell.ForeColor = Color.White;
+ propertyGridControl1.Appearance.FocusedCell.Options.UseBackColor = true;
+ propertyGridControl1.Appearance.FocusedCell.Options.UseForeColor = true;
+ propertyGridControl1.Appearance.FocusedRow.BackColor = Color.FromArgb(0, 122, 204);
+ propertyGridControl1.Appearance.FocusedRow.ForeColor = Color.White;
+ propertyGridControl1.Appearance.FocusedRow.Options.UseBackColor = true;
+ propertyGridControl1.Appearance.FocusedRow.Options.UseForeColor = true;
+ propertyGridControl1.Appearance.ReadOnlyRecordValue.ForeColor = Color.Black;
+ propertyGridControl1.Appearance.ReadOnlyRecordValue.Options.UseForeColor = true;
+ propertyGridControl1.Appearance.ReadOnlyRow.ForeColor = Color.Black;
+ propertyGridControl1.Appearance.ReadOnlyRow.Options.UseForeColor = true;
+ propertyGridControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
+ propertyGridControl1.Location = new Point(2, 2);
+ propertyGridControl1.Margin = new Padding(3, 4, 3, 4);
+ propertyGridControl1.Name = "propertyGridControl1";
+ propertyGridControl1.OptionsBehavior.Editable = false;
+ propertyGridControl1.OptionsBehavior.PropertySort = DevExpress.XtraVerticalGrid.PropertySort.NoSort;
+ propertyGridControl1.OptionsHint.ShowRowHeaderHints = false;
+ propertyGridControl1.OptionsView.AllowReadOnlyRowAppearance = DevExpress.Utils.DefaultBoolean.True;
+ propertyGridControl1.OptionsView.MinRowAutoHeight = 13;
+ propertyGridControl1.OptionsView.ShowRootCategories = false;
+ propertyGridControl1.RecordWidth = 120;
+ propertyGridControl1.RowHeaderWidth = 80;
+ propertyGridControl1.Size = new Size(293, 328);
+ propertyGridControl1.TabIndex = 4;
+ propertyGridControl1.CustomRecordCellEdit += propertyGridControl1_CustomRecordCellEdit;
+ propertyGridControl1.CustomDrawRowValueCell += propertyGridControl1_CustomDrawRowValueCell;
+ propertyGridControl1.ShowingEditor += propertyGridControl1_ShowingEditor;
+ propertyGridControl1.CellValueChanging += propertyGridControl1_CellValueChanging;
+ propertyGridControl1.CellValueChanged += propertyGridControl1_CellValueChanged;
+ //
+ // layoutControlGroup1
+ //
+ layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ layoutControlGroup1.GroupBordersVisible = false;
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutProperty, splitterItem1, layoutDescription, layoutControlItem1 });
+ layoutControlGroup1.Name = "Root";
+ layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ layoutControlGroup1.Size = new Size(297, 775);
+ layoutControlGroup1.TextVisible = false;
+ //
+ // layoutProperty
+ //
+ layoutProperty.Control = propertyGridControl1;
+ layoutProperty.Location = new Point(0, 0);
+ layoutProperty.Name = "layoutProperty";
+ layoutProperty.Size = new Size(297, 332);
+ layoutProperty.TextSize = new Size(0, 0);
+ layoutProperty.TextVisible = false;
+ //
+ // splitterItem1
+ //
+ splitterItem1.AllowHotTrack = true;
+ splitterItem1.Location = new Point(0, 665);
+ splitterItem1.Name = "splitterItem1";
+ splitterItem1.Size = new Size(297, 12);
+ //
+ // layoutDescription
+ //
+ layoutDescription.Control = propertyDescriptionControl1;
+ layoutDescription.Location = new Point(0, 677);
+ layoutDescription.Name = "layoutDescription";
+ layoutDescription.Size = new Size(297, 98);
+ layoutDescription.TextSize = new Size(0, 0);
+ layoutDescription.TextVisible = false;
+ //
+ // layoutControlItem1
+ //
+ layoutControlItem1.Control = gridControl1;
+ layoutControlItem1.Location = new Point(0, 332);
+ layoutControlItem1.Name = "layoutControlItem1";
+ layoutControlItem1.Size = new Size(297, 333);
+ layoutControlItem1.TextSize = new Size(0, 0);
+ layoutControlItem1.TextVisible = false;
+ //
+ // gridView1
+ //
+ gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { gridColumn1 });
+ gridView1.GridControl = gridControl1;
+ gridView1.Name = "gridView1";
+ gridView1.OptionsView.ShowGroupPanel = false;
+ //
+ // gridControl1
+ //
+ gridControl1.Location = new Point(2, 334);
+ gridControl1.MainView = gridView1;
+ gridControl1.MenuManager = barManager1;
+ gridControl1.Name = "gridControl1";
+ gridControl1.Size = new Size(293, 329);
+ gridControl1.TabIndex = 6;
+ gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
+ //
+ // gridColumn1
+ //
+ gridColumn1.Caption = "椤圭洰鍚�";
+ gridColumn1.FieldName = "Name";
+ gridColumn1.MinWidth = 25;
+ gridColumn1.Name = "gridColumn1";
+ gridColumn1.Visible = true;
+ gridColumn1.VisibleIndex = 0;
+ gridColumn1.Width = 94;
+ //
+ // HomePbsProjectPropertyCtrl
+ //
+ AutoScaleDimensions = new SizeF(8F, 18F);
AutoScaleMode = AutoScaleMode.Font;
Controls.Add(layoutControl1);
Controls.Add(barDockControlLeft);
Controls.Add(barDockControlRight);
Controls.Add(barDockControlBottom);
Controls.Add(barDockControlTop);
- Name = "HomeXhsProjectPropertyCtrl";
- Size = new Size(260, 630);
+ Margin = new Padding(3, 4, 3, 4);
+ Name = "HomePbsProjectPropertyCtrl";
+ Size = new Size(297, 810);
((ISupportInitialize)layoutControl1).EndInit();
layoutControl1.ResumeLayout(false);
+ ((ISupportInitialize)barManager1).EndInit();
((ISupportInitialize)propertyGridControl1).EndInit();
((ISupportInitialize)layoutControlGroup1).EndInit();
((ISupportInitialize)layoutProperty).EndInit();
((ISupportInitialize)splitterItem1).EndInit();
((ISupportInitialize)layoutDescription).EndInit();
- ((ISupportInitialize)barManager1).EndInit();
+ ((ISupportInitialize)layoutControlItem1).EndInit();
+ ((ISupportInitialize)gridView1).EndInit();
+ ((ISupportInitialize)gridControl1).EndInit();
ResumeLayout(false);
PerformLayout();
}
@@ -312,5 +368,9 @@
private DevExpress.XtraBars.BarButtonItem barBtnExpandAll;
private DevExpress.XtraBars.BarButtonItem barBtnCollpseAll;
private DevExpress.XtraBars.BarButtonItem barBtnDirect;
+ private DevExpress.XtraGrid.GridControl gridControl1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
}
}
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.cs b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.cs
similarity index 97%
rename from WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.cs
rename to WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.cs
index 456f14b..d538362 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.cs
@@ -9,9 +9,9 @@
namespace PBS.WinFrmUI
{
- public partial class HomeXhsProjectPropertyCtrl : XtraUserControl
+ public partial class HomePbsProjectPropertyCtrl : XtraUserControl
{
- public HomeXhsProjectPropertyCtrl()
+ public HomePbsProjectPropertyCtrl()
{
InitializeComponent();
//this.layoutControl1.SetupLayoutControl();
@@ -27,11 +27,11 @@
/// <summary>
/// 缁戝畾瀵硅薄
/// </summary>
- public HomeXhsProjectPropertyViewModel SelectedObject
+ public HomePbsProjectPropertyViewModel SelectedObject
{
get
{
- return this.propertyGridControl1.SelectedObject as HomeXhsProjectPropertyViewModel;
+ return this.propertyGridControl1.SelectedObject as HomePbsProjectPropertyViewModel;
}
set
{
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.resx b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.resx
similarity index 85%
rename from WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.resx
rename to WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.resx
index 1f75418..d95eacf 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyCtrl.resx
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyCtrl.resx
@@ -1,7 +1,7 @@
锘�<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
- Microsoft ResX Schema
+ Microsoft ResX Schema
Version 2.0
@@ -48,7 +48,7 @@
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
-
+
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
@@ -121,6 +121,62 @@
<value>17, 17</value>
</metadata>
<assembly alias="DevExpress.Data.v23.2" name="DevExpress.Data.v23.2, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <data name="barBtnHelp.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
+ LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+ dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/
+ PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+ IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+ MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+ Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+ MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
+ LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
+ MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+ Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
+ MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
+ bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9
+ Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs
+ MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs
+ NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
+ PC9nPg0KPC9zdmc+Cw==
+</value>
+ </data>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACR0RVh0VGl0
+ bGUAQ29tbWVudDtUb29sdGlwO0hpbnQ7VGlwO0Nsb3Vk08HbyQAAAnlJREFUOE99k0lMk1EUhW8AZ0TA
+ AZduJS5wg2EwBDUudKMbFgoKiBQMIsogQUCgxWGliQNNI1CG0gkqhCFA1HShiJbSARCUYvMHBzApIEYD
+ q2Pe+5+kgLr4cs59796Tu3iPiCiAiIKIaINgIxFtEmwmoi1EtFWwjYiCBewugKqMTquq1Q2VeUTggsrs
+ hsrkgtLsgpKp0YUqkxNVRicqjQ5UGhwo0b4a4KFlOgeci8twfpdxCIYZCzJ2P4YWlmGbX0Jxow1EtIMK
+ 622wzy+hbWpBxiPwr9ecW7/+RJ5mgAWE0aVHLzE4+wvNY3MCH1fdqH/tE7UPzaNz6JUWcfG+lQXspOS7
+ z/BC+gHN8Cwy6uyIutbOdbUfWvEa+yxM7+aQpOxhAbsoSdmH9jEf7jyfRmxxF6a/zODIzd5/elW/BPXA
+ DE6VdrKA3XS6vBt6xzfc6PTi7ONBHC7rwXmNDSnqN9ynMl8j+xT1W5R0fsQ962ecKHrKAvbQyeIO1L6e
+ QYHFg/IuL6r7JK6MW/0Syru9nOp+CWXdXt5X3Svh2FUzC4ig4/kWPLB+Qq7hvYxpYsVfXtEJ7v/UpR1T
+ SMgxsIC9lJhrwu0+CUUWD4paPbhumURhq4c3ZjePcxRNsubqJ1BgnkS+6QNis3TyBjEZ9db4bD3is1oQ
+ x1C0IEahQ2KeHgrtONK1Y0jXjiCzYRQJeQZEX2jiHDzzcJCIQkm89RBRhBFROFst5ECa+mh+G9Jq3Uit
+ dSM2qxHbI1PqiGgfX13uD6KKiop1iA8WGnHoiiYupwXRmQ0I3p/8hD8cosBVvWuH14SEh0YpaoIjz6n/
+ NvzfABES6PeV1w0zfgMuUjOvNOhPhQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="resource.Image1" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACR0RVh0VGl0
+ bGUAQ29tbWVudDtUb29sdGlwO0hpbnQ7VGlwO0Nsb3Vk08HbyQAAAnlJREFUOE99k0lMk1EUhW8AZ0TA
+ AZduJS5wg2EwBDUudKMbFgoKiBQMIsogQUCgxWGliQNNI1CG0gkqhCFA1HShiJbSARCUYvMHBzApIEYD
+ q2Pe+5+kgLr4cs59796Tu3iPiCiAiIKIaINgIxFtEmwmoi1EtFWwjYiCBewugKqMTquq1Q2VeUTggsrs
+ hsrkgtLsgpKp0YUqkxNVRicqjQ5UGhwo0b4a4KFlOgeci8twfpdxCIYZCzJ2P4YWlmGbX0Jxow1EtIMK
+ 622wzy+hbWpBxiPwr9ecW7/+RJ5mgAWE0aVHLzE4+wvNY3MCH1fdqH/tE7UPzaNz6JUWcfG+lQXspOS7
+ z/BC+gHN8Cwy6uyIutbOdbUfWvEa+yxM7+aQpOxhAbsoSdmH9jEf7jyfRmxxF6a/zODIzd5/elW/BPXA
+ DE6VdrKA3XS6vBt6xzfc6PTi7ONBHC7rwXmNDSnqN9ynMl8j+xT1W5R0fsQ962ecKHrKAvbQyeIO1L6e
+ QYHFg/IuL6r7JK6MW/0Syru9nOp+CWXdXt5X3Svh2FUzC4ig4/kWPLB+Qq7hvYxpYsVfXtEJ7v/UpR1T
+ SMgxsIC9lJhrwu0+CUUWD4paPbhumURhq4c3ZjePcxRNsubqJ1BgnkS+6QNis3TyBjEZ9db4bD3is1oQ
+ x1C0IEahQ2KeHgrtONK1Y0jXjiCzYRQJeQZEX2jiHDzzcJCIQkm89RBRhBFROFst5ECa+mh+G9Jq3Uit
+ dSM2qxHbI1PqiGgfX13uD6KKiop1iA8WGnHoiiYupwXRmQ0I3p/8hD8cosBVvWuH14SEh0YpaoIjz6n/
+ NvzfABES6PeV1w0zfgMuUjOvNOhPhQAAAABJRU5ErkJggg==
+</value>
+ </data>
<data name="barBtnExpandAll.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
@@ -156,62 +212,6 @@
MTJ6IE0yMiwyMGgxMHYtMkgyMlYyMHogTTIyLDI0aDEwdi0ySDIyVjI0eiIgY2xhc3M9IkJsYWNrIiAv
Pg0KICA8L2c+DQogIDxwYXRoIGQ9Ik0xOCwyaDE0djJIMThWMnogTTE4LDE2aDE0di0ySDE4VjE2eiBN
MTgsMjhoMTR2LTJIMThWMjh6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
-</value>
- </data>
- <data name="barBtnHelp.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
- LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
- dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAABsDAAAC77u/
- PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
- IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
- MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
- Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
- MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ
- LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD
- MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
- Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw
- MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu
- bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQWJvdXQiPg0KICAgIDxwYXRoIGQ9
- Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs
- MnogTTE2LDZjMS4xLDAsMiwwLjksMiwycy0wLjksMi0yLDJzLTItMC45LTItMiAgIFMxNC45LDYsMTYs
- NnogTTIwLDI0aC04di0yaDJ2LThoLTJ2LTJoMmg0djEwaDJWMjR6IiBjbGFzcz0iQmx1ZSIgLz4NCiAg
- PC9nPg0KPC9zdmc+Cw==
-</value>
- </data>
- <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
- <data name="resource.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACR0RVh0VGl0
- bGUAQ29tbWVudDtUb29sdGlwO0hpbnQ7VGlwO0Nsb3Vk08HbyQAAAm9JREFUOE91k0lMU1EUhm8QJ6xY
- QIWlW4kL3GAoGIIaF7rRDQsFBUUKBLFaQIK0FlocVpo40DQyU1rKIIQhYNR0oVgtpWUSlCJpcGhNQMRo
- dPV77nsPUkBv8uX/z7nn/vct3mW0QohQYqPEJmKzxBZiKxEmsY2QSfC9EFbR4rEb2kZhaB2TGCGoto1A
- T17PtWUEFTYPaBblLW6UW90orXs5SAFhTGN2w7P0B57vIm6JYc6iiCuIIcL57TdKGpyggB2sqNYJFzXa
- ZxZFvBLB9Zq+/ctPqEyDPCCC5T14AUfgF5omFiTmBTWPB9fzUk2etN+3hAt37TwgiqXdfornvh8wDQeQ
- VeNC3JVOQVf7oRVvcgVge7uAVH0fD9jJUvUD6KTkW8/moCjpwdxnPw5d7/+vNzzxwTjox4mybh6wi53U
- 9sLi/opr3bM4/dCBg5o+nDU5kW58LfgM7qtEn258g9LuD7hj/4RjxY95wG52vKQL1a/8KOzwQtszi8oB
- n6CcG3Sbtpc8UUleQ8rnKvt9OHK5lQdEs6PqDtyzf0SB9Z2IbWrFX1zRKcEv12VdM0jOt/KAGJZSYMNN
- urWYkovbvLjaMY0iUj6Y2zQpoGwUtcAyhcLWaaht76HIMYtfkJBVa0/KtSAppxmJHGUzEpRmpKgsUNZN
- 4lzdBDGG7PpxJKusiD/fKLD/1H0HBcgJ4V8Pl4oIIpKICd+XaTysbkdm9SgyCEVOA7bHptfQ3h6+T/D5
- UKbT6dZBiz8wefSBS6bE/GbEZ9dDtjftEfWiiA2rZoOLYKSQSHmcskoWe8b4r8PC3NpGMPwAsfyU1x3W
- 6XTsLy5SM69xQkG9AAAAAElFTkSuQmCC
-</value>
- </data>
- <data name="resource.Image1" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACR0RVh0VGl0
- bGUAQ29tbWVudDtUb29sdGlwO0hpbnQ7VGlwO0Nsb3Vk08HbyQAAAm9JREFUOE91k0lMU1EUhm8QJ6xY
- QIWlW4kL3GAoGIIaF7rRDQsFBUUKBLFaQIK0FlocVpo40DQyU1rKIIQhYNR0oVgtpWUSlCJpcGhNQMRo
- dPV77nsPUkBv8uX/z7nn/vct3mW0QohQYqPEJmKzxBZiKxEmsY2QSfC9EFbR4rEb2kZhaB2TGCGoto1A
- T17PtWUEFTYPaBblLW6UW90orXs5SAFhTGN2w7P0B57vIm6JYc6iiCuIIcL57TdKGpyggB2sqNYJFzXa
- ZxZFvBLB9Zq+/ctPqEyDPCCC5T14AUfgF5omFiTmBTWPB9fzUk2etN+3hAt37TwgiqXdfornvh8wDQeQ
- VeNC3JVOQVf7oRVvcgVge7uAVH0fD9jJUvUD6KTkW8/moCjpwdxnPw5d7/+vNzzxwTjox4mybh6wi53U
- 9sLi/opr3bM4/dCBg5o+nDU5kW58LfgM7qtEn258g9LuD7hj/4RjxY95wG52vKQL1a/8KOzwQtszi8oB
- n6CcG3Sbtpc8UUleQ8rnKvt9OHK5lQdEs6PqDtyzf0SB9Z2IbWrFX1zRKcEv12VdM0jOt/KAGJZSYMNN
- urWYkovbvLjaMY0iUj6Y2zQpoGwUtcAyhcLWaaht76HIMYtfkJBVa0/KtSAppxmJHGUzEpRmpKgsUNZN
- 4lzdBDGG7PpxJKusiD/fKLD/1H0HBcgJ4V8Pl4oIIpKICd+XaTysbkdm9SgyCEVOA7bHptfQ3h6+T/D5
- UKbT6dZBiz8wefSBS6bE/GbEZ9dDtjftEfWiiA2rZoOLYKSQSHmcskoWe8b4r8PC3NpGMPwAsfyU1x3W
- 6XTsLy5SM69xQkG9AAAAAElFTkSuQmCC
</value>
</data>
<data name="barBtnDirect.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyViewModel.cs b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyViewModel.cs
similarity index 96%
rename from WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyViewModel.cs
rename to WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyViewModel.cs
index 402be53..f1bfbb4 100644
--- a/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomeXhsProjectPropertyViewModel.cs
+++ b/WinFrmUI/PBS.WinFrmUI/00-home/03-property/HomePbsProjectPropertyViewModel.cs
@@ -7,12 +7,12 @@
///
/// </summary>
[TypeConverter(typeof(PropertySorter))]
- public class HomeXhsProjectPropertyViewModel
+ public class HomePbsProjectPropertyViewModel
{
/// <summary>
///
/// </summary>
- public HomeXhsProjectPropertyViewModel()
+ public HomePbsProjectPropertyViewModel()
{ }
/// <summary>
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
index 793df83..c4c910f 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.Designer.cs
@@ -60,6 +60,8 @@
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ textEditMaxHeight = new DevExpress.XtraEditors.TextEdit();
+ layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)FacilitiesWizardFormlayoutControl1ConvertedLayout).BeginInit();
FacilitiesWizardFormlayoutControl1ConvertedLayout.SuspendLayout();
((System.ComponentModel.ISupportInitialize)txtEditPlace.Properties).BeginInit();
@@ -91,6 +93,8 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem9).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
SuspendLayout();
//
// FacilitiesWizardFormlayoutControl1ConvertedLayout
@@ -108,6 +112,7 @@
FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditWaterModel);
FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(imageComboBoxConnectionType);
FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditConnectionAddress);
+ FacilitiesWizardFormlayoutControl1ConvertedLayout.Controls.Add(textEditMaxHeight);
FacilitiesWizardFormlayoutControl1ConvertedLayout.Dock = DockStyle.Fill;
FacilitiesWizardFormlayoutControl1ConvertedLayout.Location = new Point(0, 0);
FacilitiesWizardFormlayoutControl1ConvertedLayout.Margin = new Padding(3, 4, 3, 4);
@@ -280,7 +285,7 @@
layoutControlGroup1.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
layoutControlGroup1.GroupBordersVisible = false;
- layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem, layoutControlItem4, layoutControlItem9 });
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { txtFlooritem, comboBoxCompletePlantitem, txtNameitem, comboBoxWaterSupplyitem, txtWaterHeightitem, txtFloorHeightitem, layoutControlItem6, layoutControlItem5, layoutControlItem7, layoutControlItem2, txtWaterPressureitem, layoutControlItem4, layoutControlItem9, layoutControlItem10 });
layoutControlGroup1.Name = "Root";
layoutControlGroup1.Size = new Size(889, 396);
layoutControlGroup1.TextVisible = false;
@@ -408,7 +413,7 @@
layoutControlItem4.Control = imageComboBoxConnectionType;
layoutControlItem4.Location = new Point(434, 200);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(435, 176);
+ layoutControlItem4.Size = new Size(435, 40);
layoutControlItem4.Text = "杩炴帴绫诲瀷:";
layoutControlItem4.TextSize = new Size(134, 18);
//
@@ -424,6 +429,24 @@
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
+ //
+ // textEditMaxHeight
+ //
+ textEditMaxHeight.Location = new Point(592, 252);
+ textEditMaxHeight.MinimumSize = new Size(0, 36);
+ textEditMaxHeight.Name = "textEditMaxHeight";
+ textEditMaxHeight.Size = new Size(285, 36);
+ textEditMaxHeight.StyleController = FacilitiesWizardFormlayoutControl1ConvertedLayout;
+ textEditMaxHeight.TabIndex = 14;
+ //
+ // layoutControlItem10
+ //
+ layoutControlItem10.Control = textEditMaxHeight;
+ layoutControlItem10.Location = new Point(434, 240);
+ layoutControlItem10.Name = "layoutControlItem10";
+ layoutControlItem10.Size = new Size(435, 136);
+ layoutControlItem10.Text = "鏈�楂樻ゼ灞傛爣楂�:";
+ layoutControlItem10.TextSize = new Size(134, 18);
//
// FacilitiesCtrl
//
@@ -464,6 +487,8 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem9).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditMaxHeight.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
ResumeLayout(false);
}
@@ -505,5 +530,7 @@
private DevExpress.XtraEditors.TextEdit textEditConnectionAddress;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraEditors.TextEdit textEditMaxHeight;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
}
}
diff --git a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
index 31af414..c00db68 100644
--- a/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
+++ b/WinFrmUI/PBS.WinFrmUI/02-facility/00-core/FacilitiesCtrl.cs
@@ -100,6 +100,7 @@
this.comboBoxPackages.EditValue = model.PackageID;
this.imageComboBoxConnectionType.EditValue = model.ConnectionType;
this.textEditConnectionAddress.EditValue = model.ConnectionAddress;
+ this.textEditMaxHeight.EditValue = model.MaxHeight;
}
//鑾峰彇鏂囨湰淇℃伅
@@ -136,6 +137,11 @@
_facilityVmo.ConnectionType = (PBS.eConnectionType)this.imageComboBoxConnectionType.EditValue;
}
_facilityVmo.ConnectionAddress = this.textEditConnectionAddress.Text;
+ if (this.textEditMaxHeight.EditValue != null)
+ {
+ double.TryParse(this.textEditMaxHeight.Text, out double maxHeight);
+ _facilityVmo.MaxHeight = maxHeight;
+ }
return _facilityVmo;
}
}
diff --git a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs
index 37ad019..2f745ba 100644
--- a/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs
+++ b/WinFrmUI/PBS.WinFrmUI/03-elecPrice/EditElectricDlg.cs
@@ -83,7 +83,7 @@
return;
}
XtraMessageBox.Show("缂栬緫鎴愬姛");
- this.DialogResult = System.Windows.Forms.DialogResult.OK;
+ this.DialogResult = System.Windows.Forms.DialogResult.OK;
this.Close();
}
diff --git a/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user b/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user
index dc401ca..6b98a4e 100644
--- a/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user
+++ b/WinFrmUI/PBS.WinFrmUI/PBS.WinFrmUI.csproj.user
@@ -8,7 +8,7 @@
<Compile Update="00-home\02-map\MapViewProjectListContainer.cs">
<SubType>UserControl</SubType>
</Compile>
- <Compile Update="00-home\03-property\HomeXhsProjectPropertyCtrl.cs">
+ <Compile Update="00-home\03-property\HomePbsProjectPropertyCtrl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Update="01-place\00-core\BuildWizardForm.cs">
--
Gitblit v1.9.3