diff --git a/RfidWeb/FormMain.Designer.cs b/RfidWeb/FormMain.Designer.cs index a9fceb3..013d883 100644 --- a/RfidWeb/FormMain.Designer.cs +++ b/RfidWeb/FormMain.Designer.cs @@ -190,7 +190,6 @@ // // btnExit // - this.btnExit.BackgroundImage = global::RfidWeb.Properties.Resources.btn; this.btnExit.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Stretch; this.btnExit.Font = new System.Drawing.Font("宋体", 30F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); this.btnExit.Location = new System.Drawing.Point(22, 812); diff --git a/RfidWeb/Frm/UserAlarmShow.Designer.cs b/RfidWeb/Frm/UserAlarmShow.Designer.cs new file mode 100644 index 0000000..c5c60b8 --- /dev/null +++ b/RfidWeb/Frm/UserAlarmShow.Designer.cs @@ -0,0 +1,45 @@ +namespace RfidWeb.Frm +{ + partial class UserAlarmShow + { + /// + /// 必需的设计器变量。 + /// + private System.ComponentModel.IContainer components = null; + + /// + /// 清理所有正在使用的资源。 + /// + /// 如果应释放托管资源，为 true；否则为 false。 + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region 组件设计器生成的代码 + + /// + /// 设计器支持所需的方法 - 不要修改 + /// 使用代码编辑器修改此方法的内容。 + /// + private void InitializeComponent() + { + this.SuspendLayout(); + // + // UserAlarmShow + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Name = "UserAlarmShow"; + this.Size = new System.Drawing.Size(910, 935); + this.ResumeLayout(false); + + } + + #endregion + } +} diff --git a/RfidWeb/Frm/UserAlarmShow.cs b/RfidWeb/Frm/UserAlarmShow.cs new file mode 100644 index 0000000..fbf71d3 --- /dev/null +++ b/RfidWeb/Frm/UserAlarmShow.cs @@ -0,0 +1,20 @@ +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 RfidWeb.Frm +{ + public partial class UserAlarmShow : UserControl + { + public UserAlarmShow() + { + InitializeComponent(); + } + } +} diff --git a/RfidWeb/Frm/UserAlarmShow.resx b/RfidWeb/Frm/UserAlarmShow.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/RfidWeb/Frm/UserAlarmShow.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/RfidWeb/Properties/Resources.Designer.cs b/RfidWeb/Properties/Resources.Designer.cs index 2b8ebe3..e501e61 100644 --- a/RfidWeb/Properties/Resources.Designer.cs +++ b/RfidWeb/Properties/Resources.Designer.cs @@ -60,16 +60,6 @@ namespace RfidWeb.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap _2024_11_12_170621_851 { - get { - object obj = ResourceManager.GetObject("2024-11-12_170621_851", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -80,36 +70,6 @@ namespace RfidWeb.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap btn { - get { - object obj = ResourceManager.GetObject("btn", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap btn_sel1 { - get { - object obj = ResourceManager.GetObject("btn_sel1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap frm21 { - get { - object obj = ResourceManager.GetObject("frm21", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -140,16 +100,6 @@ namespace RfidWeb.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap mesnac { - get { - object obj = ResourceManager.GetObject("mesnac", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -180,16 +130,6 @@ namespace RfidWeb.Properties { } } - /// - /// 查找 System.Drawing.Bitmap 类型的本地化资源。 - /// - internal static System.Drawing.Bitmap 海威物联 { - get { - object obj = ResourceManager.GetObject("海威物联", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); - } - } - /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// diff --git a/RfidWeb/Properties/Resources.resx b/RfidWeb/Properties/Resources.resx index 2c030f8..a9adf0d 100644 --- a/RfidWeb/Properties/Resources.resx +++ b/RfidWeb/Properties/Resources.resx @@ -118,12 +118,6 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\log.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\海威物联.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\海威图标在上.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -133,11 +127,9 @@ ..\Resources\frmMain.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\2024-11-12_170621_851.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\mesnac1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\照明开.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 照明开 ..\Resources\frmBei.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -148,25 +140,15 @@ ..\Resources\左箭头.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\btn_sel1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\照明开.png;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 照明开 - ..\Resources\消音开.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\btn.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\frm21.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\照明关.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\log.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\2024-11-12_170754_114.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/RfidWeb/Resources/2024-11-12_170621_851.png b/RfidWeb/Resources/2024-11-12_170621_851.png deleted file mode 100644 index 7e865a7..0000000 Binary files a/RfidWeb/Resources/2024-11-12_170621_851.png and /dev/null differ diff --git a/RfidWeb/Resources/btn.png b/RfidWeb/Resources/btn.png deleted file mode 100644 index 287817a..0000000 Binary files a/RfidWeb/Resources/btn.png and /dev/null differ diff --git a/RfidWeb/Resources/btn_sel1.png b/RfidWeb/Resources/btn_sel1.png deleted file mode 100644 index 74570a8..0000000 Binary files a/RfidWeb/Resources/btn_sel1.png and /dev/null differ diff --git a/RfidWeb/Resources/frm21.png b/RfidWeb/Resources/frm21.png deleted file mode 100644 index 8a88b3d..0000000 Binary files a/RfidWeb/Resources/frm21.png and /dev/null differ diff --git a/RfidWeb/Resources/mesnac1.png b/RfidWeb/Resources/mesnac1.png deleted file mode 100644 index 1a4ad6f..0000000 Binary files a/RfidWeb/Resources/mesnac1.png and /dev/null differ diff --git a/RfidWeb/Resources/海威物联.jpg b/RfidWeb/Resources/海威物联.jpg deleted file mode 100644 index d1f72cf..0000000 Binary files a/RfidWeb/Resources/海威物联.jpg and /dev/null differ diff --git a/RfidWeb/RfidWeb.csproj b/RfidWeb/RfidWeb.csproj index 036ba07..acdd13a 100644 --- a/RfidWeb/RfidWeb.csproj +++ b/RfidWeb/RfidWeb.csproj @@ -154,6 +154,12 @@ FormRegister.cs + + UserControl + + + UserAlarmShow.cs + UserControl @@ -188,6 +194,9 @@ FormRegister.cs + + UserAlarmShow.cs + UserMain.cs @@ -234,21 +243,9 @@ - - - - - - - - - - - - @@ -259,10 +256,8 @@ - -