From 833c76cfe3e33a8225051405623711ffceccff2e Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期一, 19 一月 2026 16:50:21 +0800
Subject: [PATCH] 合并冲突
---
LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs | 89 +++++++++++++++++++++++---------------------
1 files changed, 46 insertions(+), 43 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs
index dffa1cc..f4c14e7 100644
--- a/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs
@@ -46,8 +46,8 @@
labelStartTime = new Label();
dataGridViewHD = new DataGridView();
tableLayoutPanel4 = new TableLayoutPanel();
- hopeButton1 = new ReaLTaiizor.Controls.HopeButton();
- hopeButton2 = new ReaLTaiizor.Controls.HopeButton();
+ btnHisDataFind = new ReaLTaiizor.Controls.HopeButton();
+ btnHisDataExport = new ReaLTaiizor.Controls.HopeButton();
grpHisData.SuspendLayout();
tableLayoutPanel1.SuspendLayout();
tableLayoutPanel2.SuspendLayout();
@@ -283,54 +283,56 @@
//
tableLayoutPanel4.Anchor = AnchorStyles.Top | AnchorStyles.Right;
tableLayoutPanel4.ColumnCount = 2;
- tableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
- tableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 50F));
- tableLayoutPanel4.Controls.Add(hopeButton1, 0, 0);
- tableLayoutPanel4.Controls.Add(hopeButton2, 1, 0);
+ tableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+ tableLayoutPanel4.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 33.3333321F));
+ tableLayoutPanel4.Controls.Add(btnHisDataFind, 0, 0);
+ tableLayoutPanel4.Controls.Add(btnHisDataExport, 1, 0);
tableLayoutPanel4.Location = new Point(657, 509);
tableLayoutPanel4.Name = "tableLayoutPanel4";
tableLayoutPanel4.RowCount = 1;
- tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
+ tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
tableLayoutPanel4.Size = new Size(200, 39);
tableLayoutPanel4.TabIndex = 1;
//
- // hopeButton1
+ // btnHisDataFind
//
- hopeButton1.BorderColor = Color.FromArgb(220, 223, 230);
- hopeButton1.ButtonType = ReaLTaiizor.Util.HopeButtonType.Primary;
- hopeButton1.DangerColor = Color.FromArgb(245, 108, 108);
- hopeButton1.DefaultColor = Color.FromArgb(255, 255, 255);
- hopeButton1.Font = new Font("Segoe UI", 12F);
- hopeButton1.HoverTextColor = Color.FromArgb(48, 49, 51);
- hopeButton1.InfoColor = Color.FromArgb(144, 147, 153);
- hopeButton1.Location = new Point(3, 3);
- hopeButton1.Name = "hopeButton1";
- hopeButton1.PrimaryColor = Color.FromArgb(64, 158, 255);
- hopeButton1.Size = new Size(94, 33);
- hopeButton1.SuccessColor = Color.FromArgb(103, 194, 58);
- hopeButton1.TabIndex = 0;
- hopeButton1.Text = "鏌ヨ";
- hopeButton1.TextColor = Color.White;
- hopeButton1.WarningColor = Color.FromArgb(230, 162, 60);
+ btnHisDataFind.BorderColor = Color.FromArgb(220, 223, 230);
+ btnHisDataFind.ButtonType = ReaLTaiizor.Util.HopeButtonType.Primary;
+ btnHisDataFind.DangerColor = Color.FromArgb(245, 108, 108);
+ btnHisDataFind.DefaultColor = Color.FromArgb(255, 255, 255);
+ btnHisDataFind.Font = new Font("Segoe UI", 12F);
+ btnHisDataFind.HoverTextColor = Color.FromArgb(48, 49, 51);
+ btnHisDataFind.InfoColor = Color.FromArgb(144, 147, 153);
+ btnHisDataFind.Location = new Point(3, 3);
+ btnHisDataFind.Name = "btnHisDataFind";
+ btnHisDataFind.PrimaryColor = Color.FromArgb(64, 158, 255);
+ btnHisDataFind.Size = new Size(94, 33);
+ btnHisDataFind.SuccessColor = Color.FromArgb(103, 194, 58);
+ btnHisDataFind.TabIndex = 0;
+ btnHisDataFind.Text = "鏌ヨ";
+ btnHisDataFind.TextColor = Color.White;
+ btnHisDataFind.WarningColor = Color.FromArgb(230, 162, 60);
+ btnHisDataFind.Click += btnHisDataFind_Click;
//
- // hopeButton2
+ // btnHisDataExport
//
- hopeButton2.BorderColor = Color.FromArgb(220, 223, 230);
- hopeButton2.ButtonType = ReaLTaiizor.Util.HopeButtonType.Primary;
- hopeButton2.DangerColor = Color.FromArgb(245, 108, 108);
- hopeButton2.DefaultColor = Color.FromArgb(255, 255, 255);
- hopeButton2.Font = new Font("Segoe UI", 12F);
- hopeButton2.HoverTextColor = Color.FromArgb(48, 49, 51);
- hopeButton2.InfoColor = Color.FromArgb(144, 147, 153);
- hopeButton2.Location = new Point(103, 3);
- hopeButton2.Name = "hopeButton2";
- hopeButton2.PrimaryColor = Color.FromArgb(64, 158, 255);
- hopeButton2.Size = new Size(94, 33);
- hopeButton2.SuccessColor = Color.FromArgb(103, 194, 58);
- hopeButton2.TabIndex = 1;
- hopeButton2.Text = "瀵煎嚭";
- hopeButton2.TextColor = Color.White;
- hopeButton2.WarningColor = Color.FromArgb(230, 162, 60);
+ btnHisDataExport.BorderColor = Color.FromArgb(220, 223, 230);
+ btnHisDataExport.ButtonType = ReaLTaiizor.Util.HopeButtonType.Primary;
+ btnHisDataExport.DangerColor = Color.FromArgb(245, 108, 108);
+ btnHisDataExport.DefaultColor = Color.FromArgb(255, 255, 255);
+ btnHisDataExport.Font = new Font("Segoe UI", 12F);
+ btnHisDataExport.HoverTextColor = Color.FromArgb(48, 49, 51);
+ btnHisDataExport.InfoColor = Color.FromArgb(144, 147, 153);
+ btnHisDataExport.Location = new Point(103, 3);
+ btnHisDataExport.Name = "btnHisDataExport";
+ btnHisDataExport.PrimaryColor = Color.FromArgb(64, 158, 255);
+ btnHisDataExport.Size = new Size(94, 33);
+ btnHisDataExport.SuccessColor = Color.FromArgb(103, 194, 58);
+ btnHisDataExport.TabIndex = 1;
+ btnHisDataExport.Text = "瀵煎嚭";
+ btnHisDataExport.TextColor = Color.White;
+ btnHisDataExport.WarningColor = Color.FromArgb(230, 162, 60);
+ btnHisDataExport.Click += btnHisDataExport_Click;
//
// HistoricalDataEditPage
//
@@ -340,6 +342,7 @@
Name = "HistoricalDataEditPage";
Size = new Size(866, 580);
grpHisData.ResumeLayout(false);
+ grpHisData.PerformLayout();
tableLayoutPanel1.ResumeLayout(false);
tableLayoutPanel2.ResumeLayout(false);
tableLayoutPanel3.ResumeLayout(false);
@@ -363,8 +366,8 @@
private TableLayoutPanel tableLayoutPanel3;
private DataGridView dataGridViewHD;
private TableLayoutPanel tableLayoutPanel4;
- private ReaLTaiizor.Controls.HopeButton hopeButton1;
- private ReaLTaiizor.Controls.HopeButton hopeButton2;
+ private ReaLTaiizor.Controls.HopeButton btnHisDataFind;
+ private ReaLTaiizor.Controls.HopeButton btnHisDataExport;
private TableLayoutPanel tableLayoutPanel5;
private Label labelSearchBasis;
private TableLayoutPanel tableLayoutPanelSN;
--
Gitblit v1.9.3