Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

duheng

2025-03-20 bc0ed5b6cfda6c72c06f451b77da8518c41ab210

Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

 Desktop/PBS.Desktop/MainForm.cs

@@ -1520,6 +1520,23 @@

                case "DataAnalysis":
                    {
                        var analysis = Get("能耗分析", new PageGuid()
                        {
                            Modular = "DataAnalysis",
                            MoudingType = eMoudingType.Tab,
                            Function = "EnergyAnalysis",
                        }, svgImgItem32[4], new Size(18, 18), (caption, guid, svg, size) =>
                        {
                            if (!IsExistPage(guid, true))
                            {
                                var page = new EnergyAnalysis();
                                page.PageGuid = guid;
                                page.PageTitle.Caption = caption;
                                page.PageTitle.HeaderSvgImage = svg;
                                page.PageTitle.SvgImageSize = size;
                                CreatePage(page, guid);
                            }
                        });
                        var analysis1 = Get("流量压力比对分析", new PageGuid()
                        {
                            Modular = "DataAnalysis",
@@ -1555,7 +1572,7 @@
                                CreatePage(page, guid);
                            }
                        });

                        list.Add(analysis);
                        list.Add(analysis1);
                        list.Add(analysis2);
                    }

 WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs

@@ -1,4 +1,5 @@
using DevExpress.XtraCharts;
using DevExpress.Charts.Native;
using DevExpress.XtraCharts;

namespace PBS.WinFrmUI.DataAnalysis
{
@@ -31,10 +32,13 @@
        private void InitializeComponent()
        {
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnergyAnalysis));
            XYDiagram xyDiagram2 = new XYDiagram();
            LayoutDefinition layoutDefinition4 = new LayoutDefinition();
            LayoutDefinition layoutDefinition5 = new LayoutDefinition();
            LayoutDefinition layoutDefinition6 = new LayoutDefinition();
            XYDiagram xyDiagram1 = new XYDiagram();
            LayoutDefinition layoutDefinition1 = new LayoutDefinition();
            LayoutDefinition layoutDefinition2 = new LayoutDefinition();
            LayoutDefinition layoutDefinition3 = new LayoutDefinition();
            SecondaryAxisY secondaryAxisy1 = new SecondaryAxisY();
            Series series1 = new Series();
            SplineSeriesView splineSeriesView1 = new SplineSeriesView();
            Series series2 = new Series();
            SplineSeriesView splineSeriesView2 = new SplineSeriesView();
            ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
@@ -45,34 +49,34 @@
            chartControl1 = new ChartControl();
            xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
            splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            textEdit5 = new DevExpress.XtraEditors.TextEdit();
            textEdit4 = new DevExpress.XtraEditors.TextEdit();
            textEdit3 = new DevExpress.XtraEditors.TextEdit();
            textEdit2 = new DevExpress.XtraEditors.TextEdit();
            textEdit1 = new DevExpress.XtraEditors.TextEdit();
            Root = 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();
            xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            textEdit1 = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            textEdit2 = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            textEdit3 = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            textEdit4 = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            textEdit5 = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)chartControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)xyDiagram2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)xyDiagram1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)secondaryAxisy1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)series2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)splineSeriesView2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)xtraTabControl1).BeginInit();
            xtraTabControl1.SuspendLayout();
            xtraTabPage1.SuspendLayout();
            xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)splitContainerControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)splitContainerControl1.Panel1).BeginInit();
            splitContainerControl1.Panel1.SuspendLayout();
@@ -81,18 +85,21 @@
            splitContainerControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)dataLayoutControl1).BeginInit();
            dataLayoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
            xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
            SuspendLayout();
            // 
            // ribbonControl1
@@ -143,26 +150,36 @@
            // chartControl1
            // 
            chartControl1.BorderOptions.Visibility = DevExpress.Utils.DefaultBoolean.False;
            xyDiagram2.AxisX.Alignment = AxisAlignment.Zero;
            xyDiagram2.AxisX.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.True;
            xyDiagram2.AxisX.Title.Text = "时间";
            xyDiagram2.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            xyDiagram2.AxisX.VisibleInPanesSerializable = "-1";
            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 = "压力(MPa)";
            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.RowDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition4, layoutDefinition5, layoutDefinition6 });
            xyDiagram2.RangeControlTimeSpanGridOptions.GridAlignment = TimeSpanGridAlignment.Minute;
            xyDiagram2.RangeControlTimeSpanGridOptions.GridMode = ChartRangeControlClientGridMode.Manual;
            chartControl1.Diagram = xyDiagram2;
            xyDiagram1.AxisX.Alignment = AxisAlignment.Zero;
            xyDiagram1.AxisX.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.True;
            xyDiagram1.AxisX.Title.Text = "时间";
            xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
            xyDiagram1.AxisX.VisibleInPanesSerializable = "-1";
            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.RowDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition1, layoutDefinition2, layoutDefinition3 });
            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";
            xyDiagram1.SecondaryAxesY.AddRange(new SecondaryAxisY[] { secondaryAxisy1 });
            chartControl1.Diagram = xyDiagram1;
            chartControl1.Dock = DockStyle.Fill;
            chartControl1.Legend.AlignmentHorizontal = LegendAlignmentHorizontal.Right;
            chartControl1.Legend.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
@@ -173,15 +190,21 @@
            chartControl1.Location = new Point(0, 0);
            chartControl1.Margin = new Padding(2);
            chartControl1.Name = "chartControl1";
            series2.Name = "SeriesQH";
            series2.SeriesID = 0;
            splineSeriesView2.Color = Color.FromArgb(84, 141, 212);
            series1.Name = "SeriesQH";
            series1.SeriesID = 0;
            splineSeriesView1.Color = Color.FromArgb(84, 141, 212);
            series1.View = splineSeriesView1;
            series2.Name = "SeriesQE";
            series2.SeriesID = 1;
            splineSeriesView2.AxisYName = "AxisYEff";
            splineSeriesView2.Color = Color.FromArgb(155, 187, 89);
            series2.View = splineSeriesView2;
            chartControl1.SeriesSerializable = new Series[]
    {
    series1,
    series2
    };
            chartControl1.Size = new Size(784, 535);
            chartControl1.Size = new Size(774, 535);
            chartControl1.TabIndex = 0;
            // 
            // xtraTabControl1
@@ -200,6 +223,148 @@
            xtraTabPage1.Name = "xtraTabPage1";
            xtraTabPage1.Size = new Size(1001, 535);
            xtraTabPage1.Text = "图表";
            // 
            // splitContainerControl1
            // 
            splitContainerControl1.Dock = DockStyle.Fill;
            splitContainerControl1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            splitContainerControl1.Location = new Point(0, 0);
            splitContainerControl1.Name = "splitContainerControl1";
            // 
            // splitContainerControl1.Panel1
            // 
            splitContainerControl1.Panel1.Controls.Add(chartControl1);
            splitContainerControl1.Panel1.Text = "Panel1";
            // 
            // splitContainerControl1.Panel2
            // 
            splitContainerControl1.Panel2.Controls.Add(dataLayoutControl1);
            splitContainerControl1.Panel2.Text = "Panel2";
            splitContainerControl1.Size = new Size(1001, 535);
            splitContainerControl1.SplitterPosition = 217;
            splitContainerControl1.TabIndex = 1;
            // 
            // dataLayoutControl1
            // 
            dataLayoutControl1.Controls.Add(textEdit5);
            dataLayoutControl1.Controls.Add(textEdit4);
            dataLayoutControl1.Controls.Add(textEdit3);
            dataLayoutControl1.Controls.Add(textEdit2);
            dataLayoutControl1.Controls.Add(textEdit1);
            dataLayoutControl1.Dock = DockStyle.Fill;
            dataLayoutControl1.Location = new Point(0, 0);
            dataLayoutControl1.Name = "dataLayoutControl1";
            dataLayoutControl1.Root = Root;
            dataLayoutControl1.Size = new Size(217, 535);
            dataLayoutControl1.TabIndex = 0;
            dataLayoutControl1.Text = "dataLayoutControl1";
            // 
            // textEdit5
            // 
            textEdit5.Location = new Point(96, 108);
            textEdit5.MenuManager = ribbonControl1;
            textEdit5.Name = "textEdit5";
            textEdit5.Size = new Size(109, 20);
            textEdit5.StyleController = dataLayoutControl1;
            textEdit5.TabIndex = 8;
            // 
            // textEdit4
            // 
            textEdit4.Location = new Point(96, 84);
            textEdit4.MenuManager = ribbonControl1;
            textEdit4.Name = "textEdit4";
            textEdit4.Size = new Size(109, 20);
            textEdit4.StyleController = dataLayoutControl1;
            textEdit4.TabIndex = 7;
            // 
            // textEdit3
            // 
            textEdit3.Location = new Point(96, 60);
            textEdit3.MenuManager = ribbonControl1;
            textEdit3.Name = "textEdit3";
            textEdit3.Size = new Size(109, 20);
            textEdit3.StyleController = dataLayoutControl1;
            textEdit3.TabIndex = 6;
            // 
            // textEdit2
            // 
            textEdit2.Location = new Point(96, 36);
            textEdit2.MenuManager = ribbonControl1;
            textEdit2.Name = "textEdit2";
            textEdit2.Size = new Size(109, 20);
            textEdit2.StyleController = dataLayoutControl1;
            textEdit2.TabIndex = 5;
            // 
            // textEdit1
            // 
            textEdit1.Location = new Point(96, 12);
            textEdit1.MenuManager = ribbonControl1;
            textEdit1.Name = "textEdit1";
            textEdit1.Size = new Size(109, 20);
            textEdit1.StyleController = dataLayoutControl1;
            textEdit1.TabIndex = 4;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5 });
            Root.Name = "Root";
            Root.Size = new Size(217, 535);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = textEdit1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(197, 24);
            layoutControlItem1.Text = "数据天数：";
            layoutControlItem1.TextSize = new Size(72, 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);
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = textEdit2;
            layoutControlItem2.Location = new Point(0, 24);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(197, 24);
            layoutControlItem2.Text = "总流量：";
            layoutControlItem2.TextSize = new Size(72, 14);
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = textEdit3;
            layoutControlItem3.Location = new Point(0, 48);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(197, 24);
            layoutControlItem3.Text = "总节电量：";
            layoutControlItem3.TextSize = new Size(72, 14);
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = textEdit4;
            layoutControlItem4.Location = new Point(0, 72);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(197, 24);
            layoutControlItem4.Text = "节电率：";
            layoutControlItem4.TextSize = new Size(72, 14);
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = textEdit5;
            layoutControlItem5.Location = new Point(0, 96);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(197, 24);
            layoutControlItem5.Text = "总节电费用：";
            layoutControlItem5.TextSize = new Size(72, 14);
            // 
            // xtraTabPage2
            // 
@@ -228,147 +393,6 @@
            gridView1.OptionsDragDrop.AllowSortedDataDragDrop = false;
            gridView1.OptionsView.ShowGroupPanel = false;
            // 
            // splitContainerControl1
            // 
            splitContainerControl1.Dock = DockStyle.Fill;
            splitContainerControl1.Location = new Point(0, 0);
            splitContainerControl1.Name = "splitContainerControl1";
            // 
            // splitContainerControl1.Panel1
            // 
            splitContainerControl1.Panel1.Controls.Add(chartControl1);
            splitContainerControl1.Panel1.Text = "Panel1";
            // 
            // splitContainerControl1.Panel2
            // 
            splitContainerControl1.Panel2.Controls.Add(dataLayoutControl1);
            splitContainerControl1.Panel2.Text = "Panel2";
            splitContainerControl1.Size = new Size(1001, 535);
            splitContainerControl1.SplitterPosition = 784;
            splitContainerControl1.TabIndex = 1;
            // 
            // dataLayoutControl1
            // 
            dataLayoutControl1.Controls.Add(textEdit5);
            dataLayoutControl1.Controls.Add(textEdit4);
            dataLayoutControl1.Controls.Add(textEdit3);
            dataLayoutControl1.Controls.Add(textEdit2);
            dataLayoutControl1.Controls.Add(textEdit1);
            dataLayoutControl1.Dock = DockStyle.Fill;
            dataLayoutControl1.Location = new Point(0, 0);
            dataLayoutControl1.Name = "dataLayoutControl1";
            dataLayoutControl1.Root = Root;
            dataLayoutControl1.Size = new Size(207, 535);
            dataLayoutControl1.TabIndex = 0;
            dataLayoutControl1.Text = "dataLayoutControl1";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5 });
            Root.Name = "Root";
            Root.Size = new Size(207, 535);
            Root.TextVisible = false;
            // 
            // textEdit1
            // 
            textEdit1.Location = new Point(96, 12);
            textEdit1.MenuManager = ribbonControl1;
            textEdit1.Name = "textEdit1";
            textEdit1.Size = new Size(99, 20);
            textEdit1.StyleController = dataLayoutControl1;
            textEdit1.TabIndex = 4;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = textEdit1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(187, 24);
            layoutControlItem1.Text = "数据天数：";
            layoutControlItem1.TextSize = new Size(72, 14);
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 120);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(187, 395);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // textEdit2
            // 
            textEdit2.Location = new Point(96, 36);
            textEdit2.MenuManager = ribbonControl1;
            textEdit2.Name = "textEdit2";
            textEdit2.Size = new Size(99, 20);
            textEdit2.StyleController = dataLayoutControl1;
            textEdit2.TabIndex = 5;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = textEdit2;
            layoutControlItem2.Location = new Point(0, 24);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(187, 24);
            layoutControlItem2.Text = "总流量：";
            layoutControlItem2.TextSize = new Size(72, 14);
            // 
            // textEdit3
            // 
            textEdit3.Location = new Point(96, 60);
            textEdit3.MenuManager = ribbonControl1;
            textEdit3.Name = "textEdit3";
            textEdit3.Size = new Size(99, 20);
            textEdit3.StyleController = dataLayoutControl1;
            textEdit3.TabIndex = 6;
            // 
            // layoutControlItem3
            // 
            layoutControlItem3.Control = textEdit3;
            layoutControlItem3.Location = new Point(0, 48);
            layoutControlItem3.Name = "layoutControlItem3";
            layoutControlItem3.Size = new Size(187, 24);
            layoutControlItem3.Text = "总节电量：";
            layoutControlItem3.TextSize = new Size(72, 14);
            // 
            // textEdit4
            // 
            textEdit4.Location = new Point(96, 84);
            textEdit4.MenuManager = ribbonControl1;
            textEdit4.Name = "textEdit4";
            textEdit4.Size = new Size(99, 20);
            textEdit4.StyleController = dataLayoutControl1;
            textEdit4.TabIndex = 7;
            // 
            // layoutControlItem4
            // 
            layoutControlItem4.Control = textEdit4;
            layoutControlItem4.Location = new Point(0, 72);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(187, 24);
            layoutControlItem4.Text = "节电率：";
            layoutControlItem4.TextSize = new Size(72, 14);
            // 
            // textEdit5
            // 
            textEdit5.Location = new Point(96, 108);
            textEdit5.MenuManager = ribbonControl1;
            textEdit5.Name = "textEdit5";
            textEdit5.Size = new Size(99, 20);
            textEdit5.StyleController = dataLayoutControl1;
            textEdit5.TabIndex = 8;
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.Control = textEdit5;
            layoutControlItem5.Location = new Point(0, 96);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(187, 24);
            layoutControlItem5.Text = "总节电费用：";
            layoutControlItem5.TextSize = new Size(72, 14);
            // 
            // EnergyAnalysis
            // 
            Appearance.BackColor = SystemColors.Control;
@@ -380,16 +404,16 @@
            Name = "EnergyAnalysis";
            Size = new Size(1003, 689);
            ((System.ComponentModel.ISupportInitialize)ribbonControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)xyDiagram2).EndInit();
            ((System.ComponentModel.ISupportInitialize)secondaryAxisy1).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)chartControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)xtraTabControl1).EndInit();
            xtraTabControl1.ResumeLayout(false);
            xtraTabPage1.ResumeLayout(false);
            xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ((System.ComponentModel.ISupportInitialize)splitContainerControl1.Panel1).EndInit();
            splitContainerControl1.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)splitContainerControl1.Panel2).EndInit();
@@ -398,18 +422,21 @@
            splitContainerControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)dataLayoutControl1).EndInit();
            dataLayoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit2.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit3.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit4.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
            xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)gridControl1).EndInit();
            ((System.ComponentModel.ISupportInitialize)gridView1).EndInit();
            ResumeLayout(false);
            PerformLayout();
        }

 WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.cs

@@ -1,4 +1,5 @@
using DevExpress.Utils;
using DevExpress.Mvvm.POCO;
using DevExpress.Utils;
using DevExpress.XtraCharts;
using DevExpress.XtraGrid.Columns;
using DevExpress.XtraGrid.Views.Grid;
@@ -39,7 +40,7 @@

        private AxisX _axis_x_flow;
        private AxisY _axis_y_head;
        //private SecondaryAxisY _axis_y_eff;
        private SecondaryAxisY _axis_y_eff;


        #endregion
@@ -59,18 +60,18 @@
            _diagram.EnableAxisYZooming = true;
            _default_pane = _diagram.DefaultPane;

            _diagram.AxisX.TimeSpanScaleOptions.MeasureUnit = TimeSpanMeasureUnit.Minute;
            _diagram.AxisX.TimeSpanScaleOptions.ScaleMode = ScaleMode.Continuous;
            _diagram.AxisX.DateTimeScaleOptions.MeasureUnit = DateTimeMeasureUnit.Second;
            _diagram.AxisX.DateTimeScaleOptions.ScaleMode = ScaleMode.Continuous;

            _axis_x_flow = _diagram.AxisX;
            _axis_y_head = _diagram.AxisY;
            //_axis_y_eff = _diagram.SecondaryAxesY.GetAxisByName("AxisYEff");
            //_axis_y_eff.Alignment = AxisAlignment.Far;
            _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;
            _axis_y_eff.GridLines.Visible = false;

            this.chartControl1.CrosshairEnabled = DefaultBoolean.True;

@@ -113,20 +114,19 @@

            foreach (var vm in vm_list)
            {
                //if (!vm.Name.Contains("压力"))
                //{
                axis_x = _axis_x_flow;
                axis_y = _axis_y_head;
                pane = _default_pane;
                //}
                //else
                //{
                //    axis_x = _axis_x_flow;
                //    axis_y = _axis_y_eff;
                //    pane = _default_pane;
                if (!vm.Name.Contains("压力"))
                {
                    axis_x = _axis_x_flow;
                    axis_y = _axis_y_head;
                    pane = _default_pane;
                }
                else
                {
                    axis_x = _axis_x_flow;
                    axis_y = _axis_y_eff;
                    pane = _default_pane;

                //}

                }
                var col = new GridColumn();
                col.FieldName = vm.Name;
                col.Caption = vm.Name;
@@ -136,8 +136,16 @@
                AddLineSeries(vm.Name, axis_x, axis_y, pane, vm.Datas);
            }

            var min_x = vm_list.SelectMany(x => x.Datas).Min(x => TimeSpan.Parse(x.Time));
            var max_x = vm_list.SelectMany(x => x.Datas).Max(x => TimeSpan.Parse(x.Time));
            var tempdatas = vm_list[0];
            foreach (var item in tempdatas.Datas)
            {
                item.Y = Press;
            }

            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;
@@ -146,8 +154,9 @@
            _axis_x_flow.WholeRange.SetMinMaxValues(min_x, max_x);
            _axis_x_flow.VisualRange.SetMinMaxValues(min_x, max_x);

            var diff_days = max_x - min_x;
            textEdit1.Text =  diff_days.TotalDays.ToString();
            gridControl1.DataSource = dataTable;

            this.chartControl1.EndInit();

        }
@@ -183,16 +192,17 @@
            view.Pane = pane;


            var series_pt_list = pt_list.Select(x => new SeriesPoint(TimeSpan.Parse(x.Time), x.Y)).ToArray();
            var series_pt_list = pt_list.Select(x => new SeriesPoint(DateTime.Parse(x.Time), x.Y)).ToArray();
            var series = new DevExpress.XtraCharts.Series();
            series.Tag = id;
            //series.ShowInLegend = false;
            series.Name = id;
            series.ArgumentScaleType = DevExpress.XtraCharts.ScaleType.TimeSpan;
            series.TimeSpanSummaryOptions.MeasureUnit = TimeSpanMeasureUnit.Minute;
            series.ArgumentScaleType = DevExpress.XtraCharts.ScaleType.DateTime;
            series.DateTimeSummaryOptions.MeasureUnit = DateTimeMeasureUnit.Second;

            series.LabelsVisibility = DevExpress.Utils.DefaultBoolean.False;
            series.CrosshairEnabled = DefaultBoolean.True;
            series.CrosshairLabelPattern = id + ":{V:N2}";
            series.CrosshairLabelPattern = id + ":{V:N2}  {A:yyyy-MM-dd HH:mm:ss}";
            series.ToolTipEnabled = DefaultBoolean.False;
            series.SeriesPointsSorting = SortingMode.None;
            series.Visible = true;
@@ -205,7 +215,6 @@
        {
            datalist = new List<FlowPressChartViewModel>();
            dataTable = new DataTable();

            if (!File.Exists(fileName))
                return "文件不存在";
            int line = 0;
@@ -274,57 +283,54 @@
            {

                row_temp = sheet1.GetRow(line);
                if (row_temp == null || row_temp.Cells.Count < 3)
                if (row_temp == null)
                    break;
                var rowData = new object[totalcell];
                for (int i = 0; i < totalcell; i++)
                {
                    try
                    {
                        var cell_temp = row_temp.GetCell(i);

                        if (i > 0)
                        {
                            if (cell_temp != null && cell_temp.CellType != NPOI.SS.UserModel.CellType.Blank)
                            var cell_temp = row_temp.GetCell(i);
                            double yvalue = cell_temp.NumericCellValue;
                            var timevalue = row_temp.GetCell(0).StringCellValue;
                            datalist[i - 1].Datas.Add(new TimeChartViewModel()
                            {
                                double yvalue = cell_temp.NumericCellValue;
                                var timevalue = row_temp.GetCell(0).NumericCellValue;
                                //double.TryParse(cell_temp.StringCellValue,out yvalue);
                                datalist[i - 1].Datas.Add(new TimeChartViewModel()
                                {
                                    Time = DateTime.FromOADate(timevalue).ToString("HH:mm:ss"),
                                    Y = yvalue,
                                });
                                rowData[i] = yvalue;
                            }
                                Time = timevalue, //DateTime.FromOADate(timevalue).ToString("YYYY-MM-dd HH:mm:ss"),
                                Y = yvalue,
                            });
                            rowData[i] = yvalue;
                        }
                        else
                        {
                            var timevalue = row_temp.GetCell(0).NumericCellValue;
                            rowData[i] = DateTime.FromOADate(timevalue).ToString("HH:mm:ss");
                            var timevalue = row_temp.GetCell(0).StringCellValue;
                            rowData[i] = timevalue;//DateTime.FromOADate(timevalue).ToString("YYYY-MM-dd HH:mm:ss");
                        }
                    }
                    catch (Exception ex)
                    {
                        var a = ex.Message;
                        //var a = ex.Message;
                    }
                }

                dataTable.Rows.Add(rowData);
            }

            //Yw.Pump.CalculationHelper.CalcuP();

            return "";



        }

        double Press = 0.6;
        private void barButtonItem2_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new SetPressForm();
            if (dlg.ShowDialog() == DialogResult.OK)
            {
                var press= dlg.Press;
                Press = dlg.Press;
            }
        }
    }

 WinFrmUI/PBS.WinFrmUI.DataAnalysis/Form/SetPressForm.Designer.cs

@@ -29,16 +29,16 @@
        private void InitializeComponent()
        {
            dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
            textEdit1 = new DevExpress.XtraEditors.TextEdit();
            Root = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
            simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)dataLayoutControl1).BeginInit();
            dataLayoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)Root).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
@@ -56,40 +56,6 @@
            dataLayoutControl1.TabIndex = 0;
            dataLayoutControl1.Text = "dataLayoutControl1";
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlItem2 });
            Root.Name = "Root";
            Root.Size = new Size(377, 67);
            Root.TextVisible = false;
            // 
            // textEdit1
            // 
            textEdit1.Location = new Point(60, 12);
            textEdit1.Name = "textEdit1";
            textEdit1.Size = new Size(195, 20);
            textEdit1.StyleController = dataLayoutControl1;
            textEdit1.TabIndex = 4;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = textEdit1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(247, 26);
            layoutControlItem1.Text = "压力：";
            layoutControlItem1.TextSize = new Size(36, 14);
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 26);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(357, 21);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // simpleButton1
            // 
            simpleButton1.Location = new Point(259, 12);
@@ -99,6 +65,40 @@
            simpleButton1.TabIndex = 5;
            simpleButton1.Text = "确定";
            simpleButton1.Click += simpleButton1_Click;
            // 
            // textEdit1
            // 
            textEdit1.Location = new Point(106, 12);
            textEdit1.Name = "textEdit1";
            textEdit1.Size = new Size(149, 20);
            textEdit1.StyleController = dataLayoutControl1;
            textEdit1.TabIndex = 4;
            // 
            // Root
            // 
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlItem2 });
            Root.Name = "Root";
            Root.Size = new Size(377, 67);
            Root.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            layoutControlItem1.Control = textEdit1;
            layoutControlItem1.Location = new Point(0, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(247, 26);
            layoutControlItem1.Text = "压力（MPa）：";
            layoutControlItem1.TextSize = new Size(82, 14);
            // 
            // emptySpaceItem1
            // 
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 26);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(357, 21);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem2
            // 
@@ -122,8 +122,8 @@
            Text = "设置压力";
            ((System.ComponentModel.ISupportInitialize)dataLayoutControl1).EndInit();
            dataLayoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)textEdit1.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)Root).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();

 WinFrmUI/PBS.WinFrmUI.DataAnalysis/Form/SetPressForm.cs

@@ -12,7 +12,7 @@
{
    public partial class SetPressForm : Form
    {
        public double Press { get; set; } = 50;
        public double Press { get; set; } = 0.6;
        public SetPressForm()
        {
            InitializeComponent();

 WinFrmUI/PBS.WinFrmUI.DataAnalysis/PBS.WinFrmUI.DataAnalysis.csproj

@@ -30,6 +30,7 @@
  <ItemGroup>
    <PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
    <PackageReference Include="NPOI" Version="2.7.1" />
    <PackageReference Include="Yw.Pump.Core" Version="3.2.4" />
  </ItemGroup>

  <ItemGroup>