From e5b2104f15ae58bd4ea033fa23263b3a19513ec2 Mon Sep 17 00:00:00 2001
From: "nodyang@aliyun.com" <nodyang@aliyun.com>
Date: Mon, 18 Nov 2024 09:20:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 RfidWeb/FormMain.Designer.cs          |  47 +++++++-------------
 RfidWeb/FormMain.cs                   |  25 ++++++++++-
 RfidWeb/Frm/FormAccount.Designer.cs   |   8 ++--
 RfidWeb/Frm/FromAlarmLog.Designer.cs  |  60 ++++++++++++-------------
 RfidWeb/Frm/UserAlarmShow.Designer.cs |  61 ++++++++++++++++++++------
 RfidWeb/Frm/UserAlarmShow.cs          |  22 +++++++---
 RfidWeb/H.ico                         | Bin 0 -> 67646 bytes
 RfidWeb/Program.cs                    |  14 ++++++
 RfidWeb/RfidWeb.csproj                |   4 +-
 RfidWeb/logo.ico                      | Bin 67646 -> 0 bytes
 Tool/Model/CacheKeyManager.cs         |   2 +-
 11 files changed, 154 insertions(+), 89 deletions(-)
 create mode 100644 RfidWeb/H.ico
 delete mode 100644 RfidWeb/logo.ico

diff --git a/RfidWeb/FormMain.Designer.cs b/RfidWeb/FormMain.Designer.cs
index 71a3870..6fa9f7d 100644
--- a/RfidWeb/FormMain.Designer.cs
+++ b/RfidWeb/FormMain.Designer.cs
@@ -34,11 +34,11 @@
             this.panContent = new System.Windows.Forms.Panel();
             this.panel9 = new System.Windows.Forms.Panel();
             this.panel8 = new System.Windows.Forms.Panel();
+            this.buttonUpdateLog = new System.Windows.Forms.Button();
             this.hslLanternSimplePlc = new HslControls.HslLanternSimple();
             this.button2 = new System.Windows.Forms.Button();
             this.button1 = new System.Windows.Forms.Button();
             this.btnShow = new System.Windows.Forms.Button();
-            this.button3 = new System.Windows.Forms.Button();
             this.btnMes = new System.Windows.Forms.Button();
             this.btnAccount = new System.Windows.Forms.Button();
             this.btnAlarm = new System.Windows.Forms.Button();
@@ -50,7 +50,6 @@
             this.labTime = new System.Windows.Forms.Label();
             this.label2 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
-            this.buttonUpdateLog = new System.Windows.Forms.Button();
             this.panel1.SuspendLayout();
             this.panel6.SuspendLayout();
             this.panel7.SuspendLayout();
@@ -117,7 +116,6 @@
             this.panel8.Controls.Add(this.button2);
             this.panel8.Controls.Add(this.button1);
             this.panel8.Controls.Add(this.btnShow);
-            this.panel8.Controls.Add(this.button3);
             this.panel8.Controls.Add(this.btnMes);
             this.panel8.Controls.Add(this.btnAccount);
             this.panel8.Controls.Add(this.btnAlarm);
@@ -130,6 +128,21 @@
             this.panel8.Size = new System.Drawing.Size(370, 954);
             this.panel8.TabIndex = 3;
             // 
+            // buttonUpdateLog
+            // 
+            this.buttonUpdateLog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(182)))), ((int)(((byte)(173)))));
+            this.buttonUpdateLog.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
+            this.buttonUpdateLog.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            this.buttonUpdateLog.ForeColor = System.Drawing.SystemColors.Window;
+            this.buttonUpdateLog.Location = new System.Drawing.Point(22, 522);
+            this.buttonUpdateLog.Margin = new System.Windows.Forms.Padding(4);
+            this.buttonUpdateLog.Name = "buttonUpdateLog";
+            this.buttonUpdateLog.Size = new System.Drawing.Size(300, 65);
+            this.buttonUpdateLog.TabIndex = 11;
+            this.buttonUpdateLog.Text = "参数修改记录";
+            this.buttonUpdateLog.UseVisualStyleBackColor = false;
+            this.buttonUpdateLog.Click += new System.EventHandler(this.buttonUpdateLog_Click);
+            // 
             // hslLanternSimplePlc
             // 
             this.hslLanternSimplePlc.Location = new System.Drawing.Point(22, 641);
@@ -181,18 +194,6 @@
             this.btnShow.UseVisualStyleBackColor = false;
             this.btnShow.Click += new System.EventHandler(this.btnShow_Click);
             // 
-            // button3
-            // 
-            this.button3.BackgroundImage = global::RfidWeb.Properties.Resources.消音开;
-            this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.button3.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.button3.Location = new System.Drawing.Point(135, 812);
-            this.button3.Margin = new System.Windows.Forms.Padding(4);
-            this.button3.Name = "button3";
-            this.button3.Size = new System.Drawing.Size(166, 87);
-            this.button3.TabIndex = 5;
-            this.button3.UseVisualStyleBackColor = true;
-            // 
             // btnMes
             // 
             this.btnMes.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(182)))), ((int)(((byte)(173)))));
@@ -338,21 +339,6 @@
             this.label1.TabIndex = 0;
             this.label1.Text = "佳通RFID层合裁切设备";
             // 
-            // buttonUpdateLog
-            // 
-            this.buttonUpdateLog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(21)))), ((int)(((byte)(182)))), ((int)(((byte)(173)))));
-            this.buttonUpdateLog.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch;
-            this.buttonUpdateLog.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            this.buttonUpdateLog.ForeColor = System.Drawing.SystemColors.Window;
-            this.buttonUpdateLog.Location = new System.Drawing.Point(22, 522);
-            this.buttonUpdateLog.Margin = new System.Windows.Forms.Padding(4);
-            this.buttonUpdateLog.Name = "buttonUpdateLog";
-            this.buttonUpdateLog.Size = new System.Drawing.Size(300, 65);
-            this.buttonUpdateLog.TabIndex = 11;
-            this.buttonUpdateLog.Text = "参数修改记录";
-            this.buttonUpdateLog.UseVisualStyleBackColor = false;
-            this.buttonUpdateLog.Click += new System.EventHandler(this.buttonUpdateLog_Click);
-            // 
             // FormMain
             // 
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
@@ -385,7 +371,6 @@
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.Button btnShow;
-        private System.Windows.Forms.Button button3;
         private System.Windows.Forms.Button button2;
         private System.Windows.Forms.Button button1;
         private HslControls.HslLanternSimple hslLanternSimplePlc;
diff --git a/RfidWeb/FormMain.cs b/RfidWeb/FormMain.cs
index 169ea85..744ca08 100644
--- a/RfidWeb/FormMain.cs
+++ b/RfidWeb/FormMain.cs
@@ -21,12 +21,15 @@ using Tool.Model;
 
 namespace RfidWeb
 {
+  
     public partial class FormMain : Form
     {
         private ILogNet logNet = ILogNetFactory.GetLogNet;
         private ICache cache;
         TimerX _timer;
         List<Button> buttons=new List<Button>();
+
+      
         public FormMain()
         {
             cache=Cache.Default;
@@ -66,7 +69,7 @@ namespace RfidWeb
             buttons.Add(btnAlarm);
             buttons.Add(btnAccount);
             buttons.Add(btnMes);
-
+            buttons.Add(buttonUpdateLog);
             btnShow_Click(new object(), EventArgs.Empty);
 
         }
@@ -76,15 +79,19 @@ namespace RfidWeb
         /// <summary>移除过期的缓存项</summary>
         void TimeState(Object state)
         {
+           
+
             bool isExit = UserManager.IsExit();
             this.Invoke(() =>
             {
 
                 labTime.Text = DateTime.Now.ToFullString();
-
+              
 
                 this.Invoke(() =>
                 {
+                   
+
                     //不存在
                     if (!isExit)
                     {
@@ -101,12 +108,26 @@ namespace RfidWeb
 
             });
 
+            ThreadPoolX.QueueUserWorkItem(ShowLed);
             ThreadPoolX.QueueUserWorkItem(UpdateLog);
+          
         }
 
         private UpdateLogService updateLogService = new UpdateLogService();
         private PointService pointService = new PointService();
+
+        private void ShowLed()
+        {
+            if (cache.ContainsKey(CacheKeyManager.Home)) return;
+            cache.Set(CacheKeyManager.Home, DateTime.Now, TimeSpan.FromSeconds(10));
+            bool result =PlcConnect.Instance.ReadPlcType().IsSuccess;
+            hslLanternSimplePlc.LanternBackground = result ? Color.LimeGreen : Color.Red;
+            cache.Remove(CacheKeyManager.Home);
+        }
         
+        /// <summary>
+        /// 参数变化
+        /// </summary>
         private void UpdateLog()
         {
 
diff --git a/RfidWeb/Frm/FormAccount.Designer.cs b/RfidWeb/Frm/FormAccount.Designer.cs
index c277209..9f85feb 100644
--- a/RfidWeb/Frm/FormAccount.Designer.cs
+++ b/RfidWeb/Frm/FormAccount.Designer.cs
@@ -236,9 +236,9 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
             dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
             dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
@@ -249,7 +249,7 @@
             this.ID,
             this.UserName,
             this.RoleName});
-            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle2.BackColor = System.Drawing.SystemColors.Window;
             dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
@@ -261,7 +261,7 @@
             this.dataGridView1.Location = new System.Drawing.Point(0, 0);
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.ReadOnly = true;
-            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
             dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Control;
             dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.WindowText;
diff --git a/RfidWeb/Frm/FromAlarmLog.Designer.cs b/RfidWeb/Frm/FromAlarmLog.Designer.cs
index 7eb1355..5d13f4e 100644
--- a/RfidWeb/Frm/FromAlarmLog.Designer.cs
+++ b/RfidWeb/Frm/FromAlarmLog.Designer.cs
@@ -29,10 +29,10 @@
         private void InitializeComponent()
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FromAlarmLog));
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle7 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle8 = new System.Windows.Forms.DataGridViewCellStyle();
-            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle6 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
             this.panelTop = new System.Windows.Forms.Panel();
             this.ucBtnSelect = new HZH_Controls.Controls.UCBtnExt();
             this.textBoxSel = new HZH_Controls.Controls.TextBoxEx();
@@ -129,40 +129,40 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
-            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle5.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle5.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle5.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle5;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.ID,
             this.UserName,
             this.RoleName,
             this.Alarm});
-            dataGridViewCellStyle7.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle7.BackColor = System.Drawing.SystemColors.Window;
-            dataGridViewCellStyle7.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle7.ForeColor = System.Drawing.SystemColors.ControlText;
-            dataGridViewCellStyle7.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle7.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle7.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
-            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle7;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.BackColor = System.Drawing.SystemColors.Window;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle3.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle3.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView1.DefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridView1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dataGridView1.Location = new System.Drawing.Point(0, 80);
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.ReadOnly = true;
-            dataGridViewCellStyle8.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
-            dataGridViewCellStyle8.BackColor = System.Drawing.SystemColors.Control;
-            dataGridViewCellStyle8.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle8.ForeColor = System.Drawing.SystemColors.WindowText;
-            dataGridViewCellStyle8.SelectionBackColor = System.Drawing.SystemColors.Highlight;
-            dataGridViewCellStyle8.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
-            dataGridViewCellStyle8.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
-            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle8;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.RowHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.Size = new System.Drawing.Size(910, 693);
             this.dataGridView1.TabIndex = 3;
@@ -170,8 +170,8 @@
             // ID
             // 
             this.ID.DataPropertyName = "ID";
-            dataGridViewCellStyle6.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
-            this.ID.DefaultCellStyle = dataGridViewCellStyle6;
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            this.ID.DefaultCellStyle = dataGridViewCellStyle2;
             this.ID.HeaderText = "ID";
             this.ID.Name = "ID";
             this.ID.ReadOnly = true;
diff --git a/RfidWeb/Frm/UserAlarmShow.Designer.cs b/RfidWeb/Frm/UserAlarmShow.Designer.cs
index b436492..5e7293a 100644
--- a/RfidWeb/Frm/UserAlarmShow.Designer.cs
+++ b/RfidWeb/Frm/UserAlarmShow.Designer.cs
@@ -29,6 +29,10 @@
         private void InitializeComponent()
         {
             System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle1 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle2 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle3 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle4 = new System.Windows.Forms.DataGridViewCellStyle();
+            System.Windows.Forms.DataGridViewCellStyle dataGridViewCellStyle5 = new System.Windows.Forms.DataGridViewCellStyle();
             this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel();
             this.dataGridView2 = new System.Windows.Forms.DataGridView();
             this.dataGridViewTextBoxColumn1 = new System.Windows.Forms.DataGridViewTextBoxColumn();
@@ -100,14 +104,34 @@
             // 
             this.dataGridView2.AllowUserToAddRows = false;
             this.dataGridView2.AllowUserToDeleteRows = false;
+            this.dataGridView2.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
+            dataGridViewCellStyle1.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle1.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle1.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle1.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView2.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle1;
             this.dataGridView2.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView2.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.dataGridViewTextBoxColumn1,
             this.dataGridViewTextBoxColumn2});
+            dataGridViewCellStyle2.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleLeft;
+            dataGridViewCellStyle2.BackColor = System.Drawing.Color.Red;
+            dataGridViewCellStyle2.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle2.ForeColor = System.Drawing.SystemColors.ControlText;
+            dataGridViewCellStyle2.SelectionBackColor = System.Drawing.Color.Red;
+            dataGridViewCellStyle2.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle2.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
+            this.dataGridView2.DefaultCellStyle = dataGridViewCellStyle2;
             this.dataGridView2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.dataGridView2.Location = new System.Drawing.Point(458, 3);
             this.dataGridView2.Name = "dataGridView2";
             this.dataGridView2.ReadOnly = true;
+            dataGridViewCellStyle3.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle3.Font = new System.Drawing.Font("宋体", 15F);
+            this.dataGridView2.RowsDefaultCellStyle = dataGridViewCellStyle3;
             this.dataGridView2.RowTemplate.Height = 23;
             this.dataGridView2.Size = new System.Drawing.Size(449, 270);
             this.dataGridView2.TabIndex = 1;
@@ -115,7 +139,7 @@
             // dataGridViewTextBoxColumn1
             // 
             this.dataGridViewTextBoxColumn1.DataPropertyName = "AlartTime";
-            this.dataGridViewTextBoxColumn1.HeaderText = "警告时间";
+            this.dataGridViewTextBoxColumn1.HeaderText = "提醒时间";
             this.dataGridViewTextBoxColumn1.Name = "dataGridViewTextBoxColumn1";
             this.dataGridViewTextBoxColumn1.ReadOnly = true;
             this.dataGridViewTextBoxColumn1.Width = 150;
@@ -124,7 +148,7 @@
             // 
             this.dataGridViewTextBoxColumn2.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill;
             this.dataGridViewTextBoxColumn2.DataPropertyName = "Msg";
-            this.dataGridViewTextBoxColumn2.HeaderText = "警告内容";
+            this.dataGridViewTextBoxColumn2.HeaderText = "提醒内容";
             this.dataGridViewTextBoxColumn2.Name = "dataGridViewTextBoxColumn2";
             this.dataGridViewTextBoxColumn2.ReadOnly = true;
             // 
@@ -132,6 +156,14 @@
             // 
             this.dataGridView1.AllowUserToAddRows = false;
             this.dataGridView1.AllowUserToDeleteRows = false;
+            dataGridViewCellStyle4.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle4.BackColor = System.Drawing.SystemColors.Control;
+            dataGridViewCellStyle4.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle4.ForeColor = System.Drawing.SystemColors.WindowText;
+            dataGridViewCellStyle4.SelectionBackColor = System.Drawing.SystemColors.Highlight;
+            dataGridViewCellStyle4.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
+            dataGridViewCellStyle4.WrapMode = System.Windows.Forms.DataGridViewTriState.True;
+            this.dataGridView1.ColumnHeadersDefaultCellStyle = dataGridViewCellStyle4;
             this.dataGridView1.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.dataGridView1.Columns.AddRange(new System.Windows.Forms.DataGridViewColumn[] {
             this.al,
@@ -140,12 +172,13 @@
             this.dataGridView1.Location = new System.Drawing.Point(3, 3);
             this.dataGridView1.Name = "dataGridView1";
             this.dataGridView1.ReadOnly = true;
-            dataGridViewCellStyle1.BackColor = System.Drawing.Color.Red;
-            dataGridViewCellStyle1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
-            dataGridViewCellStyle1.ForeColor = System.Drawing.Color.White;
-            dataGridViewCellStyle1.SelectionBackColor = System.Drawing.Color.Red;
-            dataGridViewCellStyle1.SelectionForeColor = System.Drawing.Color.White;
-            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle1;
+            dataGridViewCellStyle5.Alignment = System.Windows.Forms.DataGridViewContentAlignment.MiddleCenter;
+            dataGridViewCellStyle5.BackColor = System.Drawing.Color.Red;
+            dataGridViewCellStyle5.Font = new System.Drawing.Font("宋体", 15F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
+            dataGridViewCellStyle5.ForeColor = System.Drawing.Color.White;
+            dataGridViewCellStyle5.SelectionBackColor = System.Drawing.Color.Red;
+            dataGridViewCellStyle5.SelectionForeColor = System.Drawing.Color.White;
+            this.dataGridView1.RowsDefaultCellStyle = dataGridViewCellStyle5;
             this.dataGridView1.RowTemplate.Height = 23;
             this.dataGridView1.Size = new System.Drawing.Size(449, 270);
             this.dataGridView1.TabIndex = 0;
@@ -154,8 +187,10 @@
             // 
             this.al.DataPropertyName = "AlartTime";
             this.al.HeaderText = "警告时间";
+            this.al.MaxInputLength = 500;
             this.al.Name = "al";
             this.al.ReadOnly = true;
+            this.al.Resizable = System.Windows.Forms.DataGridViewTriState.False;
             this.al.Width = 150;
             // 
             // Msg
@@ -233,7 +268,6 @@
             this.hslLabelComboQDWD2SS.TextInfo = "裁刀2温度:";
             this.hslLabelComboQDWD2SS.TextUnit = "°C";
             this.hslLabelComboQDWD2SS.TextValue = "00";
-            this.hslLabelComboQDWD2SS.TextValueBackcolor = System.Drawing.Color.IndianRed;
             this.hslLabelComboQDWD2SS.TextValueColorTransFun = null;
             // 
             // hslLabelComboQDWD1SS
@@ -262,7 +296,6 @@
             this.hslLabelComboCQ_Chip2_counter.TextInfo = "裁刀2数量:";
             this.hslLabelComboCQ_Chip2_counter.TextUnit = "Pcs";
             this.hslLabelComboCQ_Chip2_counter.TextValue = "00";
-            this.hslLabelComboCQ_Chip2_counter.TextValueBackcolor = System.Drawing.Color.LawnGreen;
             this.hslLabelComboCQ_Chip2_counter.TextValueColorTransFun = null;
             // 
             // hslLabelComboCQ_Chip1_counter
@@ -615,11 +648,7 @@
 
         private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1;
         private System.Windows.Forms.DataGridView dataGridView1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn al;
-        private System.Windows.Forms.DataGridViewTextBoxColumn Msg;
         private System.Windows.Forms.DataGridView dataGridView2;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
-        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.GroupBox groupBox1;
@@ -657,5 +686,9 @@
         private HslControls.HslLabelCombo hslLabelComboLaminated;
         private HslControls.HslLabelCombo hslLabelComboReceiving;
         private HslControls.HslLabelCombo hslLabelComboFelt;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn1;
+        private System.Windows.Forms.DataGridViewTextBoxColumn dataGridViewTextBoxColumn2;
+        private System.Windows.Forms.DataGridViewTextBoxColumn al;
+        private System.Windows.Forms.DataGridViewTextBoxColumn Msg;
     }
 }
diff --git a/RfidWeb/Frm/UserAlarmShow.cs b/RfidWeb/Frm/UserAlarmShow.cs
index 99def84..c1a653f 100644
--- a/RfidWeb/Frm/UserAlarmShow.cs
+++ b/RfidWeb/Frm/UserAlarmShow.cs
@@ -11,6 +11,7 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
+using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Text;
@@ -20,15 +21,18 @@ using DB.Service;
 using HslControls;
 using Tool;
 using Tool.Model;
+using HslCommunication.LogNet;
 
 namespace RfidWeb.Frm
 {
     public partial class UserAlarmShow : UserControl
     {
+        private ICache cache = Cache.Default;
+        private ILogNet logNet = ILogNetFactory.GetLogNet;
         private TimerX _timer;
-        private HimAlarmManager himAlarmManager = new HimAlarmManager();
-        PromptAlarmManager promptAlarmManager = new PromptAlarmManager();
-        AlarmLogService alarmLogService = new AlarmLogService();
+        private readonly HimAlarmManager himAlarmManager = new HimAlarmManager();
+        readonly PromptAlarmManager promptAlarmManager = new PromptAlarmManager();
+        readonly AlarmLogService alarmLogService = new AlarmLogService();
 
         public UserAlarmShow()
         {
@@ -37,12 +41,18 @@ namespace RfidWeb.Frm
             _timer.Async = true;
         }
 
+        Stopwatch stopwatc=new Stopwatch();
+
         void TimeState(Object state)
         {
+
+            stopwatc.Restart();
             FillAlarmGrid();
             FillPromptGrid();
             FillAlartLed();
             FillhslLabelCombo();
+            stopwatc.Stop();
+            logNet.WriteInfo("运行时间:"+stopwatc.Elapsed.TotalMilliseconds);
         }
 
         /// <summary>
@@ -98,14 +108,16 @@ namespace RfidWeb.Frm
             });
         }
 
-        private ICache cache = Cache.Default;
+      
 
+        /// <summary>
+        /// 异常信息
+        /// </summary>
         void FillAlartLed()
         {
             var plcCh = cache.Get<PlcBoolModel>(CacheKeyManager.CH_alarm);
             var plcCq= cache.Get<PlcBoolModel>(CacheKeyManager.CQ_alarm);
             var plcStop = cache.Get<List<bool>>(CacheKeyManager.estop_temporary_storage);
-
            var plcAlarm= cache.Get<List<bool>>(CacheKeyManager.Prompt_alarm); 
 
             if (plcStop==null || plcCh ==null || plcCq==null ) return;
diff --git a/RfidWeb/H.ico b/RfidWeb/H.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6b69f087e35035e4a12fe5e5ab37090d8ad74243
GIT binary patch
literal 67646
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
UWrbA8E_;2&@3Zyy-1>X}f6z1Rr2qf`

literal 0
HcmV?d00001

diff --git a/RfidWeb/Program.cs b/RfidWeb/Program.cs
index ebf97b4..abcc881 100644
--- a/RfidWeb/Program.cs
+++ b/RfidWeb/Program.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Windows.Forms;
 
 namespace RfidWeb
@@ -11,6 +12,19 @@ namespace RfidWeb
         [STAThread]
         static void Main()
         {
+            // 获取当前运行的进程名
+            string currentProcessName = Process.GetCurrentProcess().ProcessName;
+
+            // 检查是否存在其他同名进程
+            var processes = Process.GetProcessesByName(currentProcessName);
+            if (processes.Length > 1)
+            {
+                // 如果有多个同名进程，说明已经有实例在运行
+                MessageBox.Show("应用程序已在运行！", "提示", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                return;
+            }
+
+
             AppContext.SetSwitch("Npgsql.EnableLegacyTimestampBehavior", true);
             AppContext.SetSwitch("Npgsql.DisableDateTimeInfinityConversions", true);
             Application.EnableVisualStyles();
diff --git a/RfidWeb/RfidWeb.csproj b/RfidWeb/RfidWeb.csproj
index 4365234..07b01a1 100644
--- a/RfidWeb/RfidWeb.csproj
+++ b/RfidWeb/RfidWeb.csproj
@@ -48,7 +48,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>logo.ico</ApplicationIcon>
+    <ApplicationIcon>H.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Chloe">
@@ -286,7 +286,7 @@
   <ItemGroup>
     <None Include="Resources\左箭头.png" />
     <None Include="Resources\右箭头.png" />
-    <Content Include="logo.ico" />
+    <Content Include="H.ico" />
     <Content Include="read.txt" />
     <None Include="Resources\海威图标在上.jpg" />
     <None Include="Resources\log.png" />
diff --git a/RfidWeb/logo.ico b/RfidWeb/logo.ico
deleted file mode 100644
index ca9609ddc287991aed9638384f90df554b5ebcc5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 67646
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
VIQsY%@88|g$FH%z&#mwK{{jT8e#ig-

diff --git a/Tool/Model/CacheKeyManager.cs b/Tool/Model/CacheKeyManager.cs
index 4a72748..6283d44 100644
--- a/Tool/Model/CacheKeyManager.cs
+++ b/Tool/Model/CacheKeyManager.cs
@@ -20,6 +20,6 @@
 
         public static readonly string Prompt_alarmList = "Prompt_alarmList";
 
-
+        public static readonly string Home = "Home";
     }
 }
\ No newline at end of file