From b266e82b9a377fa35a766f7a3a2f5aa95f3c9125 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 17:57:03 +0800
Subject: [PATCH] 修改首页场所列表

---
 WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs |  390 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 287 insertions(+), 103 deletions(-)

diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
index 93ae21b..591c5c8 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
@@ -31,6 +31,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnergyAnalysis));
             XYDiagram xyDiagram1 = new XYDiagram();
             LayoutDefinition layoutDefinition1 = new LayoutDefinition();
@@ -63,6 +64,7 @@
             ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
             barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
             barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
+            BtnRefresh = new DevExpress.XtraBars.BarButtonItem();
             ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
             ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             chartControl1 = new ChartControl();
@@ -75,10 +77,12 @@
             textEdit3 = new DevExpress.XtraEditors.TextEdit();
             textEdit2 = new DevExpress.XtraEditors.TextEdit();
             textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            textEdit6 = new DevExpress.XtraEditors.TextEdit();
-            textEdit7 = new DevExpress.XtraEditors.TextEdit();
-            textEdit8 = new DevExpress.XtraEditors.TextEdit();
-            textEdit9 = new DevExpress.XtraEditors.TextEdit();
+            textEditEffBefore = new DevExpress.XtraEditors.TextEdit();
+            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();
@@ -90,21 +94,33 @@
             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();
-            BtnRefresh = new DevExpress.XtraBars.BarButtonItem();
+            bindingSource1 = new BindingSource(components);
             ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)chartControl1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)xyDiagram1).BeginInit();
@@ -147,10 +163,12 @@
             ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).BeginInit();
             ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit6.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit7.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit8.Properties).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit9.Properties).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)textEditEffBefore.Properties).BeginInit();
+            ((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
@@ -213,6 +235,14 @@
             barButtonItem2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem2.ImageOptions.SvgImage");
             barButtonItem2.Name = "barButtonItem2";
             barButtonItem2.ItemClick += barButtonItem2_ItemClick;
+            // 
+            // BtnRefresh
+            // 
+            BtnRefresh.Caption = "鍒锋柊";
+            BtnRefresh.Id = 43;
+            BtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnRefresh.ImageOptions.SvgImage");
+            BtnRefresh.Name = "BtnRefresh";
+            BtnRefresh.ItemClick += BtnRefresh_ItemClick;
             // 
             // ribbonPage1
             // 
@@ -301,32 +331,32 @@
             splineSeriesView2.AxisYName = "AxisYEff";
             splineSeriesView2.Color = Color.FromArgb(155, 187, 89);
             series2.View = splineSeriesView2;
-            series3.Name = "Series 1";
+            series3.Name = "鏀归�犲墠(搴�)";
             series3.SeriesID = 2;
             splineSeriesView3.AxisYName = "Secondary AxisY 1";
             splineSeriesView3.PaneName = "Pane 2";
             series3.View = splineSeriesView3;
-            series4.Name = "Series 2";
+            series4.Name = "鏀归�犲悗(搴�)";
             series4.SeriesID = 3;
             splineSeriesView4.AxisYName = "Secondary AxisY 1";
             splineSeriesView4.PaneName = "Pane 2";
             series4.View = splineSeriesView4;
-            series5.Name = "Series 3";
+            series5.Name = "鑺傜渷鍊�(搴�)";
             series5.SeriesID = 4;
             splineSeriesView5.AxisYName = "Secondary AxisY 1";
             splineSeriesView5.PaneName = "Pane 2";
             series5.View = splineSeriesView5;
-            series6.Name = "Series 4";
+            series6.Name = "鏀归�犲墠(鍏�)";
             series6.SeriesID = 5;
             splineSeriesView6.AxisYName = "Secondary AxisY 2";
             splineSeriesView6.PaneName = "Pane 1";
             series6.View = splineSeriesView6;
-            series7.Name = "Series 5";
+            series7.Name = "鏀归�犲悗(鍏�)";
             series7.SeriesID = 6;
             splineSeriesView7.AxisYName = "Secondary AxisY 2";
             splineSeriesView7.PaneName = "Pane 1";
             series7.View = splineSeriesView7;
-            series8.Name = "Series 6";
+            series8.Name = "鑺傜渷鍊�(鍏�)";
             series8.SeriesID = 7;
             splineSeriesView8.AxisYName = "Secondary AxisY 2";
             splineSeriesView8.PaneName = "Pane 1";
@@ -347,7 +377,7 @@
     series8,
     series9
     };
-            chartControl1.Size = new Size(884, 697);
+            chartControl1.Size = new Size(832, 697);
             chartControl1.TabIndex = 0;
             // 
             // xtraTabControl1
@@ -387,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
@@ -397,16 +427,18 @@
             dataLayoutControl1.Controls.Add(textEdit3);
             dataLayoutControl1.Controls.Add(textEdit2);
             dataLayoutControl1.Controls.Add(textEdit1);
-            dataLayoutControl1.Controls.Add(textEdit6);
-            dataLayoutControl1.Controls.Add(textEdit7);
-            dataLayoutControl1.Controls.Add(textEdit8);
-            dataLayoutControl1.Controls.Add(textEdit9);
+            dataLayoutControl1.Controls.Add(textEditEffBefore);
+            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";
             // 
@@ -416,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;
             // 
@@ -426,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;
             // 
@@ -436,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;
             // 
@@ -446,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;
             // 
@@ -456,53 +488,71 @@
             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;
             // 
-            // textEdit6
+            // textEditEffBefore
             // 
-            textEdit6.Location = new Point(79, 240);
-            textEdit6.MenuManager = ribbonControl1;
-            textEdit6.Name = "textEdit6";
-            textEdit6.Size = new Size(154, 24);
-            textEdit6.StyleController = dataLayoutControl1;
-            textEdit6.TabIndex = 6;
+            textEditEffBefore.Location = new Point(79, 240);
+            textEditEffBefore.MenuManager = ribbonControl1;
+            textEditEffBefore.Name = "textEditEffBefore";
+            textEditEffBefore.Size = new Size(62, 24);
+            textEditEffBefore.StyleController = dataLayoutControl1;
+            textEditEffBefore.TabIndex = 6;
             // 
-            // textEdit7
+            // textEditPriceBefore
             // 
-            textEdit7.Location = new Point(79, 268);
-            textEdit7.MenuManager = ribbonControl1;
-            textEdit7.Name = "textEdit7";
-            textEdit7.Size = new Size(154, 24);
-            textEdit7.StyleController = dataLayoutControl1;
-            textEdit7.TabIndex = 7;
+            textEditPriceBefore.Location = new Point(79, 268);
+            textEditPriceBefore.MenuManager = ribbonControl1;
+            textEditPriceBefore.Name = "textEditPriceBefore";
+            textEditPriceBefore.Size = new Size(62, 24);
+            textEditPriceBefore.StyleController = dataLayoutControl1;
+            textEditPriceBefore.TabIndex = 7;
             // 
-            // textEdit8
+            // textEditEffAfter
             // 
-            textEdit8.Location = new Point(79, 362);
-            textEdit8.MenuManager = ribbonControl1;
-            textEdit8.Name = "textEdit8";
-            textEdit8.Size = new Size(154, 24);
-            textEdit8.StyleController = dataLayoutControl1;
-            textEdit8.TabIndex = 8;
+            textEditEffAfter.Location = new Point(224, 240);
+            textEditEffAfter.MenuManager = ribbonControl1;
+            textEditEffAfter.Name = "textEditEffAfter";
+            textEditEffAfter.Size = new Size(62, 24);
+            textEditEffAfter.StyleController = dataLayoutControl1;
+            textEditEffAfter.TabIndex = 8;
             // 
-            // textEdit9
+            // textEditPriceAfter
             // 
-            textEdit9.Location = new Point(79, 390);
-            textEdit9.MenuManager = ribbonControl1;
-            textEdit9.Name = "textEdit9";
-            textEdit9.Size = new Size(154, 24);
-            textEdit9.StyleController = dataLayoutControl1;
-            textEdit9.TabIndex = 9;
+            textEditPriceAfter.Location = new Point(224, 268);
+            textEditPriceAfter.MenuManager = ribbonControl1;
+            textEditPriceAfter.Name = "textEditPriceAfter";
+            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
@@ -510,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
@@ -518,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);
             // 
@@ -527,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);
             // 
@@ -536,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);
             // 
@@ -545,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);
             // 
@@ -554,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);
             // 
@@ -565,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
@@ -573,17 +623,17 @@
             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
             // 
             layoutControlItem8.AppearanceItemCaption.Options.UseTextOptions = true;
             layoutControlItem8.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
-            layoutControlItem8.Control = textEdit6;
+            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);
@@ -591,21 +641,29 @@
             // 
             // layoutControlItem9
             // 
-            layoutControlItem9.Control = textEdit7;
+            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
@@ -613,15 +671,15 @@
             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
             // 
-            layoutControlItem12.Control = textEdit8;
+            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);
@@ -629,22 +687,44 @@
             // 
             // layoutControlItem13
             // 
-            layoutControlItem13.Control = textEdit9;
+            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
             // 
@@ -669,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";
@@ -677,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
             // 
@@ -718,7 +889,7 @@
             // 
             layoutControlItem10.AppearanceItemCaption.Options.UseTextOptions = true;
             layoutControlItem10.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
-            layoutControlItem10.Control = textEdit6;
+            layoutControlItem10.Control = textEditEffBefore;
             layoutControlItem10.Location = new Point(0, 0);
             layoutControlItem10.Name = "layoutControlItem8";
             layoutControlItem10.Size = new Size(213, 28);
@@ -729,7 +900,7 @@
             // 
             // layoutControlItem11
             // 
-            layoutControlItem11.Control = textEdit7;
+            layoutControlItem11.Control = textEditPriceBefore;
             layoutControlItem11.Location = new Point(0, 28);
             layoutControlItem11.Name = "layoutControlItem9";
             layoutControlItem11.Size = new Size(213, 28);
@@ -737,14 +908,6 @@
             layoutControlItem11.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
             layoutControlItem11.TextSize = new Size(50, 20);
             layoutControlItem11.TextToControlDistance = 5;
-            // 
-            // BtnRefresh
-            // 
-            BtnRefresh.Caption = "鍒锋柊";
-            BtnRefresh.Id = 43;
-            BtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnRefresh.ImageOptions.SvgImage");
-            BtnRefresh.Name = "BtnRefresh";
-            BtnRefresh.ItemClick += BtnRefresh_ItemClick;
             // 
             // EnergyAnalysis
             // 
@@ -799,10 +962,12 @@
             ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).EndInit();
             ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit6.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit7.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit8.Properties).EndInit();
-            ((System.ComponentModel.ISupportInitialize)textEdit9.Properties).EndInit();
+            ((System.ComponentModel.ISupportInitialize)textEditEffBefore.Properties).EndInit();
+            ((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();
         }
@@ -858,10 +1027,10 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraEditors.TextEdit textEdit4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraEditors.TextEdit textEdit6;
-        private DevExpress.XtraEditors.TextEdit textEdit7;
-        private DevExpress.XtraEditors.TextEdit textEdit8;
-        private DevExpress.XtraEditors.TextEdit textEdit9;
+        private DevExpress.XtraEditors.TextEdit textEditEffBefore;
+        private DevExpress.XtraEditors.TextEdit textEditPriceBefore;
+        private DevExpress.XtraEditors.TextEdit textEditEffAfter;
+        private DevExpress.XtraEditors.TextEdit textEditPriceAfter;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
         private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
@@ -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

--
Gitblit v1.9.3