duheng
2025-03-21 480d3257317d6f48ab2d910cb4d731b69fa53b40
能耗分析界面修改
已修改7个文件
782 ■■■■ 文件已修改
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs 567 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs 166 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.resx 21 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
@@ -36,11 +36,30 @@
            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();
@@ -51,29 +70,67 @@
            xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            textEdit4 = new DevExpress.XtraEditors.TextEdit();
            textEdit5 = new DevExpress.XtraEditors.TextEdit();
            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();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            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();
            xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            textEdit4 = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            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();
            ((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)xtraTabControl1).BeginInit();
            xtraTabControl1.SuspendLayout();
            xtraTabPage1.SuspendLayout();
@@ -85,37 +142,59 @@
            splitContainerControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)dataLayoutControl1).BeginInit();
            dataLayoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).BeginInit();
            ((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)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).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();
            xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
            SuspendLayout();
            // 
            // ribbonControl1
            // 
            ribbonControl1.AllowMinimizeRibbon = false;
            ribbonControl1.EmptyAreaImageOptions.ImagePadding = new Padding(34, 39, 34, 39);
            ribbonControl1.ExpandCollapseItem.Id = 0;
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barButtonItem1, barButtonItem2 });
            ribbonControl1.Items.AddRange(new DevExpress.XtraBars.BarItem[] { ribbonControl1.ExpandCollapseItem, barButtonItem1, barButtonItem2, BtnRefresh });
            ribbonControl1.Location = new Point(0, 0);
            ribbonControl1.MaxItemId = 3;
            ribbonControl1.Margin = new Padding(3, 4, 3, 4);
            ribbonControl1.MaxItemId = 44;
            ribbonControl1.Name = "ribbonControl1";
            ribbonControl1.OptionsMenuMinWidth = 377;
            ribbonControl1.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] { ribbonPage1 });
            ribbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowExpandCollapseButton = DevExpress.Utils.DefaultBoolean.False;
            ribbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.ShowOnMultiplePages;
            ribbonControl1.ShowToolbarCustomizeItem = false;
            ribbonControl1.Size = new Size(1003, 128);
            ribbonControl1.Size = new Size(1146, 157);
            ribbonControl1.Toolbar.ShowCustomizeItem = false;
            ribbonControl1.ToolbarLocation = DevExpress.XtraBars.Ribbon.RibbonQuickAccessToolbarLocation.Hidden;
            // 
@@ -144,6 +223,7 @@
            // 
            ribbonPageGroup1.ItemLinks.Add(barButtonItem1);
            ribbonPageGroup1.ItemLinks.Add(barButtonItem2);
            ribbonPageGroup1.ItemLinks.Add(BtnRefresh);
            ribbonPageGroup1.Name = "ribbonPageGroup1";
            ribbonPageGroup1.Text = "基础功能";
            // 
@@ -154,7 +234,7 @@
            xyDiagram1.AxisX.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.True;
            xyDiagram1.AxisX.Title.Text = "时间";
            xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            xyDiagram1.AxisX.VisibleInPanesSerializable = "-1";
            xyDiagram1.AxisX.VisibleInPanesSerializable = "-1;0;1";
            xyDiagram1.AxisY.Color = Color.DodgerBlue;
            xyDiagram1.AxisY.Label.TextColor = Color.DodgerBlue;
            xyDiagram1.AxisY.Title.Alignment = StringAlignment.Far;
@@ -166,7 +246,18 @@
            xyDiagram1.DefaultPane.BorderVisible = false;
            xyDiagram1.DefaultPane.Title.Text = "无数据";
            xyDiagram1.PaneLayout.AutoLayoutMode = PaneAutoLayoutMode.Grid;
            xyDiagram1.PaneLayout.RowDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition1, layoutDefinition2, layoutDefinition3 });
            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;
@@ -178,7 +269,18 @@
            secondaryAxisy1.Title.TextColor = Color.Green;
            secondaryAxisy1.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            secondaryAxisy1.VisibleInPanesSerializable = "-1";
            xyDiagram1.SecondaryAxesY.AddRange(new SecondaryAxisY[] { secondaryAxisy1 });
            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;
@@ -188,40 +290,83 @@
            chartControl1.Legend.MarkerMode = LegendMarkerMode.CheckBoxAndMarker;
            chartControl1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.False;
            chartControl1.Location = new Point(0, 0);
            chartControl1.Margin = new Padding(2);
            chartControl1.Margin = new Padding(2, 3, 2, 3);
            chartControl1.Name = "chartControl1";
            series1.Name = "SeriesQH";
            series1.Name = "流量";
            series1.SeriesID = 0;
            splineSeriesView1.Color = Color.FromArgb(84, 141, 212);
            series1.View = splineSeriesView1;
            series2.Name = "SeriesQE";
            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;
            chartControl1.SeriesSerializable = new Series[]
    {
    series1,
    series2
    series2,
    series3,
    series4,
    series5,
    series6,
    series7,
    series8,
    series9
    };
            chartControl1.Size = new Size(774, 535);
            chartControl1.Size = new Size(884, 697);
            chartControl1.TabIndex = 0;
            // 
            // xtraTabControl1
            // 
            xtraTabControl1.Dock = DockStyle.Fill;
            xtraTabControl1.Location = new Point(0, 128);
            xtraTabControl1.Location = new Point(0, 157);
            xtraTabControl1.Margin = new Padding(3, 4, 3, 4);
            xtraTabControl1.Name = "xtraTabControl1";
            xtraTabControl1.SelectedTabPage = xtraTabPage1;
            xtraTabControl1.Size = new Size(1003, 561);
            xtraTabControl1.Size = new Size(1146, 729);
            xtraTabControl1.TabIndex = 2;
            xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { xtraTabPage1, xtraTabPage2 });
            // 
            // xtraTabPage1
            // 
            xtraTabPage1.Controls.Add(splitContainerControl1);
            xtraTabPage1.Margin = new Padding(3, 4, 3, 4);
            xtraTabPage1.Name = "xtraTabPage1";
            xtraTabPage1.Size = new Size(1001, 535);
            xtraTabPage1.Size = new Size(1144, 697);
            xtraTabPage1.Text = "图表";
            // 
            // splitContainerControl1
@@ -229,6 +374,7 @@
            splitContainerControl1.Dock = DockStyle.Fill;
            splitContainerControl1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            splitContainerControl1.Location = new Point(0, 0);
            splitContainerControl1.Margin = new Padding(3, 4, 3, 4);
            splitContainerControl1.Name = "splitContainerControl1";
            // 
            // splitContainerControl1.Panel1
@@ -240,8 +386,8 @@
            // 
            splitContainerControl1.Panel2.Controls.Add(dataLayoutControl1);
            splitContainerControl1.Panel2.Text = "Panel2";
            splitContainerControl1.Size = new Size(1001, 535);
            splitContainerControl1.SplitterPosition = 217;
            splitContainerControl1.Size = new Size(1144, 697);
            splitContainerControl1.SplitterPosition = 248;
            splitContainerControl1.TabIndex = 1;
            // 
            // dataLayoutControl1
@@ -251,165 +397,391 @@
            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.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(217, 535);
            dataLayoutControl1.Size = new Size(248, 697);
            dataLayoutControl1.TabIndex = 0;
            dataLayoutControl1.Text = "dataLayoutControl1";
            // 
            // textEdit4
            //
            textEdit4.Location = new Point(171, 134);
            textEdit4.Margin = new Padding(3, 4, 3, 4);
            textEdit4.MenuManager = ribbonControl1;
            textEdit4.Name = "textEdit4";
            textEdit4.Size = new Size(62, 24);
            textEdit4.StyleController = dataLayoutControl1;
            textEdit4.TabIndex = 4;
            //
            // textEdit5
            // 
            textEdit5.Location = new Point(132, 108);
            textEdit5.Location = new Point(171, 162);
            textEdit5.Margin = new Padding(3, 4, 3, 4);
            textEdit5.MenuManager = ribbonControl1;
            textEdit5.Name = "textEdit5";
            textEdit5.Size = new Size(73, 20);
            textEdit5.Size = new Size(62, 24);
            textEdit5.StyleController = dataLayoutControl1;
            textEdit5.TabIndex = 8;
            textEdit5.TabIndex = 5;
            // 
            // textEdit3
            // 
            textEdit3.Location = new Point(132, 60);
            textEdit3.Location = new Point(171, 106);
            textEdit3.Margin = new Padding(3, 4, 3, 4);
            textEdit3.MenuManager = ribbonControl1;
            textEdit3.Name = "textEdit3";
            textEdit3.Size = new Size(73, 20);
            textEdit3.Size = new Size(62, 24);
            textEdit3.StyleController = dataLayoutControl1;
            textEdit3.TabIndex = 6;
            textEdit3.TabIndex = 3;
            // 
            // textEdit2
            // 
            textEdit2.Location = new Point(132, 36);
            textEdit2.Location = new Point(171, 78);
            textEdit2.Margin = new Padding(3, 4, 3, 4);
            textEdit2.MenuManager = ribbonControl1;
            textEdit2.Name = "textEdit2";
            textEdit2.Size = new Size(73, 20);
            textEdit2.Size = new Size(62, 24);
            textEdit2.StyleController = dataLayoutControl1;
            textEdit2.TabIndex = 5;
            textEdit2.TabIndex = 2;
            // 
            // textEdit1
            // 
            textEdit1.Location = new Point(132, 12);
            textEdit1.Location = new Point(171, 50);
            textEdit1.Margin = new Padding(3, 4, 3, 4);
            textEdit1.MenuManager = ribbonControl1;
            textEdit1.Name = "textEdit1";
            textEdit1.Size = new Size(73, 20);
            textEdit1.Size = new Size(62, 24);
            textEdit1.StyleController = dataLayoutControl1;
            textEdit1.TabIndex = 4;
            textEdit1.TabIndex = 0;
            //
            // textEdit6
            //
            textEdit6.Location = new Point(79, 240);
            textEdit6.MenuManager = ribbonControl1;
            textEdit6.Name = "textEdit6";
            textEdit6.Size = new Size(154, 24);
            textEdit6.StyleController = dataLayoutControl1;
            textEdit6.TabIndex = 6;
            //
            // textEdit7
            //
            textEdit7.Location = new Point(79, 268);
            textEdit7.MenuManager = ribbonControl1;
            textEdit7.Name = "textEdit7";
            textEdit7.Size = new Size(154, 24);
            textEdit7.StyleController = dataLayoutControl1;
            textEdit7.TabIndex = 7;
            //
            // textEdit8
            //
            textEdit8.Location = new Point(79, 362);
            textEdit8.MenuManager = ribbonControl1;
            textEdit8.Name = "textEdit8";
            textEdit8.Size = new Size(154, 24);
            textEdit8.StyleController = dataLayoutControl1;
            textEdit8.TabIndex = 8;
            //
            // textEdit9
            //
            textEdit9.Location = new Point(79, 390);
            textEdit9.MenuManager = ribbonControl1;
            textEdit9.Name = "textEdit9";
            textEdit9.Size = new Size(154, 24);
            textEdit9.StyleController = dataLayoutControl1;
            textEdit9.TabIndex = 9;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlItem2, layoutControlItem3, layoutControlItem5, layoutControlItem4 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1, layoutControlGroup2, layoutControlGroup4, emptySpaceItem4 });
            Root.Name = "Root";
            Root.Size = new Size(217, 535);
            Root.Size = new Size(257, 676);
            Root.TextVisible = false;
            //
            // layoutControlGroup1
            //
            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.Text = "总计";
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = textEdit1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(197, 24);
            layoutControlItem1.Size = new Size(213, 28);
            layoutControlItem1.Text = "数据天数(天):";
            layoutControlItem1.TextSize = new Size(108, 14);
            //
            // emptySpaceItem1
            //
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 120);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(197, 395);
            emptySpaceItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextSize = new Size(135, 18);
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = textEdit2;
            layoutControlItem2.Location = new Point(0, 24);
            layoutControlItem2.Location = new Point(0, 28);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(197, 24);
            layoutControlItem2.Size = new Size(213, 28);
            layoutControlItem2.Text = "总用水量(m³):";
            layoutControlItem2.TextSize = new Size(108, 14);
            layoutControlItem2.TextSize = new Size(135, 18);
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = textEdit3;
            layoutControlItem3.Location = new Point(0, 48);
            layoutControlItem3.Location = new Point(0, 56);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(197, 24);
            layoutControlItem3.Size = new Size(213, 28);
            layoutControlItem3.Text = "总节电量(kW):";
            layoutControlItem3.TextSize = new Size(108, 14);
            layoutControlItem3.TextSize = new Size(135, 18);
            //
            // layoutControlItem4
            //
            layoutControlItem4.Control = textEdit4;
            layoutControlItem4.Location = new Point(0, 84);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(213, 28);
            layoutControlItem4.Text = "节能率(%)";
            layoutControlItem4.TextSize = new Size(135, 18);
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = textEdit5;
            layoutControlItem5.Location = new Point(0, 96);
            layoutControlItem5.Location = new Point(0, 112);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(197, 24);
            layoutControlItem5.Size = new Size(213, 28);
            layoutControlItem5.Text = "总节电费用(元):";
            layoutControlItem5.TextSize = new Size(108, 14);
            layoutControlItem5.TextSize = new Size(135, 18);
            //
            // layoutControlGroup2
            //
            layoutControlGroup2.AppearanceGroup.Options.UseTextOptions = true;
            layoutControlGroup2.AppearanceGroup.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
            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.Text = "改造前";
            //
            // emptySpaceItem1
            //
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 56);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(213, 16);
            emptySpaceItem1.TextSize = new Size(0, 0);
            //
            // layoutControlItem8
            //
            layoutControlItem8.AppearanceItemCaption.Options.UseTextOptions = true;
            layoutControlItem8.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
            layoutControlItem8.Control = textEdit6;
            layoutControlItem8.Location = new Point(0, 0);
            layoutControlItem8.Name = "layoutControlItem8";
            layoutControlItem8.Size = new Size(213, 28);
            layoutControlItem8.Text = "用电量:";
            layoutControlItem8.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem8.TextSize = new Size(50, 18);
            layoutControlItem8.TextToControlDistance = 5;
            //
            // layoutControlItem9
            //
            layoutControlItem9.Control = textEdit7;
            layoutControlItem9.Location = new Point(0, 28);
            layoutControlItem9.Name = "layoutControlItem9";
            layoutControlItem9.Size = new Size(213, 28);
            layoutControlItem9.Text = "电费:";
            layoutControlItem9.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem9.TextSize = new Size(50, 20);
            layoutControlItem9.TextToControlDistance = 5;
            //
            // layoutControlGroup4
            //
            layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem2, layoutControlItem12, layoutControlItem13 });
            layoutControlGroup4.Location = new Point(0, 312);
            layoutControlGroup4.Name = "layoutControlGroup4";
            layoutControlGroup4.Size = new Size(237, 135);
            layoutControlGroup4.Text = "改造后";
            //
            // emptySpaceItem2
            //
            emptySpaceItem2.AllowHotTrack = false;
            emptySpaceItem2.Location = new Point(0, 56);
            emptySpaceItem2.Name = "emptySpaceItem2";
            emptySpaceItem2.Size = new Size(213, 29);
            emptySpaceItem2.TextSize = new Size(0, 0);
            //
            // layoutControlItem12
            //
            layoutControlItem12.Control = textEdit8;
            layoutControlItem12.Location = new Point(0, 0);
            layoutControlItem12.Name = "layoutControlItem12";
            layoutControlItem12.Size = new Size(213, 28);
            layoutControlItem12.Text = "用电量:";
            layoutControlItem12.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem12.TextSize = new Size(50, 20);
            layoutControlItem12.TextToControlDistance = 5;
            //
            // layoutControlItem13
            //
            layoutControlItem13.Control = textEdit9;
            layoutControlItem13.Location = new Point(0, 28);
            layoutControlItem13.Name = "layoutControlItem13";
            layoutControlItem13.Size = new Size(213, 28);
            layoutControlItem13.Text = "电费:";
            layoutControlItem13.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.CustomSize;
            layoutControlItem13.TextSize = new Size(50, 20);
            layoutControlItem13.TextToControlDistance = 5;
            //
            // emptySpaceItem4
            //
            emptySpaceItem4.AllowHotTrack = false;
            emptySpaceItem4.Location = new Point(0, 447);
            emptySpaceItem4.Name = "emptySpaceItem4";
            emptySpaceItem4.Size = new Size(237, 209);
            emptySpaceItem4.TextSize = new Size(0, 0);
            // 
            // xtraTabPage2
            // 
            xtraTabPage2.Controls.Add(gridControl1);
            xtraTabPage2.Margin = new Padding(3, 4, 3, 4);
            xtraTabPage2.Name = "xtraTabPage2";
            xtraTabPage2.Size = new Size(1001, 535);
            xtraTabPage2.Size = new Size(1144, 697);
            xtraTabPage2.Text = "数据";
            // 
            // gridControl1
            // 
            gridControl1.Dock = DockStyle.Fill;
            gridControl1.EmbeddedNavigator.Margin = new Padding(3, 4, 3, 4);
            gridControl1.Location = new Point(0, 0);
            gridControl1.MainView = gridView1;
            gridControl1.Margin = new Padding(3, 4, 3, 4);
            gridControl1.MenuManager = ribbonControl1;
            gridControl1.Name = "gridControl1";
            gridControl1.Size = new Size(1001, 535);
            gridControl1.Size = new Size(1144, 697);
            gridControl1.TabIndex = 0;
            gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
            // 
            // gridView1
            // 
            gridView1.DetailHeight = 450;
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsBehavior.Editable = false;
            gridView1.OptionsDragDrop.AllowDataReordering = false;
            gridView1.OptionsDragDrop.AllowSortedDataDragDrop = false;
            gridView1.OptionsEditForm.PopupEditFormWidth = 914;
            gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // textEdit4
            // layoutControlItem6
            // 
            textEdit4.Location = new Point(132, 84);
            textEdit4.MenuManager = ribbonControl1;
            textEdit4.Name = "textEdit4";
            textEdit4.Size = new Size(73, 20);
            textEdit4.StyleController = dataLayoutControl1;
            textEdit4.TabIndex = 9;
            layoutControlItem6.Control = textEdit3;
            layoutControlItem6.Location = new Point(0, 56);
            layoutControlItem6.Name = "layoutControlItem3";
            layoutControlItem6.Size = new Size(213, 28);
            layoutControlItem6.Text = "总节电量(kW):";
            layoutControlItem6.TextSize = new Size(135, 18);
            // 
            // layoutControlItem4
            // layoutControlItem7
            // 
            layoutControlItem4.Control = textEdit4;
            layoutControlItem4.Location = new Point(0, 72);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(197, 24);
            layoutControlItem4.Text = "节能率(%)";
            layoutControlItem4.TextSize = new Size(108, 14);
            layoutControlItem7.Control = textEdit5;
            layoutControlItem7.Location = new Point(0, 112);
            layoutControlItem7.Name = "layoutControlItem5";
            layoutControlItem7.Size = new Size(213, 28);
            layoutControlItem7.Text = "总节电费用(元):";
            layoutControlItem7.TextSize = new Size(135, 18);
            //
            // layoutControlGroup3
            //
            layoutControlGroup3.AppearanceGroup.Options.UseTextOptions = true;
            layoutControlGroup3.AppearanceGroup.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
            layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { emptySpaceItem3, layoutControlItem10, layoutControlItem11 });
            layoutControlGroup3.Location = new Point(0, 190);
            layoutControlGroup3.Name = "layoutControlGroup2";
            layoutControlGroup3.Size = new Size(237, 129);
            layoutControlGroup3.Text = "改造前";
            //
            // emptySpaceItem3
            //
            emptySpaceItem3.AllowHotTrack = false;
            emptySpaceItem3.Location = new Point(0, 56);
            emptySpaceItem3.Name = "emptySpaceItem1";
            emptySpaceItem3.Size = new Size(213, 23);
            emptySpaceItem3.TextSize = new Size(0, 0);
            //
            // layoutControlItem10
            //
            layoutControlItem10.AppearanceItemCaption.Options.UseTextOptions = true;
            layoutControlItem10.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Near;
            layoutControlItem10.Control = textEdit6;
            layoutControlItem10.Location = new Point(0, 0);
            layoutControlItem10.Name = "layoutControlItem8";
            layoutControlItem10.Size = new Size(213, 28);
            layoutControlItem10.Text = "用电量:";
            layoutControlItem10.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
            layoutControlItem10.TextSize = new Size(50, 18);
            layoutControlItem10.TextToControlDistance = 5;
            //
            // layoutControlItem11
            //
            layoutControlItem11.Control = textEdit7;
            layoutControlItem11.Location = new Point(0, 28);
            layoutControlItem11.Name = "layoutControlItem9";
            layoutControlItem11.Size = new Size(213, 28);
            layoutControlItem11.Text = "电费:";
            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
            // 
            Appearance.BackColor = SystemColors.Control;
            Appearance.Options.UseBackColor = true;
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleDimensions = new SizeF(8F, 18F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(xtraTabControl1);
            Controls.Add(ribbonControl1);
            Margin = new Padding(3, 5, 3, 5);
            Name = "EnergyAnalysis";
            Size = new Size(1003, 689);
            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)chartControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)xtraTabControl1).EndInit();
            xtraTabControl1.ResumeLayout(false);
@@ -422,21 +794,40 @@
            splitContainerControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)dataLayoutControl1).EndInit();
            dataLayoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).EndInit();
            ((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)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup2).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem9).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();
            xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }
@@ -462,11 +853,31 @@
        private DevExpress.XtraEditors.TextEdit textEdit1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        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.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraBars.BarButtonItem BtnRefresh;
    }
}
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs
@@ -3,6 +3,7 @@
using DevExpress.XtraCharts;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
using Org.BouncyCastle.Tls.Crypto;
using System.Data;
using System.IO;
using Yw.WinFrmUI;
@@ -17,6 +18,10 @@
            InitialChart();
        }
        private List<FlowPressChartViewModel> _datalist;
        private DataTable _datatable;
        private void barButtonItem1_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            //导入文件
@@ -25,14 +30,17 @@
            dlg.CheckFileExists = true;
            if (dlg.ShowDialog() != System.Windows.Forms.DialogResult.OK)
                return;
            var datalist = new List<FlowPressChartViewModel>();
            var datatable = new DataTable();
            ParseExcel(dlg.FileName, out datalist, out datatable);
            if (datalist.Any())
            _datalist = new List<FlowPressChartViewModel>();
            _datatable = new DataTable();
            ParseExcel(dlg.FileName, out _datalist, out _datatable);
            if (_datalist.Any())
            {
                SetBindingData(datalist, datatable);
                SetBindingData(_datalist, _datatable);
            }
        }
        private double _totalPrice = 0;
        #region Private Variable
        private XYDiagram _diagram;
@@ -42,14 +50,23 @@
        private AxisY _axis_y_head;
        private SecondaryAxisY _axis_y_eff;
        #endregion Private Variable
        #endregion
        private class PowerData
        {
            public double Power;
            public DateTime Time;
        }
        private List<PowerData> _oldData;
        private List<PowerData> _newData;
        /// <summary>
        /// 初始化图表
        /// </summary>
        private void InitialChart()
        {
            this.chartControl1.RuntimeHitTesting = true;
            this.chartControl1.Legend.Visibility = DefaultBoolean.True;
@@ -68,13 +85,11 @@
            _axis_y_eff = _diagram.SecondaryAxesY.GetAxisByName("AxisYEff");
            _axis_y_eff.Alignment = AxisAlignment.Far;
            _axis_x_flow.GridLines.Visible = false;
            _axis_y_head.GridLines.Visible = false;
            _axis_y_eff.GridLines.Visible = false;
            this.chartControl1.CrosshairEnabled = DefaultBoolean.True;
        }
        /// <summary>
@@ -82,12 +97,11 @@
        /// </summary>
        public void SetBindingData(List<FlowPressChartViewModel> vm_list, DataTable dataTable)
        {
            var view = gridControl1.MainView as GridView;
            view.Columns.Clear();
            this.chartControl1.BeginInit();
            this.chartControl1.Series.Clear();
            //this.chartControl1.Series.Clear();
            for (int i = this.chartControl1.AnnotationRepository.Count - 1; i > 0; i--)
            {
                if (i == 0)
@@ -97,7 +111,6 @@
            this.chartControl1.Legend.CustomItems.Clear();
            if (IsInvalidData())
            {
                this.chartControl1.EndInit();
                return;
            }
@@ -126,7 +139,6 @@
                    axis_x = _axis_x_flow;
                    axis_y = _axis_y_eff;
                    pane = _default_pane;
                }
                var col = new GridColumn();
                col.FieldName = vm.Name;
@@ -139,9 +151,10 @@
            double totalEl = 0;
            double totalOldEl = 0;
            double totalFy = 0;
            var tempdatas = vm_list.FirstOrDefault(c => c.Name.Contains("压力"));
            var tempflow = vm_list.FirstOrDefault(c => c.Name.Contains("流量"));
            _oldData = new List<PowerData>();
            _newData = new List<PowerData>();
            foreach (var item in tempdatas.Datas)
            {
                var flow = tempflow.Datas.FirstOrDefault(c => c.Time == item.Time);
@@ -151,21 +164,29 @@
                    var newpressM = Yw.Pump.CalculationHelper.Mpa2M(item.Y);
                    var oldel = Yw.Pump.CalculationHelper.CalcuP(flow.Y, oldpressM, Efficiency);
                    var newel = Yw.Pump.CalculationHelper.CalcuP(flow.Y, newpressM, Efficiency);
                    _oldData.Add(new PowerData
                    {
                        Power = oldel / 60,
                        Time = DateTime.Parse(item.Time)
                    });
                    _newData.Add(new PowerData
                    {
                        Power = newel / 60,
                        Time = DateTime.Parse(item.Time)
                    });
                    var el = oldel - newel;
                    totalOldEl += oldel;
                    totalEl += el;
                    var Fy = ElecPriceHelper.CalcuShysElectricityFees(DateTime.Parse(item.Time), el);
                    totalFy += Fy;
                    //totalFy += Fy;
                }
                item.Y = Press;//Yw.Pump.CalculationHelper.CalcuP();
            }
            AddLineSeries("原泵后压力", axis_x, _axis_y_eff, _default_pane, tempdatas.Datas);
            var min_x = vm_list.SelectMany(x => x.Datas).Min(x => DateTime.Parse(x.Time));
            var max_x = vm_list.SelectMany(x => x.Datas).Max(x => DateTime.Parse(x.Time));
            _axis_x_flow.NumericScaleOptions.AutoGrid = false;
            _axis_x_flow.WholeRange.SideMarginsValue = 0;
@@ -178,20 +199,94 @@
            textEdit2.Text = Math.Round(totalFlow.Sum() / 60).ToString();
            textEdit3.Text = Math.Round(totalEl).ToString();
            textEdit4.Text = Math.Round(totalEl / totalOldEl * 100).ToString();
            textEdit5.Text = Math.Round(totalFy).ToString();
            gridControl1.DataSource = dataTable;
            this.chartControl1.EndInit();
            SetEffData();
            SetEffPriceData();
        }
        private void SetEffData()
        {
            var SeriseOld = this.chartControl1.GetSeriesByName("Series 1");
            SeriseOld.Points.Clear();
            if (_oldData != null)
            {
                foreach (var item in _oldData)
                {
                    SeriseOld.Points.Add(new SeriesPoint(item.Time, item.Power));
                }
            }
            var SeriseNew = this.chartControl1.GetSeriesByName("Series 2");
            SeriseNew.Points.Clear();
            if (_newData != null)
            {
                foreach (var item in _newData)
                {
                    SeriseNew.Points.Add(new SeriesPoint(item.Time, item.Power));
                }
            }
            var SeriesDef = this.chartControl1.GetSeriesByName("Series 3");
            SeriesDef.Points.Clear();
            if (_oldData != null && _newData != null)
            {
                for (int i = 0; i < _oldData.Count; i++)
                {
                    var def = _oldData[i].Power - _newData[i].Power;
                    SeriesDef.Points.Add(new SeriesPoint(_newData[i].Time, def));
                }
            }
        }
        private void SetEffPriceData()
        {
            _totalPrice = default;
            List<PowerData> oldPrice = null;
            List<PowerData> newPrice = null;
            var SeriseOld = this.chartControl1.GetSeriesByName("Series 4");
            SeriseOld.Points.Clear();
            if (_oldData != null)
            {
                oldPrice = new List<PowerData>();
                foreach (var item in _oldData)
                {
                    var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Power);
                    SeriseOld.Points.Add(new SeriesPoint(item.Time, price));
                    oldPrice.Add(new PowerData { Time = item.Time, Power = item.Power });
                }
            }
            var SeriseNew = this.chartControl1.GetSeriesByName("Series 5");
            SeriseNew.Points.Clear();
            if (_newData != null)
            {
                newPrice = new List<PowerData>();
                foreach (var item in _newData)
                {
                    var price = ElecPriceHelper.CalcuShysElectricityFees(item.Time, item.Power);
                    SeriseNew.Points.Add(new SeriesPoint(item.Time, price));
                    newPrice.Add(new PowerData { Time = item.Time, Power = item.Power });
                }
            }
            var SeriesDef = this.chartControl1.GetSeriesByName("Series 6");
            SeriesDef.Points.Clear();
            if (oldPrice != null && newPrice != null)
            {
                for (int i = 0; i < oldPrice.Count; i++)
                {
                    var def = oldPrice[i].Power - newPrice[i].Power;
                    _totalPrice += def;
                    SeriesDef.Points.Add(new SeriesPoint(oldPrice[i].Time, def));
                }
            }
            textEdit5.Text = Math.Round(_totalPrice).ToString();
        }
        //是否是无效数据
        private bool IsInvalidData()
        {
            return false;
        }
        private void AddLineSeries(string id, AxisXBase axis_x, AxisYBase axis_y, XYDiagramPaneBase pane, List<TimeChartViewModel> pt_list, DevExpress.XtraCharts.DashStyle dash = DevExpress.XtraCharts.DashStyle.Solid)
        {
@@ -214,9 +309,9 @@
            view.EmptyPointOptions.Color = Color.Transparent;
            view.Pane = pane;
            var series_pt_list = pt_list.Select(x => new SeriesPoint(DateTime.Parse(x.Time), x.Y)).ToArray();
            var series = new DevExpress.XtraCharts.Series();
            var series = this.chartControl1.GetSeriesByName(id);
            series.Points.Clear();
            series.Tag = id;
            //series.ShowInLegend = false;
            series.Name = id;
@@ -232,8 +327,9 @@
            series.View = view;
            series.Points.AddRange(series_pt_list);
            this.chartControl1.Series.Add(series);
            //this.chartControl1.Series.Add(series);
        }
        public static string ParseExcel(string fileName, out List<FlowPressChartViewModel> datalist, out DataTable dataTable)
        {
            datalist = new List<FlowPressChartViewModel>();
@@ -295,7 +391,6 @@
                else
                {
                    dataTable.Columns.Add(row_cell.StringCellValue, typeof(string));
                }
            }
@@ -304,7 +399,6 @@
            for (line = start_line; line < 10000; line++)
            {
                row_temp = sheet1.GetRow(line);
                if (row_temp == null)
                    break;
@@ -340,16 +434,12 @@
                dataTable.Rows.Add(rowData);
            }
            return "";
        }
        double Press = 0.6;
        double Efficiency = 75;
        SetPressForm dlg = new SetPressForm();
        private double Press = 0.6;
        private double Efficiency = 75;
        private SetPressForm dlg = new SetPressForm();
        private void barButtonItem2_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
@@ -359,5 +449,13 @@
                Efficiency = dlg.Efficiency;
            }
        }
        private void BtnRefresh_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            if (_datalist.Any())
            {
                SetBindingData(_datalist, _datatable);
            }
        }
    }
}
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.resx
@@ -161,6 +161,27 @@
        LTAuNzA3MSwgMC43MDcxLCAwLjcwNzEsIC05LjU0MTYsIDE1Ljk2NDUpIiAvPg0KICAgIDwvZz4NCiAg
        ICA8ZyBjbGFzcz0ic3QyIj4NCiAgICAgIDxwb2x5Z29uIHBvaW50cz0iNCwyIDIsNCAyOCw0IDMwLDIg
        ICAiIGNsYXNzPSJCbHVlIiAvPg0KICAgIDwvZz4NCiAgPC9nPg0KPC9zdmc+Cw==
</value>
  </data>
  <data name="BtnRefresh.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAC4DAAAC77u/
        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlJlZnJlc2hfMV8iPg0KICAgIDxwYXRoIGQ9Ik0yNC41
        LDcuNUMyMi4zLDUuMywxOS4zLDQsMTYsNEMxMC4xLDQsNS4xLDguMyw0LjIsMTRoNC4xYzAuOS0zLjQs
        NC02LDcuNy02YzIuMiwwLDQuMiwwLjksNS42LDIuNEwxOCwxNCAgIGg1LjdoNC4xSDI4VjRMMjQuNSw3
        LjV6IiBjbGFzcz0iR3JlZW4iIC8+DQogICAgPHBhdGggZD0iTTE2LjIsMjRjLTIuMiwwLTQuMi0wLjkt
        NS42LTIuNGwzLjYtMy42SDguNEg0LjRINC4ydjEwbDMuNS0zLjVjMi4yLDIuMiw1LjIsMy41LDguNSwz
        LjUgICBDMjIuMSwyOCwyNywyMy43LDI4LDE4aC00LjFDMjMsMjEuNCwxOS45LDI0LDE2LjIsMjR6IiBj
        bGFzcz0iR3JlZW4iIC8+DQogIDwvZz4NCjwvc3ZnPgs=
</value>
  </data>
</root>
WinFrmUI/PBS.WinFrmUI/01-place/00-core/PlaceViewModel.cs
@@ -39,7 +39,7 @@
            this.Paras = rhs.Paras;
            this.Flags = FlagsHelper.ToString(rhs.Flags);
            this.Vmo = rhs;
            this.MapInfoVmo = map;
            this.MapInfo = map;
        }
        public void Resert(Vmo.PlaceVmo rhs, Yw.Vmo.MapInfoVmo map)
@@ -56,7 +56,7 @@
            this.Description = rhs.Description;
            this.Flags = FlagsHelper.ToString(rhs.Flags);
            this.Vmo = rhs;
            this.MapInfoVmo = map;
            this.MapInfo = map;
        }
        /// <summary>
@@ -151,6 +151,6 @@
        /// <summary>
        /// 地图信息
        /// </summary>
        public Yw.Vmo.MapInfoVmo MapInfoVmo { get; set; }
        public Yw.Vmo.MapInfoVmo MapInfo { get; set; }
    }
}
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.Designer.cs
@@ -280,6 +280,7 @@
            barBtnUpdateTagName.Id = 23;
            barBtnUpdateTagName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateTagName.ImageOptions.SvgImage");
            barBtnUpdateTagName.Name = "barBtnUpdateTagName";
            barBtnUpdateTagName.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barBtnUpdateUseStatus
            // 
@@ -287,6 +288,7 @@
            barBtnUpdateUseStatus.Id = 24;
            barBtnUpdateUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateUseStatus.ImageOptions.SvgImage");
            barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
            barBtnUpdateUseStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barCekSearch
            // 
WinFrmUI/PBS.WinFrmUI/01-place/PlaceMgrPage.cs
@@ -144,12 +144,20 @@
                TipFormHelper.ShowWarn("请选择数据行");
            }
            var dlg = new EditPlaceDlg();
            dlg.SetBindingData(vm.Vmo, vm.MapInfoVmo);
            dlg.SetBindingData(vm.Vmo, vm.MapInfo);
            dlg.ReloadDataEvent += async (vmo, map) =>
            {
                var bol = await _placeBll.Update(vmo);
                if (bol)
                {
                    if (map.ID > 0)
                    {
                        await new Yw.BLL.MapInfo().Update(map);
                    }
                    else
                    {
                        await new Yw.BLL.MapInfo().Insert(map);
                    }
                    vm.Resert(vmo, map);
                    this.placeViewModelBindingSource.ResetBindings(false);
                    return true;
@@ -172,6 +180,14 @@
            {
                return;
            }
            if (vm.MapInfo != null)
            {
                if (!await BLLFactory<Yw.BLL.MapInfo>.Instance.DeleteByObjectTypeAndObjectID(PBS.DataType.PBSPlace, vm.ID))
                {
                    TipFormHelper.ShowError("项目地图位置删除失败,请重试!");
                    return;
                }
            }
            var bol = await _placeBll.DeleteByID(vm.ID);
            if (!bol)
            {
WinFrmUI/PBS.WinFrmUI/02-facility/FacilityMgrPage.Designer.cs
@@ -332,6 +332,7 @@
            barBtnUpdateTagName.Id = 23;
            barBtnUpdateTagName.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateTagName.ImageOptions.SvgImage");
            barBtnUpdateTagName.Name = "barBtnUpdateTagName";
            barBtnUpdateTagName.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barBtnUpdateUseStatus
            // 
@@ -339,6 +340,7 @@
            barBtnUpdateUseStatus.Id = 24;
            barBtnUpdateUseStatus.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barBtnUpdateUseStatus.ImageOptions.SvgImage");
            barBtnUpdateUseStatus.Name = "barBtnUpdateUseStatus";
            barBtnUpdateUseStatus.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
            // 
            // barCekSearch
            //