From f7d479db638f3d9e3aeb05ec82dc2818f14bf903 Mon Sep 17 00:00:00 2001
From: ningshuxia <ningshuxia0927@outlook.com>
Date: 星期一, 24 三月 2025 17:25:20 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs | 687 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 549 insertions(+), 138 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
index 84fe836..a9ad8ec 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EnergyAnalysis.Designer.cs
@@ -32,18 +32,38 @@
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(EnergyAnalysis));
- XYDiagram xyDiagram1 = new XYDiagram();
- LayoutDefinition layoutDefinition1 = new LayoutDefinition();
- LayoutDefinition layoutDefinition2 = new LayoutDefinition();
- LayoutDefinition layoutDefinition3 = new LayoutDefinition();
- SecondaryAxisY secondaryAxisy1 = new SecondaryAxisY();
- Series series1 = new Series();
- SplineSeriesView splineSeriesView1 = new SplineSeriesView();
- Series series2 = new Series();
- SplineSeriesView splineSeriesView2 = new SplineSeriesView();
+ XYDiagram xyDiagram2 = new XYDiagram();
+ LayoutDefinition layoutDefinition5 = new LayoutDefinition();
+ LayoutDefinition layoutDefinition6 = new LayoutDefinition();
+ LayoutDefinition layoutDefinition7 = new LayoutDefinition();
+ LayoutDefinition layoutDefinition8 = new LayoutDefinition();
+ XYDiagramPane xyDiagramPane3 = new XYDiagramPane();
+ XYDiagramPane xyDiagramPane4 = new XYDiagramPane();
+ SecondaryAxisY secondaryAxisy4 = new SecondaryAxisY();
+ SecondaryAxisY secondaryAxisy5 = new SecondaryAxisY();
+ SecondaryAxisY secondaryAxisy6 = new SecondaryAxisY();
+ Series series10 = new Series();
+ SplineSeriesView splineSeriesView10 = new SplineSeriesView();
+ Series series11 = new Series();
+ SplineSeriesView splineSeriesView11 = new SplineSeriesView();
+ Series series12 = new Series();
+ SplineSeriesView splineSeriesView12 = new SplineSeriesView();
+ Series series13 = new Series();
+ SplineSeriesView splineSeriesView13 = new SplineSeriesView();
+ Series series14 = new Series();
+ SplineSeriesView splineSeriesView14 = new SplineSeriesView();
+ Series series15 = new Series();
+ SplineSeriesView splineSeriesView15 = new SplineSeriesView();
+ Series series16 = new Series();
+ SplineSeriesView splineSeriesView16 = new SplineSeriesView();
+ Series series17 = new Series();
+ SplineSeriesView splineSeriesView17 = new SplineSeriesView();
+ Series series18 = new Series();
+ SplineSeriesView splineSeriesView18 = new SplineSeriesView();
ribbonControl1 = new DevExpress.XtraBars.Ribbon.RibbonControl();
barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
barButtonItem2 = new DevExpress.XtraBars.BarButtonItem();
+ BtnRefresh = new DevExpress.XtraBars.BarButtonItem();
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
chartControl1 = new ChartControl();
@@ -51,29 +71,66 @@
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();
+ textEdit5 = new DevExpress.XtraEditors.TextEdit();
textEdit3 = new DevExpress.XtraEditors.TextEdit();
textEdit2 = new DevExpress.XtraEditors.TextEdit();
textEdit1 = new DevExpress.XtraEditors.TextEdit();
+ textEditEffBefore = new DevExpress.XtraEditors.TextEdit();
+ textEditPriceBefore = new DevExpress.XtraEditors.TextEdit();
+ textEditEffAfter = new DevExpress.XtraEditors.TextEdit();
+ textEditPriceAfter = new DevExpress.XtraEditors.TextEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- 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();
+ 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();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)chartControl1).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)xyDiagram2).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagramPane3).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagramPane4).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy4).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy5).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy6).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series10).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView10).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series11).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView11).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series12).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView12).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series13).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView13).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series14).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView14).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series15).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView15).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series16).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView16).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series17).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView17).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)series18).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView18).BeginInit();
((System.ComponentModel.ISupportInitialize)xtraTabControl1).BeginInit();
xtraTabControl1.SuspendLayout();
xtraTabPage1.SuspendLayout();
@@ -85,37 +142,59 @@
splitContainerControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)dataLayoutControl1).BeginInit();
dataLayoutControl1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).BeginInit();
((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)textEditEffBefore.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditPriceBefore.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditEffAfter.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)textEditPriceAfter.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
- ((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)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;
//
@@ -129,11 +208,19 @@
//
// barButtonItem2
//
- barButtonItem2.Caption = "璁剧疆鍘嬪姏";
+ barButtonItem2.Caption = "鍙傛暟閰嶇疆";
barButtonItem2.Id = 2;
barButtonItem2.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("barButtonItem2.ImageOptions.SvgImage");
barButtonItem2.Name = "barButtonItem2";
barButtonItem2.ItemClick += barButtonItem2_ItemClick;
+ //
+ // BtnRefresh
+ //
+ BtnRefresh.Caption = "鍒锋柊";
+ BtnRefresh.Id = 43;
+ BtnRefresh.ImageOptions.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("BtnRefresh.ImageOptions.SvgImage");
+ BtnRefresh.Name = "BtnRefresh";
+ BtnRefresh.ItemClick += BtnRefresh_ItemClick;
//
// ribbonPage1
//
@@ -144,42 +231,65 @@
//
ribbonPageGroup1.ItemLinks.Add(barButtonItem1);
ribbonPageGroup1.ItemLinks.Add(barButtonItem2);
+ ribbonPageGroup1.ItemLinks.Add(BtnRefresh);
ribbonPageGroup1.Name = "ribbonPageGroup1";
ribbonPageGroup1.Text = "鍩虹鍔熻兘";
//
// chartControl1
//
chartControl1.BorderOptions.Visibility = DevExpress.Utils.DefaultBoolean.False;
- xyDiagram1.AxisX.Alignment = AxisAlignment.Zero;
- xyDiagram1.AxisX.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.True;
- xyDiagram1.AxisX.Title.Text = "鏃堕棿";
- xyDiagram1.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
- xyDiagram1.AxisX.VisibleInPanesSerializable = "-1";
- 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;
+ xyDiagram2.AxisX.Alignment = AxisAlignment.Zero;
+ xyDiagram2.AxisX.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.True;
+ xyDiagram2.AxisX.Title.Text = "鏃堕棿";
+ xyDiagram2.AxisX.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
+ xyDiagram2.AxisX.VisibleInPanesSerializable = "-1;0;1";
+ xyDiagram2.AxisY.Color = Color.DodgerBlue;
+ xyDiagram2.AxisY.Label.TextColor = Color.DodgerBlue;
+ xyDiagram2.AxisY.Title.Alignment = StringAlignment.Far;
+ xyDiagram2.AxisY.Title.EnableAntialiasing = DevExpress.Utils.DefaultBoolean.False;
+ xyDiagram2.AxisY.Title.Text = "娴侀噺(m鲁/h)";
+ xyDiagram2.AxisY.Title.TextColor = Color.DodgerBlue;
+ xyDiagram2.AxisY.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ xyDiagram2.AxisY.VisibleInPanesSerializable = "-1";
+ xyDiagram2.DefaultPane.BorderVisible = false;
+ xyDiagram2.DefaultPane.Title.Text = "鏃犳暟鎹�";
+ xyDiagram2.PaneLayout.AutoLayoutMode = PaneAutoLayoutMode.Grid;
+ xyDiagram2.PaneLayout.ColumnDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition5, layoutDefinition6 });
+ xyDiagram2.PaneLayout.RowDefinitions.AddRange(new LayoutDefinition[] { layoutDefinition7, layoutDefinition8 });
+ xyDiagramPane3.LayoutOptions.Column = 0;
+ xyDiagramPane3.LayoutOptions.ColumnSpan = 2;
+ xyDiagramPane3.LayoutOptions.Row = 1;
+ xyDiagramPane3.Name = "Pane 1";
+ xyDiagramPane3.PaneID = 0;
+ xyDiagramPane4.LayoutOptions.Column = 1;
+ xyDiagramPane4.LayoutOptions.Row = 0;
+ xyDiagramPane4.Name = "Pane 2";
+ xyDiagramPane4.PaneID = 1;
+ xyDiagram2.Panes.AddRange(new XYDiagramPane[] { xyDiagramPane3, xyDiagramPane4 });
+ xyDiagram2.RangeControlTimeSpanGridOptions.GridAlignment = TimeSpanGridAlignment.Second;
+ xyDiagram2.RangeControlTimeSpanGridOptions.GridMode = ChartRangeControlClientGridMode.Manual;
+ secondaryAxisy4.AxisID = 0;
+ secondaryAxisy4.Color = Color.Green;
+ secondaryAxisy4.Label.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
+ secondaryAxisy4.Label.TextColor = Color.Green;
+ secondaryAxisy4.Name = "AxisYEff";
+ secondaryAxisy4.Title.Text = "鍘嬪姏(MPa)";
+ secondaryAxisy4.Title.TextColor = Color.Green;
+ secondaryAxisy4.Title.Visibility = DevExpress.Utils.DefaultBoolean.Default;
+ secondaryAxisy4.VisibleInPanesSerializable = "-1";
+ secondaryAxisy5.AxisID = 1;
+ secondaryAxisy5.Name = "Secondary AxisY 1";
+ secondaryAxisy5.Title.Text = "鐢ㄧ數閲忥紙搴︼級";
+ secondaryAxisy5.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ secondaryAxisy5.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ secondaryAxisy5.VisibleInPanesSerializable = "1";
+ secondaryAxisy6.AxisID = 2;
+ secondaryAxisy6.Name = "Secondary AxisY 2";
+ secondaryAxisy6.Title.Text = "鐢佃垂锛堝厓锛�";
+ secondaryAxisy6.Title.Visibility = DevExpress.Utils.DefaultBoolean.True;
+ secondaryAxisy6.VisibleInPanesSerializable = "0";
+ xyDiagram2.SecondaryAxesY.AddRange(new SecondaryAxisY[] { secondaryAxisy4, secondaryAxisy5, secondaryAxisy6 });
+ chartControl1.Diagram = xyDiagram2;
chartControl1.Dock = DockStyle.Fill;
chartControl1.Legend.AlignmentHorizontal = LegendAlignmentHorizontal.Right;
chartControl1.Legend.Border.Visibility = DevExpress.Utils.DefaultBoolean.False;
@@ -188,40 +298,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.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;
+ series10.Name = "娴侀噺";
+ series10.SeriesID = 0;
+ splineSeriesView10.Color = Color.FromArgb(84, 141, 212);
+ series10.View = splineSeriesView10;
+ series11.Name = "鍑哄彛鍘嬪姏";
+ series11.SeriesID = 1;
+ splineSeriesView11.AxisYName = "AxisYEff";
+ splineSeriesView11.Color = Color.FromArgb(155, 187, 89);
+ series11.View = splineSeriesView11;
+ series12.Name = "鏀归�犲墠(搴�)";
+ series12.SeriesID = 2;
+ splineSeriesView12.AxisYName = "Secondary AxisY 1";
+ splineSeriesView12.PaneName = "Pane 2";
+ series12.View = splineSeriesView12;
+ series13.Name = "鏀归�犲悗(搴�)";
+ series13.SeriesID = 3;
+ splineSeriesView13.AxisYName = "Secondary AxisY 1";
+ splineSeriesView13.PaneName = "Pane 2";
+ series13.View = splineSeriesView13;
+ series14.Name = "鑺傜渷鍊�(搴�)";
+ series14.SeriesID = 4;
+ splineSeriesView14.AxisYName = "Secondary AxisY 1";
+ splineSeriesView14.PaneName = "Pane 2";
+ series14.View = splineSeriesView14;
+ series15.Name = "鏀归�犲墠(鍏�)";
+ series15.SeriesID = 5;
+ splineSeriesView15.AxisYName = "Secondary AxisY 2";
+ splineSeriesView15.PaneName = "Pane 1";
+ series15.View = splineSeriesView15;
+ series16.Name = "鏀归�犲悗(鍏�)";
+ series16.SeriesID = 6;
+ splineSeriesView16.AxisYName = "Secondary AxisY 2";
+ splineSeriesView16.PaneName = "Pane 1";
+ series16.View = splineSeriesView16;
+ series17.Name = "鑺傜渷鍊�(鍏�)";
+ series17.SeriesID = 7;
+ splineSeriesView17.AxisYName = "Secondary AxisY 2";
+ splineSeriesView17.PaneName = "Pane 1";
+ series17.View = splineSeriesView17;
+ series18.Name = "鍘熸车鍚庡帇鍔�";
+ series18.SeriesID = 8;
+ splineSeriesView18.AxisYName = "AxisYEff";
+ series18.View = splineSeriesView18;
chartControl1.SeriesSerializable = new Series[]
{
- series1,
- series2
+ series10,
+ series11,
+ series12,
+ series13,
+ series14,
+ series15,
+ series16,
+ series17,
+ series18
};
- 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 +382,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,176 +394,394 @@
//
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
//
- dataLayoutControl1.Controls.Add(textEdit5);
dataLayoutControl1.Controls.Add(textEdit4);
+ dataLayoutControl1.Controls.Add(textEdit5);
dataLayoutControl1.Controls.Add(textEdit3);
dataLayoutControl1.Controls.Add(textEdit2);
dataLayoutControl1.Controls.Add(textEdit1);
+ dataLayoutControl1.Controls.Add(textEditEffBefore);
+ dataLayoutControl1.Controls.Add(textEditPriceBefore);
+ dataLayoutControl1.Controls.Add(textEditEffAfter);
+ dataLayoutControl1.Controls.Add(textEditPriceAfter);
dataLayoutControl1.Dock = DockStyle.Fill;
dataLayoutControl1.Location = new Point(0, 0);
+ dataLayoutControl1.Margin = new Padding(3, 4, 3, 4);
dataLayoutControl1.Name = "dataLayoutControl1";
dataLayoutControl1.Root = Root;
- dataLayoutControl1.Size = new Size(217, 535);
+ dataLayoutControl1.Size = new Size(248, 697);
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.Location = new Point(171, 134);
+ textEdit4.Margin = new Padding(3, 4, 3, 4);
textEdit4.MenuManager = ribbonControl1;
textEdit4.Name = "textEdit4";
- textEdit4.Size = new Size(109, 20);
+ textEdit4.Size = new Size(62, 24);
textEdit4.StyleController = dataLayoutControl1;
- textEdit4.TabIndex = 7;
+ textEdit4.TabIndex = 4;
+ //
+ // textEdit5
+ //
+ textEdit5.Location = new Point(171, 162);
+ textEdit5.Margin = new Padding(3, 4, 3, 4);
+ textEdit5.MenuManager = ribbonControl1;
+ textEdit5.Name = "textEdit5";
+ textEdit5.Size = new Size(62, 24);
+ textEdit5.StyleController = dataLayoutControl1;
+ textEdit5.TabIndex = 5;
//
// textEdit3
//
- textEdit3.Location = new Point(96, 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(109, 20);
+ textEdit3.Size = new Size(62, 24);
textEdit3.StyleController = dataLayoutControl1;
- textEdit3.TabIndex = 6;
+ textEdit3.TabIndex = 3;
//
// textEdit2
//
- textEdit2.Location = new Point(96, 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(109, 20);
+ textEdit2.Size = new Size(62, 24);
textEdit2.StyleController = dataLayoutControl1;
- textEdit2.TabIndex = 5;
+ textEdit2.TabIndex = 2;
//
// textEdit1
//
- textEdit1.Location = new Point(96, 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(109, 20);
+ textEdit1.Size = new Size(62, 24);
textEdit1.StyleController = dataLayoutControl1;
- textEdit1.TabIndex = 4;
+ textEdit1.TabIndex = 0;
+ //
+ // textEditEffBefore
+ //
+ textEditEffBefore.Location = new Point(79, 240);
+ textEditEffBefore.MenuManager = ribbonControl1;
+ textEditEffBefore.Name = "textEditEffBefore";
+ textEditEffBefore.Size = new Size(154, 24);
+ textEditEffBefore.StyleController = dataLayoutControl1;
+ textEditEffBefore.TabIndex = 6;
+ //
+ // textEditPriceBefore
+ //
+ textEditPriceBefore.Location = new Point(79, 268);
+ textEditPriceBefore.MenuManager = ribbonControl1;
+ textEditPriceBefore.Name = "textEditPriceBefore";
+ textEditPriceBefore.Size = new Size(154, 24);
+ textEditPriceBefore.StyleController = dataLayoutControl1;
+ textEditPriceBefore.TabIndex = 7;
+ //
+ // textEditEffAfter
+ //
+ textEditEffAfter.Location = new Point(79, 362);
+ textEditEffAfter.MenuManager = ribbonControl1;
+ textEditEffAfter.Name = "textEditEffAfter";
+ textEditEffAfter.Size = new Size(154, 24);
+ textEditEffAfter.StyleController = dataLayoutControl1;
+ textEditEffAfter.TabIndex = 8;
+ //
+ // textEditPriceAfter
+ //
+ textEditPriceAfter.Location = new Point(79, 390);
+ textEditPriceAfter.MenuManager = ribbonControl1;
+ textEditPriceAfter.Name = "textEditPriceAfter";
+ textEditPriceAfter.Size = new Size(154, 24);
+ textEditPriceAfter.StyleController = dataLayoutControl1;
+ textEditPriceAfter.TabIndex = 9;
//
// Root
//
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, emptySpaceItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5 });
+ 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.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);
+ layoutControlItem1.Size = new Size(213, 28);
+ layoutControlItem1.Text = "鏁版嵁澶╂暟锛堝ぉ锛夛細";
+ 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.Text = "鎬绘祦閲忥細";
- layoutControlItem2.TextSize = new Size(72, 14);
+ layoutControlItem2.Size = new Size(213, 28);
+ layoutControlItem2.Text = "鎬荤敤姘撮噺锛坢鲁锛夛細";
+ 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.Text = "鎬昏妭鐢甸噺锛�";
- layoutControlItem3.TextSize = new Size(72, 14);
+ layoutControlItem3.Size = new Size(213, 28);
+ layoutControlItem3.Text = "鎬昏妭鐢甸噺锛坘W锛夛細";
+ layoutControlItem3.TextSize = new Size(135, 18);
//
// layoutControlItem4
//
layoutControlItem4.Control = textEdit4;
- layoutControlItem4.Location = new Point(0, 72);
+ layoutControlItem4.Location = new Point(0, 84);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(197, 24);
- layoutControlItem4.Text = "鑺傜數鐜囷細";
- layoutControlItem4.TextSize = new Size(72, 14);
+ 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.Text = "鎬昏妭鐢佃垂鐢細";
- layoutControlItem5.TextSize = new Size(72, 14);
+ layoutControlItem5.Size = new Size(213, 28);
+ layoutControlItem5.Text = "鎬昏妭鐢佃垂鐢紙鍏冿級锛�";
+ 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 = textEditEffBefore;
+ 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 = textEditPriceBefore;
+ 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 = textEditEffAfter;
+ 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 = textEditPriceAfter;
+ 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;
+ //
+ // layoutControlItem6
+ //
+ layoutControlItem6.Control = textEdit3;
+ layoutControlItem6.Location = new Point(0, 56);
+ layoutControlItem6.Name = "layoutControlItem3";
+ layoutControlItem6.Size = new Size(213, 28);
+ layoutControlItem6.Text = "鎬昏妭鐢甸噺锛坘W锛夛細";
+ layoutControlItem6.TextSize = new Size(135, 18);
+ //
+ // layoutControlItem7
+ //
+ 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 = textEditEffBefore;
+ 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 = textEditPriceBefore;
+ 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;
//
// 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)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)xyDiagramPane3).EndInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagramPane4).EndInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy4).EndInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy5).EndInit();
+ ((System.ComponentModel.ISupportInitialize)secondaryAxisy6).EndInit();
+ ((System.ComponentModel.ISupportInitialize)xyDiagram2).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView10).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series10).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView11).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series11).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView12).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series12).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView13).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series13).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView14).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series14).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView15).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series15).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView16).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series16).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView17).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series17).EndInit();
+ ((System.ComponentModel.ISupportInitialize)splineSeriesView18).EndInit();
+ ((System.ComponentModel.ISupportInitialize)series18).EndInit();
((System.ComponentModel.ISupportInitialize)chartControl1).EndInit();
((System.ComponentModel.ISupportInitialize)xtraTabControl1).EndInit();
xtraTabControl1.ResumeLayout(false);
@@ -422,21 +794,40 @@
splitContainerControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)dataLayoutControl1).EndInit();
dataLayoutControl1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)textEdit5.Properties).EndInit();
((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)textEditEffBefore.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditPriceBefore.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditEffAfter.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)textEditPriceAfter.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
- ((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)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();
}
@@ -457,16 +848,36 @@
private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
private DevExpress.XtraDataLayout.DataLayoutControl dataLayoutControl1;
private DevExpress.XtraEditors.TextEdit textEdit5;
- private DevExpress.XtraEditors.TextEdit textEdit4;
private DevExpress.XtraEditors.TextEdit textEdit3;
private DevExpress.XtraEditors.TextEdit textEdit2;
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 layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraEditors.TextEdit textEdit4;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+ private DevExpress.XtraEditors.TextEdit textEditEffBefore;
+ private DevExpress.XtraEditors.TextEdit textEditPriceBefore;
+ private DevExpress.XtraEditors.TextEdit textEditEffAfter;
+ private DevExpress.XtraEditors.TextEdit textEditPriceAfter;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
+ 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;
}
}
\ No newline at end of file
--
Gitblit v1.9.3