From dfe7e1653f8309e23e4c314cd58ac4ff7ce49dbc Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 14:50:47 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/PBS.WinFrmUI.DataAnalysis/EndPressAnalysis.Designer.cs | 72 ++++++++++++++++++++++++++++++++++-
1 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EndPressAnalysis.Designer.cs b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EndPressAnalysis.Designer.cs
index 2130c20..8b21732 100644
--- a/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EndPressAnalysis.Designer.cs
+++ b/WinFrmUI/PBS.WinFrmUI.DataAnalysis/EndPressAnalysis.Designer.cs
@@ -42,11 +42,22 @@
ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
chartControl1 = new ChartControl();
+ xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
+ xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
+ xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+ gridControl1 = new DevExpress.XtraGrid.GridControl();
+ gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
((System.ComponentModel.ISupportInitialize)ribbonControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)chartControl1).BeginInit();
((System.ComponentModel.ISupportInitialize)xyDiagram1).BeginInit();
((System.ComponentModel.ISupportInitialize)series1).BeginInit();
((System.ComponentModel.ISupportInitialize)splineSeriesView1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)xtraTabControl1).BeginInit();
+ xtraTabControl1.SuspendLayout();
+ xtraTabPage1.SuspendLayout();
+ xtraTabPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)gridView1).BeginInit();
SuspendLayout();
//
// ribbonControl1
@@ -115,7 +126,7 @@
chartControl1.Legend.LegendID = -1;
chartControl1.Legend.MarkerMode = LegendMarkerMode.CheckBoxAndMarker;
chartControl1.Legend.Visibility = DevExpress.Utils.DefaultBoolean.False;
- chartControl1.Location = new Point(0, 128);
+ chartControl1.Location = new Point(0, 0);
chartControl1.Margin = new Padding(2);
chartControl1.Name = "chartControl1";
series1.Name = "SeriesQH";
@@ -126,8 +137,52 @@
{
series1
};
- chartControl1.Size = new Size(1003, 561);
+ chartControl1.Size = new Size(1001, 535);
chartControl1.TabIndex = 0;
+ //
+ // xtraTabControl1
+ //
+ xtraTabControl1.Dock = DockStyle.Fill;
+ xtraTabControl1.Location = new Point(0, 128);
+ xtraTabControl1.Name = "xtraTabControl1";
+ xtraTabControl1.SelectedTabPage = xtraTabPage1;
+ xtraTabControl1.Size = new Size(1003, 561);
+ xtraTabControl1.TabIndex = 2;
+ xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] { xtraTabPage1, xtraTabPage2 });
+ //
+ // xtraTabPage1
+ //
+ xtraTabPage1.Controls.Add(chartControl1);
+ xtraTabPage1.Name = "xtraTabPage1";
+ xtraTabPage1.Size = new Size(1001, 535);
+ xtraTabPage1.Text = "鍥捐〃";
+ //
+ // xtraTabPage2
+ //
+ xtraTabPage2.Controls.Add(gridControl1);
+ xtraTabPage2.Name = "xtraTabPage2";
+ xtraTabPage2.Size = new Size(1001, 535);
+ xtraTabPage2.Text = "鏁版嵁";
+ //
+ // gridControl1
+ //
+ gridControl1.Dock = DockStyle.Fill;
+ gridControl1.Location = new Point(0, 0);
+ gridControl1.MainView = gridView1;
+ gridControl1.MenuManager = ribbonControl1;
+ gridControl1.Name = "gridControl1";
+ gridControl1.Size = new Size(1001, 535);
+ gridControl1.TabIndex = 0;
+ gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
+ //
+ // gridView1
+ //
+ gridView1.GridControl = gridControl1;
+ gridView1.Name = "gridView1";
+ gridView1.OptionsBehavior.Editable = false;
+ gridView1.OptionsDragDrop.AllowDataReordering = false;
+ gridView1.OptionsDragDrop.AllowSortedDataDragDrop = false;
+ gridView1.OptionsView.ShowGroupPanel = false;
//
// EndPressAnalysis
//
@@ -135,7 +190,7 @@
Appearance.Options.UseBackColor = true;
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- Controls.Add(chartControl1);
+ Controls.Add(xtraTabControl1);
Controls.Add(ribbonControl1);
Name = "EndPressAnalysis";
Size = new Size(1003, 689);
@@ -144,6 +199,12 @@
((System.ComponentModel.ISupportInitialize)splineSeriesView1).EndInit();
((System.ComponentModel.ISupportInitialize)series1).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();
ResumeLayout(false);
PerformLayout();
}
@@ -155,5 +216,10 @@
private DevExpress.XtraBars.Ribbon.RibbonPageGroup ribbonPageGroup1;
private DevExpress.XtraBars.BarButtonItem barButtonItem1;
private DevExpress.XtraCharts.ChartControl chartControl1;
+ private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
+ private DevExpress.XtraGrid.GridControl gridControl1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3