From f7d479db638f3d9e3aeb05ec82dc2818f14bf903 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 24 三月 2025 17:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs |  486 +++++++++++++++++++++++++++---------------------------
 1 files changed, 243 insertions(+), 243 deletions(-)

diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
index 93ae21b..a9ad8ec 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
@@ -32,37 +32,38 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnergyAnalysis));
-            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();
+            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();
             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 +76,10 @@
             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();
             Root = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -104,33 +105,32 @@
             emptySpaceItem3 = new DevExpress.XtraLayout.EmptySpaceItem();
             layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            BtnRefresh = new DevExpress.XtraBars.BarButtonItem();
             ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)chartControl1).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)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)xtraTabControl1).BeginInit();
             xtraTabControl1.SuspendLayout();
             xtraTabPage1.SuspendLayout();
@@ -147,10 +147,10 @@
             ((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)Root).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
@@ -214,6 +214,14 @@
             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
             // 
             ribbonPage1.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] { ribbonPageGroup1 });
@@ -230,58 +238,58 @@
             // chartControl1
             // 
             chartControl1.BorderOptions.Visibility = DevExpress.Utils.DefaultBoolean.False;
-            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;
+            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;
             chartControl1.Dock = DockStyle.Fill;
             chartControl1.Legend.AlignmentHorizontal = LegendAlignmentHorizontal.Right;
             chartControl1.Legend.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
@@ -292,60 +300,60 @@
             chartControl1.Location = new Point(0, 0);
             chartControl1.Margin = new Padding(2, 3, 2, 3);
             chartControl1.Name = "chartControl1";
-            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 = "Series 1";
-            series3.SeriesID = 2;
-            splineSeriesView3.AxisYName = "Secondary AxisY 1";
-            splineSeriesView3.PaneName = "Pane 2";
-            series3.View = splineSeriesView3;
-            series4.Name = "Series 2";
-            series4.SeriesID = 3;
-            splineSeriesView4.AxisYName = "Secondary AxisY 1";
-            splineSeriesView4.PaneName = "Pane 2";
-            series4.View = splineSeriesView4;
-            series5.Name = "Series 3";
-            series5.SeriesID = 4;
-            splineSeriesView5.AxisYName = "Secondary AxisY 1";
-            splineSeriesView5.PaneName = "Pane 2";
-            series5.View = splineSeriesView5;
-            series6.Name = "Series 4";
-            series6.SeriesID = 5;
-            splineSeriesView6.AxisYName = "Secondary AxisY 2";
-            splineSeriesView6.PaneName = "Pane 1";
-            series6.View = splineSeriesView6;
-            series7.Name = "Series 5";
-            series7.SeriesID = 6;
-            splineSeriesView7.AxisYName = "Secondary AxisY 2";
-            splineSeriesView7.PaneName = "Pane 1";
-            series7.View = splineSeriesView7;
-            series8.Name = "Series 6";
-            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;
+            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;
             chartControl1.SeriesSerializable = new Series[]
     {
-    series1,
-    series2,
-    series3,
-    series4,
-    series5,
-    series6,
-    series7,
-    series8,
-    series9
+    series10,
+    series11,
+    series12,
+    series13,
+    series14,
+    series15,
+    series16,
+    series17,
+    series18
     };
             chartControl1.Size = new Size(884, 697);
             chartControl1.TabIndex = 0;
@@ -397,10 +405,10 @@
             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.Dock = DockStyle.Fill;
             dataLayoutControl1.Location = new Point(0, 0);
             dataLayoutControl1.Margin = new Padding(3, 4, 3, 4);
@@ -460,41 +468,41 @@
             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(154, 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(154, 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(79, 362);
+            textEditEffAfter.MenuManager = ribbonControl1;
+            textEditEffAfter.Name = "textEditEffAfter";
+            textEditEffAfter.Size = new Size(154, 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(79, 390);
+            textEditPriceAfter.MenuManager = ribbonControl1;
+            textEditPriceAfter.Name = "textEditPriceAfter";
+            textEditPriceAfter.Size = new Size(154, 24);
+            textEditPriceAfter.StyleController = dataLayoutControl1;
+            textEditPriceAfter.TabIndex = 9;
             // 
             // Root
             // 
@@ -580,7 +588,7 @@
             // 
             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);
@@ -591,7 +599,7 @@
             // 
             // layoutControlItem9
             // 
-            layoutControlItem9.Control = textEdit7;
+            layoutControlItem9.Control = textEditPriceBefore;
             layoutControlItem9.Location = new Point(0, 28);
             layoutControlItem9.Name = "layoutControlItem9";
             layoutControlItem9.Size = new Size(213, 28);
@@ -618,7 +626,7 @@
             // 
             // layoutControlItem12
             // 
-            layoutControlItem12.Control = textEdit8;
+            layoutControlItem12.Control = textEditEffAfter;
             layoutControlItem12.Location = new Point(0, 0);
             layoutControlItem12.Name = "layoutControlItem12";
             layoutControlItem12.Size = new Size(213, 28);
@@ -629,7 +637,7 @@
             // 
             // layoutControlItem13
             // 
-            layoutControlItem13.Control = textEdit9;
+            layoutControlItem13.Control = textEditPriceAfter;
             layoutControlItem13.Location = new Point(0, 28);
             layoutControlItem13.Name = "layoutControlItem13";
             layoutControlItem13.Size = new Size(213, 28);
@@ -718,7 +726,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 +737,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 +745,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
             // 
@@ -758,30 +758,30 @@
             Name = "EnergyAnalysis";
             Size = new Size(1146, 886);
             ((System.ComponentModel.ISupportInitialize)ribbonControl1).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)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)chartControl1).EndInit();
             ((System.ComponentModel.ISupportInitialize)xtraTabControl1).EndInit();
             xtraTabControl1.ResumeLayout(false);
@@ -799,10 +799,10 @@
             ((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)Root).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
             ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
@@ -858,10 +858,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;

--
Gitblit v1.9.3