From 0324e0782048859cd5e239e155d71aae9dfccd73 Mon Sep 17 00:00:00 2001
From: C3204 <zhengyabo@lanpucloud.cn>
Date: 星期日, 04 一月 2026 17:04:24 +0800
Subject: [PATCH] 添加了历史数据查询界面优化登录界面。
---
LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs | 17
LB_SmartVision/VisionForm.cs | 4
LB_SmartVision/images/favicon.ico | 0
LB_SmartVision/images/05.png | 0
LB_SmartVision/images/02.png | 0
LB_SmartVision/VisionForm.resx | 36 +-
LB_SmartVision/images/lanbao.jpg | 0
LB_SmartVisionLoginUI/App.xaml.cs | 2
LB_SmartVision/images/04.png | 0
LB_SmartVision/images/键盘.ico | 0
LB_SmartVision/images/06.png | 0
LB_SmartVision/images/logo_h.png | 0
/dev/null | 6
LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.resx | 120 ++++++++
LB_SmartVision/images/03.png | 0
LB_SmartVision/images/logo.ico | 0
LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.cs | 82 +++++
LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs | 20
LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs | 376 ++++++++++++++++++++++++++
LB_SmartVision/images/07.png | 0
LB_SmartVision/Program.cs | 72 ++++
LB_SmartVision/VisionForm.Designer.cs | 74 +++--
LB_SmartVision/images/01.JPG | 0
LB_SmartVisionLoginUI/LB_SmartVisionLoginUI.csproj | 1
24 files changed, 733 insertions(+), 77 deletions(-)
diff --git a/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs
new file mode 100644
index 0000000..be5221e
--- /dev/null
+++ b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.Designer.cs
@@ -0,0 +1,376 @@
+锘縩amespace LB_SmartVision.Forms.Pages.HistoricalData
+{
+ partial class HistoricalDataEditPage
+ {
+ /// <summary>
+ /// 蹇呴渶鐨勮璁″櫒鍙橀噺銆�
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// 娓呯悊鎵�鏈夋鍦ㄤ娇鐢ㄧ殑璧勬簮銆�
+ /// </summary>
+ /// <param name="disposing">濡傛灉搴旈噴鏀炬墭绠¤祫婧愶紝涓� true锛涘惁鍒欎负 false銆�</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region 缁勪欢璁捐鍣ㄧ敓鎴愮殑浠ｇ爜
+
+ /// <summary>
+ /// 璁捐鍣ㄦ敮鎸佹墍闇�鐨勬柟娉� - 涓嶈淇敼
+ /// 浣跨敤浠ｇ爜缂栬緫鍣ㄤ慨鏀规鏂规硶鐨勫唴瀹广��
+ /// </summary>
+ private void InitializeComponent()
+ {
+ grpHisData = new ReaLTaiizor.Controls.ParrotGroupBox();
+ tableLayoutPanel1 = new TableLayoutPanel();
+ tableLayoutPanel2 = new TableLayoutPanel();
+ tableLayoutPanel3 = new TableLayoutPanel();
+ tableLayoutPanelSN = new TableLayoutPanel();
+ labelSN = new Label();
+ textBoxSN = new TextBox();
+ tableLayoutPanel5 = new TableLayoutPanel();
+ labelSearchBasis = new Label();
+ comboBoxSearchBasis = new ComboBox();
+ contentContainer = new Panel();
+ tableLayoutPanelTimeSearch = new TableLayoutPanel();
+ dateTimePickerEnd = new DateTimePicker();
+ dateTimePickerStart = new DateTimePicker();
+ labelEndTime = new Label();
+ labelStartTime = new Label();
+ dataGridViewHD = new DataGridView();
+ tableLayoutPanel4 = new TableLayoutPanel();
+ hopeButton1 = new ReaLTaiizor.Controls.HopeButton();
+ hopeButton2 = new ReaLTaiizor.Controls.HopeButton();
+ grpHisData.SuspendLayout();
+ tableLayoutPanel1.SuspendLayout();
+ tableLayoutPanel2.SuspendLayout();
+ tableLayoutPanel3.SuspendLayout();
+ tableLayoutPanelSN.SuspendLayout();
+ tableLayoutPanel5.SuspendLayout();
+ contentContainer.SuspendLayout();
+ tableLayoutPanelTimeSearch.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)dataGridViewHD).BeginInit();
+ tableLayoutPanel4.SuspendLayout();
+ SuspendLayout();
+ //
+ // grpHisData
+ //
+ grpHisData.BorderColor = Color.DodgerBlue;
+ grpHisData.BorderWidth = 1;
+ grpHisData.Controls.Add(tableLayoutPanel1);
+ grpHisData.Dock = DockStyle.Fill;
+ grpHisData.Font = new Font("瀹嬩綋", 12F);
+ grpHisData.Location = new Point(0, 0);
+ grpHisData.Name = "grpHisData";
+ grpHisData.ShowText = true;
+ grpHisData.Size = new Size(866, 580);
+ grpHisData.TabIndex = 0;
+ grpHisData.TabStop = false;
+ grpHisData.Text = "鍘嗗彶鏁版嵁鏌ヨ";
+ grpHisData.TextColor = Color.DodgerBlue;
+ //
+ // tableLayoutPanel1
+ //
+ tableLayoutPanel1.ColumnCount = 1;
+ tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+ tableLayoutPanel1.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 20F));
+ tableLayoutPanel1.Controls.Add(tableLayoutPanel2, 0, 0);
+ tableLayoutPanel1.Controls.Add(tableLayoutPanel4, 0, 1);
+ tableLayoutPanel1.Dock = DockStyle.Fill;
+ tableLayoutPanel1.Location = new Point(3, 26);
+ tableLayoutPanel1.Name = "tableLayoutPanel1";
+ tableLayoutPanel1.RowCount = 2;
+ tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+ tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 45F));
+ tableLayoutPanel1.Size = new Size(860, 551);
+ tableLayoutPanel1.TabIndex = 1;
+ //
+ // tableLayoutPanel2
+ //
+ tableLayoutPanel2.ColumnCount = 2;
+ tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 340F));
+ tableLayoutPanel2.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+ tableLayoutPanel2.Controls.Add(tableLayoutPanel3, 0, 0);
+ tableLayoutPanel2.Controls.Add(dataGridViewHD, 1, 0);
+ tableLayoutPanel2.Dock = DockStyle.Fill;
+ tableLayoutPanel2.Location = new Point(3, 3);
+ tableLayoutPanel2.Name = "tableLayoutPanel2";
+ tableLayoutPanel2.RowCount = 1;
+ tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
+ tableLayoutPanel2.Size = new Size(854, 500);
+ tableLayoutPanel2.TabIndex = 0;
+ tableLayoutPanel2.Paint += tableLayoutPanel2_Paint;
+ //
+ // tableLayoutPanel3
+ //
+ tableLayoutPanel3.ColumnCount = 1;
+ tableLayoutPanel3.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 135F));
+ tableLayoutPanel3.Controls.Add(tableLayoutPanelSN, 0, 2);
+ tableLayoutPanel3.Controls.Add(tableLayoutPanel5, 0, 0);
+ tableLayoutPanel3.Controls.Add(contentContainer, 0, 1);
+ tableLayoutPanel3.Location = new Point(3, 3);
+ tableLayoutPanel3.Name = "tableLayoutPanel3";
+ tableLayoutPanel3.RowCount = 3;
+ tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 45F));
+ tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 90F));
+ tableLayoutPanel3.RowStyles.Add(new RowStyle(SizeType.Absolute, 200F));
+ tableLayoutPanel3.Size = new Size(334, 305);
+ tableLayoutPanel3.TabIndex = 0;
+ //
+ // tableLayoutPanelSN
+ //
+ tableLayoutPanelSN.ColumnCount = 2;
+ tableLayoutPanelSN.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 135F));
+ tableLayoutPanelSN.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+ tableLayoutPanelSN.Controls.Add(labelSN, 0, 0);
+ tableLayoutPanelSN.Controls.Add(textBoxSN, 1, 0);
+ tableLayoutPanelSN.Location = new Point(3, 138);
+ tableLayoutPanelSN.Name = "tableLayoutPanelSN";
+ tableLayoutPanelSN.RowCount = 1;
+ tableLayoutPanelSN.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+ tableLayoutPanelSN.Size = new Size(328, 45);
+ tableLayoutPanelSN.TabIndex = 7;
+ //
+ // labelSN
+ //
+ labelSN.AutoSize = true;
+ labelSN.Dock = DockStyle.Fill;
+ labelSN.ForeColor = SystemColors.Control;
+ labelSN.Location = new Point(3, 0);
+ labelSN.Name = "labelSN";
+ labelSN.Size = new Size(129, 45);
+ labelSN.TabIndex = 6;
+ labelSN.Text = "SN鍙�";
+ labelSN.TextAlign = ContentAlignment.MiddleLeft;
+ //
+ // textBoxSN
+ //
+ textBoxSN.Dock = DockStyle.Fill;
+ textBoxSN.Location = new Point(138, 5);
+ textBoxSN.Margin = new Padding(3, 5, 3, 3);
+ textBoxSN.Name = "textBoxSN";
+ textBoxSN.Size = new Size(187, 30);
+ textBoxSN.TabIndex = 7;
+ //
+ // tableLayoutPanel5
+ //
+ tableLayoutPanel5.ColumnCount = 2;
+ tableLayoutPanel5.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 135F));
+ tableLayoutPanel5.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+ tableLayoutPanel5.Controls.Add(labelSearchBasis, 0, 0);
+ tableLayoutPanel5.Controls.Add(comboBoxSearchBasis, 1, 0);
+ tableLayoutPanel5.Dock = DockStyle.Fill;
+ tableLayoutPanel5.Location = new Point(3, 3);
+ tableLayoutPanel5.Name = "tableLayoutPanel5";
+ tableLayoutPanel5.RowCount = 1;
+ tableLayoutPanel5.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
+ tableLayoutPanel5.Size = new Size(328, 39);
+ tableLayoutPanel5.TabIndex = 0;
+ //
+ // labelSearchBasis
+ //
+ labelSearchBasis.AutoSize = true;
+ labelSearchBasis.Dock = DockStyle.Fill;
+ labelSearchBasis.ForeColor = SystemColors.Control;
+ labelSearchBasis.Location = new Point(3, 0);
+ labelSearchBasis.Name = "labelSearchBasis";
+ labelSearchBasis.Size = new Size(129, 39);
+ labelSearchBasis.TabIndex = 0;
+ labelSearchBasis.Text = "鏌ヨ渚濇嵁";
+ labelSearchBasis.TextAlign = ContentAlignment.MiddleLeft;
+ //
+ // comboBoxSearchBasis
+ //
+ comboBoxSearchBasis.Dock = DockStyle.Fill;
+ comboBoxSearchBasis.FormattingEnabled = true;
+ comboBoxSearchBasis.Location = new Point(138, 5);
+ comboBoxSearchBasis.Margin = new Padding(3, 5, 3, 3);
+ comboBoxSearchBasis.Name = "comboBoxSearchBasis";
+ comboBoxSearchBasis.Size = new Size(187, 28);
+ comboBoxSearchBasis.TabIndex = 1;
+ //
+ // contentContainer
+ //
+ contentContainer.Controls.Add(tableLayoutPanelTimeSearch);
+ contentContainer.Location = new Point(3, 48);
+ contentContainer.Name = "contentContainer";
+ contentContainer.Size = new Size(328, 84);
+ contentContainer.TabIndex = 6;
+ //
+ // tableLayoutPanelTimeSearch
+ //
+ tableLayoutPanelTimeSearch.ColumnCount = 2;
+ tableLayoutPanelTimeSearch.ColumnStyles.Add(new ColumnStyle(SizeType.Absolute, 135F));
+ tableLayoutPanelTimeSearch.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
+ tableLayoutPanelTimeSearch.Controls.Add(dateTimePickerEnd, 1, 1);
+ tableLayoutPanelTimeSearch.Controls.Add(dateTimePickerStart, 1, 0);
+ tableLayoutPanelTimeSearch.Controls.Add(labelEndTime, 0, 1);
+ tableLayoutPanelTimeSearch.Controls.Add(labelStartTime, 0, 0);
+ tableLayoutPanelTimeSearch.Dock = DockStyle.Fill;
+ tableLayoutPanelTimeSearch.Location = new Point(0, 0);
+ tableLayoutPanelTimeSearch.Name = "tableLayoutPanelTimeSearch";
+ tableLayoutPanelTimeSearch.RowCount = 2;
+ tableLayoutPanelTimeSearch.RowStyles.Add(new RowStyle(SizeType.Absolute, 45F));
+ tableLayoutPanelTimeSearch.RowStyles.Add(new RowStyle(SizeType.Absolute, 45F));
+ tableLayoutPanelTimeSearch.Size = new Size(328, 84);
+ tableLayoutPanelTimeSearch.TabIndex = 8;
+ //
+ // dateTimePickerEnd
+ //
+ dateTimePickerEnd.Dock = DockStyle.Fill;
+ dateTimePickerEnd.Location = new Point(138, 50);
+ dateTimePickerEnd.Margin = new Padding(3, 5, 3, 3);
+ dateTimePickerEnd.Name = "dateTimePickerEnd";
+ dateTimePickerEnd.Size = new Size(187, 30);
+ dateTimePickerEnd.TabIndex = 9;
+ //
+ // dateTimePickerStart
+ //
+ dateTimePickerStart.Dock = DockStyle.Fill;
+ dateTimePickerStart.Location = new Point(138, 5);
+ dateTimePickerStart.Margin = new Padding(3, 5, 3, 3);
+ dateTimePickerStart.Name = "dateTimePickerStart";
+ dateTimePickerStart.Size = new Size(187, 30);
+ dateTimePickerStart.TabIndex = 8;
+ //
+ // labelEndTime
+ //
+ labelEndTime.AutoSize = true;
+ labelEndTime.Dock = DockStyle.Fill;
+ labelEndTime.ForeColor = SystemColors.Control;
+ labelEndTime.Location = new Point(3, 45);
+ labelEndTime.Name = "labelEndTime";
+ labelEndTime.Size = new Size(129, 45);
+ labelEndTime.TabIndex = 2;
+ labelEndTime.Text = "鏌ヨ缁撴潫鏃ユ湡";
+ labelEndTime.TextAlign = ContentAlignment.MiddleLeft;
+ //
+ // labelStartTime
+ //
+ labelStartTime.AutoSize = true;
+ labelStartTime.Dock = DockStyle.Fill;
+ labelStartTime.ForeColor = SystemColors.Control;
+ labelStartTime.Location = new Point(3, 0);
+ labelStartTime.Name = "labelStartTime";
+ labelStartTime.Size = new Size(129, 45);
+ labelStartTime.TabIndex = 0;
+ labelStartTime.Text = "鏌ヨ寮�濮嬫棩鏈�";
+ labelStartTime.TextAlign = ContentAlignment.MiddleLeft;
+ //
+ // dataGridViewHD
+ //
+ dataGridViewHD.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize;
+ dataGridViewHD.Dock = DockStyle.Fill;
+ dataGridViewHD.Location = new Point(343, 3);
+ dataGridViewHD.Name = "dataGridViewHD";
+ dataGridViewHD.RowHeadersWidth = 51;
+ dataGridViewHD.Size = new Size(508, 494);
+ dataGridViewHD.TabIndex = 1;
+ //
+ // tableLayoutPanel4
+ //
+ 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.Location = new Point(657, 509);
+ tableLayoutPanel4.Name = "tableLayoutPanel4";
+ tableLayoutPanel4.RowCount = 1;
+ tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 50F));
+ tableLayoutPanel4.Size = new Size(200, 39);
+ tableLayoutPanel4.TabIndex = 1;
+ //
+ // hopeButton1
+ //
+ 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);
+ //
+ // hopeButton2
+ //
+ 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);
+ //
+ // HistoricalDataEditPage
+ //
+ AutoScaleMode = AutoScaleMode.Inherit;
+ BackColor = Color.FromArgb(32, 41, 50);
+ Controls.Add(grpHisData);
+ Name = "HistoricalDataEditPage";
+ Size = new Size(866, 580);
+ grpHisData.ResumeLayout(false);
+ tableLayoutPanel1.ResumeLayout(false);
+ tableLayoutPanel2.ResumeLayout(false);
+ tableLayoutPanel3.ResumeLayout(false);
+ tableLayoutPanelSN.ResumeLayout(false);
+ tableLayoutPanelSN.PerformLayout();
+ tableLayoutPanel5.ResumeLayout(false);
+ tableLayoutPanel5.PerformLayout();
+ contentContainer.ResumeLayout(false);
+ tableLayoutPanelTimeSearch.ResumeLayout(false);
+ tableLayoutPanelTimeSearch.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)dataGridViewHD).EndInit();
+ tableLayoutPanel4.ResumeLayout(false);
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private ReaLTaiizor.Controls.ParrotGroupBox grpHisData;
+ private TableLayoutPanel tableLayoutPanel1;
+ private TableLayoutPanel tableLayoutPanel2;
+ private TableLayoutPanel tableLayoutPanel3;
+ private DataGridView dataGridViewHD;
+ private TableLayoutPanel tableLayoutPanel4;
+ private ReaLTaiizor.Controls.HopeButton hopeButton1;
+ private ReaLTaiizor.Controls.HopeButton hopeButton2;
+ private TableLayoutPanel tableLayoutPanel5;
+ private Label labelSearchBasis;
+ private ComboBox comboBoxSearchBasis;
+ private Panel contentContainer;
+ private TableLayoutPanel tableLayoutPanelSN;
+ private Label labelSN;
+ private TextBox textBoxSN;
+ private TableLayoutPanel tableLayoutPanelTimeSearch;
+ private DateTimePicker dateTimePickerEnd;
+ private DateTimePicker dateTimePickerStart;
+ private Label labelEndTime;
+ private Label labelStartTime;
+ }
+}
diff --git a/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.cs b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.cs
new file mode 100644
index 0000000..d4c539d
--- /dev/null
+++ b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.cs
@@ -0,0 +1,82 @@
+锘縰sing LB_SmartVisionCommon;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace LB_SmartVision.Forms.Pages.HistoricalData
+{
+ public partial class HistoricalDataEditPage : UserControl
+ {
+ public Action<string, LogInfoType> LogInfo;
+
+ private Panel currentContentPanel;
+ public HistoricalDataEditPage()
+ {
+ Name = "HistoricalDataEditPage";
+ Text = "鍘嗗彶鏁版嵁鏌ヨ";
+
+ InitializeComponent();
+ InitializeDataGridView();
+ InitializeComboBox();
+ }
+
+ private void InitializeDataGridView()
+ {
+ // 璁剧疆DataGridView鍒楀
+ dataGridViewHD.ColumnCount = 4;
+
+ int totalWidth = dataGridViewHD.ClientSize.Width;
+ int columnCount = dataGridViewHD.ColumnCount;
+ int columnWidth = totalWidth / columnCount;
+
+ // 璁剧疆鏈�灏忓搴�
+ int minWidth = 100; // 鏈�灏忓搴�
+ if (columnWidth < minWidth)
+ {
+ columnWidth = minWidth;
+ }
+
+ for (int i = 0; i < columnCount; i++)
+ {
+ dataGridViewHD.Columns[i].Width = columnWidth;
+ }
+
+ // 璁剧疆鍒楁爣棰�
+ dataGridViewHD.Columns[0].Name = "SN鍙�";
+ dataGridViewHD.Columns[1].Name = "鏃堕棿";
+ dataGridViewHD.Columns[2].Name = "NG绫�";
+ dataGridViewHD.Columns[3].Name = "缂洪櫡澶у皬";
+
+ dataGridViewHD.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.Fill;
+
+ // 绂佹缂栬緫鍗曞厓鏍硷紙鍙�夛級
+ dataGridViewHD.ReadOnly = true;
+
+ // 鍏佽澶氳閫夋嫨锛堝彲閫夛級
+ dataGridViewHD.MultiSelect = false;
+
+ // 鏄剧ず琛屾爣棰橈紙鍙�夛級
+ dataGridViewHD.RowHeadersVisible = true;
+ }
+
+ private void InitializeComboBox()
+ {
+ comboBoxSearchBasis.Items.Add("鏃ユ湡");
+ comboBoxSearchBasis.Items.Add("SN鍙�");
+
+ // 璁剧疆榛樿閫夋嫨椤�
+ comboBoxSearchBasis.SelectedIndex = 0;
+ }
+
+ private void tableLayoutPanel2_Paint(object sender, PaintEventArgs e)
+ {
+
+ }
+ }
+}
diff --git a/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.resx b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.resx
new file mode 100644
index 0000000..8b2ff64
--- /dev/null
+++ b/LB_SmartVision/Forms/Pages/HistoricalDataPage/HistoricalDataEditPage.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
diff --git a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs
index 564f17c..6996dcc 100644
--- a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs
+++ b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.Designer.cs
@@ -85,12 +85,12 @@
tableLayoutPanel1.Controls.Add(tableLayoutPanel2, 0, 0);
tableLayoutPanel1.Controls.Add(tableLayoutPanel4, 0, 1);
tableLayoutPanel1.Dock = DockStyle.Fill;
- tableLayoutPanel1.Location = new Point(3, 22);
+ tableLayoutPanel1.Location = new Point(3, 26);
tableLayoutPanel1.Name = "tableLayoutPanel1";
tableLayoutPanel1.RowCount = 2;
tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 45F));
- tableLayoutPanel1.Size = new Size(860, 555);
+ tableLayoutPanel1.Size = new Size(860, 551);
tableLayoutPanel1.TabIndex = 1;
//
// tableLayoutPanel2
@@ -105,7 +105,7 @@
tableLayoutPanel2.Name = "tableLayoutPanel2";
tableLayoutPanel2.RowCount = 1;
tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tableLayoutPanel2.Size = new Size(854, 504);
+ tableLayoutPanel2.Size = new Size(854, 500);
tableLayoutPanel2.TabIndex = 0;
//
// tableLayoutPanel3
@@ -139,7 +139,7 @@
textBoxEmployeeID.Location = new Point(107, 187);
textBoxEmployeeID.Margin = new Padding(7);
textBoxEmployeeID.Name = "textBoxEmployeeID";
- textBoxEmployeeID.Size = new Size(219, 26);
+ textBoxEmployeeID.Size = new Size(219, 30);
textBoxEmployeeID.TabIndex = 9;
//
// labelEmployeeID
@@ -159,7 +159,7 @@
textBoxName.Location = new Point(107, 142);
textBoxName.Margin = new Padding(7);
textBoxName.Name = "textBoxName";
- textBoxName.Size = new Size(219, 26);
+ textBoxName.Size = new Size(219, 30);
textBoxName.TabIndex = 7;
//
// labelName
@@ -191,7 +191,7 @@
textBoxPassword.Location = new Point(107, 52);
textBoxPassword.Margin = new Padding(7);
textBoxPassword.Name = "textBoxPassword";
- textBoxPassword.Size = new Size(219, 26);
+ textBoxPassword.Size = new Size(219, 30);
textBoxPassword.TabIndex = 3;
//
// labelPassword
@@ -223,7 +223,7 @@
textBoxUsername.Location = new Point(107, 7);
textBoxUsername.Margin = new Padding(7);
textBoxUsername.Name = "textBoxUsername";
- textBoxUsername.Size = new Size(219, 26);
+ textBoxUsername.Size = new Size(219, 30);
textBoxUsername.TabIndex = 1;
//
// comboBoxPermission
@@ -233,7 +233,7 @@
comboBoxPermission.Location = new Point(107, 97);
comboBoxPermission.Margin = new Padding(7);
comboBoxPermission.Name = "comboBoxPermission";
- comboBoxPermission.Size = new Size(219, 24);
+ comboBoxPermission.Size = new Size(219, 28);
comboBoxPermission.TabIndex = 5;
//
// dataGridViewUM
@@ -243,7 +243,7 @@
dataGridViewUM.Location = new Point(343, 3);
dataGridViewUM.Name = "dataGridViewUM";
dataGridViewUM.RowHeadersWidth = 51;
- dataGridViewUM.Size = new Size(508, 498);
+ dataGridViewUM.Size = new Size(508, 494);
dataGridViewUM.TabIndex = 1;
//
// tableLayoutPanel4
@@ -258,7 +258,7 @@
tableLayoutPanel4.Controls.Add(btnFind, 0, 0);
tableLayoutPanel4.Controls.Add(btnDel, 3, 0);
tableLayoutPanel4.Controls.Add(btnAdd, 2, 0);
- tableLayoutPanel4.Location = new Point(457, 513);
+ tableLayoutPanel4.Location = new Point(457, 509);
tableLayoutPanel4.Name = "tableLayoutPanel4";
tableLayoutPanel4.RowCount = 1;
tableLayoutPanel4.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
diff --git a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs
index 0cd133d..10d745d 100644
--- a/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs
+++ b/LB_SmartVision/Forms/Pages/UserManagementPage/UserManagementEditPage.cs
@@ -20,12 +20,10 @@
public partial class UserManagementEditPage : UserControl
{
public Action<string, LogInfoType> LogInfo;
- RunSettingPage RunSettingPage = new RunSettingPage();
- LayoutPage LayoutPage = new LayoutPage();
- CsvPage CsvPage = new CsvPage();
+
public UserManagementEditPage()
{
- Name = "UserManagementEditPage";
+ Name = "UserManagementEditPage";
Text = "鐢ㄦ埛绠＄悊璁剧疆";
InitializeComponent();
@@ -76,11 +74,14 @@
private void InitializeComboBox()
{
// 娣诲姞鏉冮檺閫夐」
- comboBoxPermission.Items.Add("绠＄悊鍛�");
- comboBoxPermission.Items.Add("鎿嶄綔鍛�");
+ foreach (var item in Enum.GetValues(typeof(UserPermission)))
+ {
+ comboBoxPermission.Items.Add(item.ToString());
+ }
+ //comboBoxPermission.Items.Add("鎿嶄綔鍛�");
// 璁剧疆榛樿閫夋嫨椤�
- comboBoxPermission.SelectedIndex = 1;
+ comboBoxPermission.SelectedIndex = 0;
}
private void ClearInputFields()
@@ -149,5 +150,7 @@
MessageBoxButtons.OK, MessageBoxIcon.Information);
}
}
+
+
}
}
diff --git a/LB_SmartVision/Program.cs b/LB_SmartVision/Program.cs
index e0369dd..1885513 100644
--- a/LB_SmartVision/Program.cs
+++ b/LB_SmartVision/Program.cs
@@ -1,3 +1,6 @@
+using LB_SmartVisionLoginUI;
+using System.Text;
+
namespace LB_SmartVision
{
internal static class Program
@@ -8,10 +11,71 @@
[STAThread]
static void Main()
{
- // To customize application configuration such as set high DPI settings or default font,
- // see https://aka.ms/applicationconfiguration.
- ApplicationConfiguration.Initialize();
- Application.Run(new VisionForm());
+ try
+ {
+ string halconDir = Environment.GetEnvironmentVariable("HALCONROOT");
+ if (string.IsNullOrEmpty(halconDir) || !Directory.Exists(halconDir))
+ {
+ System.Windows.Forms.MessageBox.Show("环境变量缺少HALCONROOT,请确认是否安装正确!");
+ }
+ else
+ {
+ bool ret;
+ System.Threading.Mutex mutex = new System.Threading.Mutex(true, System.Windows.Forms.Application.ProductName, out ret);
+ if (ret)
+ {
+ MainWindow.InstanceLoginandConfirmation().ShowDialog();
+ if (!MainWindow.InstanceLoginandConfirmation().isQuit && MainWindow.InstanceLoginandConfirmation().correctUser)
+ {
+ MainWindow.InstanceLoginandConfirmation().closeLoginFrm();
+ Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
+ System.Windows.Forms.Application.EnableVisualStyles();
+ System.Windows.Forms.Application.SetCompatibleTextRenderingDefault(false);
+ System.Windows.Forms.Application.SetUnhandledExceptionMode(UnhandledExceptionMode.CatchException);
+ System.Windows.Forms.Application.ThreadException += (sender, e) => HandleException(e.Exception);
+ AppDomain.CurrentDomain.UnhandledException += (sender, e) => HandleException(e.ExceptionObject as Exception);
+ // To customize application configuration such as set high DPI settings or default font,
+ // see https://aka.ms/applicationconfiguration.
+ System.Windows.Forms.Application.Run(new VisionForm());
+ }
+ // Main 为你程序的主窗体，如果是控制台程序不用这句
+ mutex.ReleaseMutex();
+ }
+ else
+ {
+ System.Windows.Forms.MessageBox.Show("有一个和本程序相同的应用程序已经在运行，请不要同时运行多个本程序。\r\n这个程序即将退出。", System.Windows.Forms.Application.ProductName, MessageBoxButtons.OK, MessageBoxIcon.Warning);
+ // 提示信息，可以删除。
+ System.Windows.Forms.Application.Exit();//退出程序
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ if (null != ex)
+ {
+ string strMsg = "InitControl failed. Error Code: " + ex.Message;
+ System.Windows.Forms.MessageBox.Show(strMsg);
+ }
+ else
+ {
+ return;
+ }
+ }
+
+ }
+
+ static void HandleException(Exception ex)
+ {
+ // 记录异常信息
+ string logPath = @"\Logs\app_crash.log";
+ Directory.CreateDirectory(Path.GetDirectoryName(logPath));
+ File.AppendAllText(logPath, $"{DateTime.Now}: {ex}\n");
+
+ // 显示错误信息（可选）
+ System.Windows.Forms.MessageBox.Show($"程序发生错误: {ex.Message}", "错误", MessageBoxButtons.OK, MessageBoxIcon.Error);
+
+ // 退出程序
+ Environment.Exit(1);
}
}
}
\ No newline at end of file
diff --git a/LB_SmartVision/VisionForm.Designer.cs b/LB_SmartVision/VisionForm.Designer.cs
index 03ab3bc..4e66a8e 100644
--- a/LB_SmartVision/VisionForm.Designer.cs
+++ b/LB_SmartVision/VisionForm.Designer.cs
@@ -61,11 +61,12 @@
theme_VisionForm.Font = new Font("Microsoft YaHei UI", 12F, FontStyle.Regular, GraphicsUnit.Point, 0);
theme_VisionForm.Image = (Image)resources.GetObject("theme_VisionForm.Image");
theme_VisionForm.Location = new Point(0, 0);
+ theme_VisionForm.Margin = new Padding(4);
theme_VisionForm.Name = "theme_VisionForm";
- theme_VisionForm.Padding = new Padding(10, 70, 10, 9);
+ theme_VisionForm.Padding = new Padding(12, 88, 12, 11);
theme_VisionForm.RoundCorners = true;
theme_VisionForm.Sizable = true;
- theme_VisionForm.Size = new Size(1152, 704);
+ theme_VisionForm.Size = new Size(1440, 880);
theme_VisionForm.SmartBounds = true;
theme_VisionForm.StartPosition = FormStartPosition.WindowsDefaultLocation;
theme_VisionForm.TabIndex = 0;
@@ -75,7 +76,8 @@
//
sc_VisionForm.Dock = DockStyle.Fill;
sc_VisionForm.FixedPanel = FixedPanel.Panel2;
- sc_VisionForm.Location = new Point(10, 70);
+ sc_VisionForm.Location = new Point(12, 88);
+ sc_VisionForm.Margin = new Padding(4);
sc_VisionForm.Name = "sc_VisionForm";
sc_VisionForm.Orientation = Orientation.Horizontal;
//
@@ -86,8 +88,9 @@
// sc_VisionForm.Panel2
//
sc_VisionForm.Panel2.Controls.Add(grb_Info);
- sc_VisionForm.Size = new Size(1132, 625);
- sc_VisionForm.SplitterDistance = 478;
+ sc_VisionForm.Size = new Size(1416, 781);
+ sc_VisionForm.SplitterDistance = 596;
+ sc_VisionForm.SplitterWidth = 5;
sc_VisionForm.TabIndex = 1;
//
// tlp_MainView
@@ -102,23 +105,24 @@
tlp_MainView.Margin = new Padding(2);
tlp_MainView.Name = "tlp_MainView";
tlp_MainView.RowCount = 3;
- tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 48F));
- tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 31F));
+ tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 60F));
+ tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Absolute, 39F));
tlp_MainView.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tlp_MainView.Size = new Size(1132, 478);
+ tlp_MainView.Size = new Size(1416, 596);
tlp_MainView.TabIndex = 1;
tlp_MainView.TagString = null;
+ //
// materialTabControl
//
materialTabControl.AccessibleRole = AccessibleRole.Sound;
materialTabControl.Depth = 0;
materialTabControl.Dock = DockStyle.Fill;
- materialTabControl.Location = new Point(2, 81);
+ materialTabControl.Location = new Point(2, 101);
materialTabControl.Margin = new Padding(2);
materialTabControl.MouseState = MaterialSkin.MouseState.HOVER;
materialTabControl.Name = "materialTabControl";
materialTabControl.SelectedIndex = 0;
- materialTabControl.Size = new Size(1128, 395);
+ materialTabControl.Size = new Size(1412, 493);
materialTabControl.TabIndex = 0;
//
// tlp_VisionMainOperator
@@ -139,11 +143,12 @@
tlp_VisionMainOperator.Controls.Add(btn_GlobalVar, 7, 0);
tlp_VisionMainOperator.Controls.Add(com_ProductName, 8, 0);
tlp_VisionMainOperator.Dock = DockStyle.Fill;
- tlp_VisionMainOperator.Location = new Point(3, 51);
+ tlp_VisionMainOperator.Location = new Point(4, 64);
+ tlp_VisionMainOperator.Margin = new Padding(4);
tlp_VisionMainOperator.Name = "tlp_VisionMainOperator";
tlp_VisionMainOperator.RowCount = 1;
tlp_VisionMainOperator.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tlp_VisionMainOperator.Size = new Size(1126, 25);
+ tlp_VisionMainOperator.Size = new Size(1408, 31);
tlp_VisionMainOperator.TabIndex = 0;
tlp_VisionMainOperator.TagString = null;
//
@@ -152,10 +157,11 @@
ckb_AllowRun.Dock = DockStyle.Fill;
ckb_AllowRun.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
ckb_AllowRun.ForeColor = SystemColors.Control;
- ckb_AllowRun.Location = new Point(3, 3);
+ ckb_AllowRun.Location = new Point(4, 4);
+ ckb_AllowRun.Margin = new Padding(4);
ckb_AllowRun.MinimumSize = new Size(1, 1);
ckb_AllowRun.Name = "ckb_AllowRun";
- ckb_AllowRun.Size = new Size(119, 19);
+ ckb_AllowRun.Size = new Size(148, 23);
ckb_AllowRun.TabIndex = 2;
ckb_AllowRun.Text = "杩愯妯″紡";
//
@@ -170,11 +176,12 @@
btn_Login.Image = null;
btn_Login.ImageAlign = ContentAlignment.MiddleLeft;
btn_Login.InactiveColor = Color.FromArgb(32, 34, 37);
- btn_Login.Location = new Point(128, 3);
+ btn_Login.Location = new Point(160, 4);
+ btn_Login.Margin = new Padding(4);
btn_Login.Name = "btn_Login";
btn_Login.PressedBorderColor = Color.FromArgb(165, 37, 37);
btn_Login.PressedColor = Color.FromArgb(165, 37, 37);
- btn_Login.Size = new Size(119, 19);
+ btn_Login.Size = new Size(148, 23);
btn_Login.TabIndex = 3;
btn_Login.Text = "鐢ㄦ埛鐧诲綍";
btn_Login.TextAlignment = StringAlignment.Center;
@@ -191,11 +198,12 @@
btn_GlobalVar.Image = null;
btn_GlobalVar.ImageAlign = ContentAlignment.MiddleLeft;
btn_GlobalVar.InactiveColor = Color.FromArgb(32, 34, 37);
- btn_GlobalVar.Location = new Point(878, 3);
+ btn_GlobalVar.Location = new Point(1096, 4);
+ btn_GlobalVar.Margin = new Padding(4);
btn_GlobalVar.Name = "btn_GlobalVar";
btn_GlobalVar.PressedBorderColor = Color.FromArgb(165, 37, 37);
btn_GlobalVar.PressedColor = Color.FromArgb(165, 37, 37);
- btn_GlobalVar.Size = new Size(119, 19);
+ btn_GlobalVar.Size = new Size(148, 23);
btn_GlobalVar.TabIndex = 4;
btn_GlobalVar.Text = "鍏ㄥ眬鍙橀噺";
btn_GlobalVar.TextAlignment = StringAlignment.Center;
@@ -209,9 +217,10 @@
com_ProductName.EnabledCalc = true;
com_ProductName.FormattingEnabled = true;
com_ProductName.ItemHeight = 20;
- com_ProductName.Location = new Point(1003, 3);
+ com_ProductName.Location = new Point(1252, 4);
+ com_ProductName.Margin = new Padding(4);
com_ProductName.Name = "com_ProductName";
- com_ProductName.Size = new Size(120, 26);
+ com_ProductName.Size = new Size(152, 26);
com_ProductName.TabIndex = 5;
com_ProductName.SelectedValueChanged += com_ProductName_SelectedValueChanged;
//
@@ -220,10 +229,11 @@
materialTabSelector.BaseTabControl = null;
materialTabSelector.Depth = 0;
materialTabSelector.Dock = DockStyle.Fill;
- materialTabSelector.Location = new Point(3, 3);
+ materialTabSelector.Location = new Point(4, 4);
+ materialTabSelector.Margin = new Padding(4);
materialTabSelector.MouseState = MaterialSkin.MouseState.HOVER;
materialTabSelector.Name = "materialTabSelector";
- materialTabSelector.Size = new Size(1126, 42);
+ materialTabSelector.Size = new Size(1408, 52);
materialTabSelector.TabIndex = 1;
//
// grb_Info
@@ -234,11 +244,11 @@
grb_Info.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
grb_Info.ForeColor = SystemColors.Control;
grb_Info.Location = new Point(0, 0);
- grb_Info.Margin = new Padding(4, 5, 4, 5);
+ grb_Info.Margin = new Padding(5, 6, 5, 6);
grb_Info.MinimumSize = new Size(1, 1);
grb_Info.Name = "grb_Info";
- grb_Info.Padding = new Padding(0, 32, 0, 0);
- grb_Info.Size = new Size(1132, 143);
+ grb_Info.Padding = new Padding(0, 40, 0, 0);
+ grb_Info.Size = new Size(1416, 180);
grb_Info.TabIndex = 1;
grb_Info.Text = "鏃ュ織鏄剧ず鍖猴細";
grb_Info.TextAlignment = ContentAlignment.MiddleLeft;
@@ -248,13 +258,13 @@
rich_Info.Dock = DockStyle.Fill;
rich_Info.FillColor = Color.FromArgb(32, 41, 50);
rich_Info.Font = new Font("瀹嬩綋", 12F, FontStyle.Regular, GraphicsUnit.Point, 134);
- rich_Info.Location = new Point(0, 32);
+ rich_Info.Location = new Point(0, 40);
rich_Info.Margin = new Padding(4, 5, 4, 5);
rich_Info.MinimumSize = new Size(1, 1);
rich_Info.Name = "rich_Info";
rich_Info.Padding = new Padding(2);
rich_Info.ShowText = false;
- rich_Info.Size = new Size(1132, 111);
+ rich_Info.Size = new Size(1416, 140);
rich_Info.TabIndex = 0;
rich_Info.TextAlignment = ContentAlignment.MiddleLeft;
//
@@ -268,7 +278,8 @@
cb_VisionForm.EnableMaximizeButton = true;
cb_VisionForm.EnableMinimizeButton = true;
cb_VisionForm.ForeColor = Color.FromArgb(155, 155, 155);
- cb_VisionForm.Location = new Point(1052, 18);
+ cb_VisionForm.Location = new Point(1315, 18);
+ cb_VisionForm.Margin = new Padding(4);
cb_VisionForm.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
cb_VisionForm.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
cb_VisionForm.Name = "cb_VisionForm";
@@ -278,13 +289,14 @@
//
// VisionForm
//
- AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleDimensions = new SizeF(120F, 120F);
AutoScaleMode = AutoScaleMode.Dpi;
- ClientSize = new Size(1152, 704);
+ ClientSize = new Size(1440, 880);
Controls.Add(theme_VisionForm);
FormBorderStyle = FormBorderStyle.None;
Icon = (Icon)resources.GetObject("$this.Icon");
- MinimumSize = new Size(261, 61);
+ Margin = new Padding(4);
+ MinimumSize = new Size(326, 76);
Name = "VisionForm";
Text = "杞儙澶栬瑙嗚妫�娴嬬郴缁�";
TransparencyKey = Color.Fuchsia;
diff --git a/LB_SmartVision/VisionForm.cs b/LB_SmartVision/VisionForm.cs
index 37fd869..974f174 100644
--- a/LB_SmartVision/VisionForm.cs
+++ b/LB_SmartVision/VisionForm.cs
@@ -3,6 +3,7 @@
using LB_SmartVision.Forms.Pages;
using LB_SmartVision.Forms.Pages.CameraPage;
using LB_SmartVision.Forms.Pages.CommunicatorPage;
+using LB_SmartVision.Forms.Pages.HistoricalData;
using LB_SmartVision.Forms.Pages.MESPage;
using LB_SmartVision.Forms.Pages.MotionControlPage;
using LB_SmartVision.Forms.Pages.ProcessPage;
@@ -42,6 +43,7 @@
{
AllProcessesPage AllProcessesPages = new AllProcessesPage();
CamerasEditPage CamerasEditPage = new CamerasEditPage();
+ HistoricalDataEditPage HistoricalDataEditPage = new HistoricalDataEditPage();
CommunicatorsEditPage CommunicatorsEditPage = new CommunicatorsEditPage();
SettingEditPage SettingEditPage = new SettingEditPage();
MESEditPage MESEditPage = new MESEditPage();
@@ -69,6 +71,8 @@
AllProcessesPages.controlsPanel.Dock = DockStyle.Fill;
materialTabControl.Controls.Add(AllProcessesPages);
+ HistoricalDataEditPage.LogInfo += LogInfo;
+ materialTabControl.Controls.Add(new MyPage(HistoricalDataEditPage));
CamerasEditPage.LogInfo += LogInfo;
materialTabControl.Controls.Add(new MyPage(CamerasEditPage));
diff --git a/LB_SmartVision/VisionForm.resx b/LB_SmartVision/VisionForm.resx
index 5e25f3c..a47feae 100644
--- a/LB_SmartVision/VisionForm.resx
+++ b/LB_SmartVision/VisionForm.resx
@@ -121,24 +121,24 @@
<data name="theme_VisionForm.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
- vAAADrwBlbxySQAAA+JJREFUWEftVkuIHGUQbt34iMEoq2S2q3p3yTJsuqpnJ+L6WBRdwaigohfFgEou
- BkVBUPCBCEG8BXNQ48GLeImCehIJxMsqhsSZruod46K4HtSIGjU+4iOr0c1I9fSsM3/PLNtCPO0H36m/
- evz/X11VnreKVRTAHPOZumkY6lFwqURws3BwZ8ywTQnuiCP/+iTCzY1qaUPzdm/Atf3PaHre6XPsjyQM
- 2xLGV4XwIyX4QRj+UMK/lPFvJTyhBMeV8IgQvmRJuH4Ko+l5p9UjGBbCJ5RxTgj+VMZmXxKcSAjekHE/
- NNs5DgaTKLinEQYVO4Trf1mkV81wixLUslPmA3bzF2XcKeP+hWY/u3n0fCXcrQwLyjAvjNsb1dI6N05P
- mFAIHlHG73sEypPgGwnhfpn0zzH7jzddcK4Q7kqfKNMI4a9K+MwBDgbdeF04MBWsFYYdQvhbLlBvfhKT
- f+vMtLfG7C0JJXxKGY67WnvCmPAFGRs7z42boul5AzHBfdK6TjdQtzPGk8oos5F/5Y7sfVvPhg+lp+1h
- 0yIsxARPmtaN78WEl8eEX+SNclxUhne0glUrNrN9zfMGlPAuZTzaQ99FYfwuDv3ruoLvq5bWaQSvZCfL
- GXUYLwrj240Qxtu2lkSN4FpdWfKZH9jb9RQ1Cq62f9sVOlxUxn3KQXnJ0PO8QxU/jBm1h74v7ZniEG9K
- Hdg/quzvXO709k0Y3u08ucGqWgheX862H4XgxbR47SqU8D1X0EXC2VmGizqDz0xPr0kYH9eO360gNe0b
- jWppozB+1kOQEb5MCLa0C64NoeGrhOGrvH6lhK81GiIvnggmrDLzgvTkvwvDA+5wsU4nhG/m9AUoBD/F
- HFzWN4H0XQn2vF8eXN8Z3FAPYasl59oUYjuB+sTImDB+nhfgYQ39STf4fmu1DHtz+oIUgiM1KkWtwcFw
- sOujVT3hrnaL7UQc+hcL5W+sKIXhw0OVjaW0iwnBc47gqIQ45QY32PKRzv8eTguRYM9SS5YouEEZjv37
- EffbzbjBDdZyxZYQ12EB2qS0bWrJqRVazPDWkojwZbuZrsgZtDJ0iY1g12khEtTicMTvclwn2CKE32YJ
- 7G5PORfZ1HtMCH7MOV4BrQ3XCe92+4onk5Nn2PolDAvWXnuOzAwzo6Nnx4Q3SrojwqfKeMxWMpsXWVs+
- 2WrfKRdbW1W6Hf0shM/33Y7my4PrleFZIfhAaWjU/e5ivlw+y3S2FySMtynjvcrwsFiLJv/RhPBB2ws1
- hK2WcBLBFf1qawlplwvxaQlxe786OOU4PBWsjSO85mBlQ8n99r/BisSdAas4FfgHpdEUZpwUX7sAAAAA
- SUVORK5CYII=
+ vAAADrwBlbxySQAAA+xJREFUWEftV0loFUkYbvcNFzJi0lWdBEPQruqXKEYdcRgz4AYqeplBwYiXEUVB
+ UHAhCEG8iR509OBlmIsOjJ5EBvQSRVHzuvslxjAy8eCG+75GozF+f716L6873fqe2ykffDR59e9/1V8V
+ ow99KARtUg72J5aypGNN8xy2yJPWcleylb5gS13HnJdy+KSW6uJx3b8ZA7TKl6PbMPq3SbMsBUcpyf/2
+ BP8PDh96kr32BX/rS/4O30789grfO1j/k4LQ6p8POO6XdFgpDNbDSZsn2Bt8u2MpWGdKsCPeBNMm3TZp
+ FaUc6/cW20pQEtpsflCllmwxjDbpLKOd9vAZuBPOx5J+86TyMdDbBxsdYLsn+SpUZYQy/imQILLdBIP3
+ cxzEU7Dbns3WejXmcNK/NPGHkajabtUiLYO/nyOgXWdRFeUkDmdnWMOg2ACFFwEn8fzfFeaSxlpjIOlT
+ EHC0HVm/CstSC13B93sVFaOVszDQpwGuYGtQLipnQDlMyLzH12t2zJ8adH/TbeMbVLYROmmyDvjYRrLK
+ aS4Q3Y/gtWjFALtg6KSf4NW02Uj3HwSPzOuw9iAk24sI/p5rm3OV0wyOo+++ww7pzCIViVjvAk+02GyC
+ VlWnpUmw2Qggn+AV0eZ/A61oEtYsOttRwjlE5vy4L61KrabQmjBtV3I/JPtRUptcmy9UBuiM+tLc+bHs
+ aQ1Rn8rNnEC7Gpvr8KcqF0XoHVCbl0qB8p2OEspS8OZmySZrvwqNtbUDMRm3Yj9kj1uB9NXcwLkfjwyu
+ RAhoshuYcHMyGy4DT5T+jKrcjNbJh+yW75QIw62yqhDAvUghwV/Cybrw5UKTDn08GqmTJ9GCx660pscG
+ oPoq2MHzlUWjtN8skjZbRsGFdQpiJoBkVVkFnF3tLcCv+7ZZo31mcYZGLY5RL/kCiQrcaRLFTvrikOxc
+ YJF2PeZ5ZsTmAkNkCtaiW1YAkcTF1sT4YjXFEM3ekMADz+YztM8AULqlqE5nSL5wor3Zkew51nxU4WnP
+ Ij9DlVGLIWCtDhV6FzBWIJH9a3pNaZOGQRsNT6tjWSHB/6LK6OUA/ETJVER/O9dgwcQ7w7XLTG0yjSTO
+ Onp7Ny3A92VuuTD0rbcFbXsUMJonaQwnBV8Rniu4y2sGYbEe5emA8cORV6ZGY3n5UNycC9AKvBHZZRh+
+ iqxoX9BlRWMZozvLLiSEV5V6HT2Bjz9iX0ftaAWE9sDoBV+UlOufY9FeWTmE5OhdgLH8Kxyvhv5GON3q
+ C3NzSvD19C70MTco4JTDZsbtrSzUlLP5DnBV3D745riOp5nr8F/OJcYV65++P2iTfNV/MPoQCcP4AKXR
+ FGYxo/VGAAAAAElFTkSuQmCC
</value>
</data>
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
diff --git a/LB_SmartVision/images/01.JPG b/LB_SmartVision/images/01.JPG
new file mode 100644
index 0000000..8e0a603
--- /dev/null
+++ b/LB_SmartVision/images/01.JPG
Binary files differ
diff --git a/LB_SmartVision/images/02.png b/LB_SmartVision/images/02.png
new file mode 100644
index 0000000..442c206
--- /dev/null
+++ b/LB_SmartVision/images/02.png
Binary files differ
diff --git a/LB_SmartVision/images/03.png b/LB_SmartVision/images/03.png
new file mode 100644
index 0000000..04b53b8
--- /dev/null
+++ b/LB_SmartVision/images/03.png
Binary files differ
diff --git a/LB_SmartVision/images/04.png b/LB_SmartVision/images/04.png
new file mode 100644
index 0000000..2f29be3
--- /dev/null
+++ b/LB_SmartVision/images/04.png
Binary files differ
diff --git a/LB_SmartVision/images/05.png b/LB_SmartVision/images/05.png
new file mode 100644
index 0000000..f72676c
--- /dev/null
+++ b/LB_SmartVision/images/05.png
Binary files differ
diff --git a/LB_SmartVision/images/06.png b/LB_SmartVision/images/06.png
new file mode 100644
index 0000000..73dfbce
--- /dev/null
+++ b/LB_SmartVision/images/06.png
Binary files differ
diff --git a/LB_SmartVision/images/07.png b/LB_SmartVision/images/07.png
new file mode 100644
index 0000000..c75e5bc
--- /dev/null
+++ b/LB_SmartVision/images/07.png
Binary files differ
diff --git a/LB_SmartVision/images/favicon.ico b/LB_SmartVision/images/favicon.ico
new file mode 100644
index 0000000..cd4ac1c
--- /dev/null
+++ b/LB_SmartVision/images/favicon.ico
Binary files differ
diff --git a/LB_SmartVision/images/lanbao.jpg b/LB_SmartVision/images/lanbao.jpg
new file mode 100644
index 0000000..159cab2
--- /dev/null
+++ b/LB_SmartVision/images/lanbao.jpg
Binary files differ
diff --git a/LB_SmartVision/images/logo.ico b/LB_SmartVision/images/logo.ico
new file mode 100644
index 0000000..5887476
--- /dev/null
+++ b/LB_SmartVision/images/logo.ico
Binary files differ
diff --git a/LB_SmartVision/images/logo_h.png b/LB_SmartVision/images/logo_h.png
new file mode 100644
index 0000000..dd1d0b6
--- /dev/null
+++ b/LB_SmartVision/images/logo_h.png
Binary files differ
diff --git "a/LB_SmartVision/images/\351\224\256\347\233\230.ico" "b/LB_SmartVision/images/\351\224\256\347\233\230.ico"
new file mode 100644
index 0000000..135f336
--- /dev/null
+++ "b/LB_SmartVision/images/\351\224\256\347\233\230.ico"
Binary files differ
diff --git a/LB_SmartVisionLoginUI/App.config b/LB_SmartVisionLoginUI/App.config
deleted file mode 100644
index ecdcf8a..0000000
--- a/LB_SmartVisionLoginUI/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
- <startup>
- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
- </startup>
-</configuration>
diff --git a/LB_SmartVisionLoginUI/App.xaml.cs b/LB_SmartVisionLoginUI/App.xaml.cs
index 0309187..3969cb7 100644
--- a/LB_SmartVisionLoginUI/App.xaml.cs
+++ b/LB_SmartVisionLoginUI/App.xaml.cs
@@ -11,7 +11,7 @@
/// <summary>
/// App.xaml 鐨勪氦浜掗�昏緫
/// </summary>
- public partial class App : Application
+ public partial class App : System.Windows.Application
{
}
}
diff --git a/LB_SmartVisionLoginUI/LB_SmartVisionLoginUI.csproj b/LB_SmartVisionLoginUI/LB_SmartVisionLoginUI.csproj
index 40a464c..87e27cb 100644
--- a/LB_SmartVisionLoginUI/LB_SmartVisionLoginUI.csproj
+++ b/LB_SmartVisionLoginUI/LB_SmartVisionLoginUI.csproj
@@ -6,6 +6,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UseWPF>true</UseWPF>
+ <UseWindowsForms>True</UseWindowsForms>
</PropertyGroup>
<ItemGroup>
--
Gitblit v1.9.3