diff --git a/HighWayIot.Common/GeneralUtils.cs b/HighWayIot.Common/GeneralUtils.cs deleted file mode 100644 index 5c7395f..0000000 --- a/HighWayIot.Common/GeneralUtils.cs +++ /dev/null @@ -1,52 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Reflection; -using System.Text; -using System.Threading.Tasks; - -namespace HighWayIot.Common -{ - /// - /// 通用工具类 - /// - public class GeneralUtils - { - /// - /// 获取枚举类值的description元数据(没有Des返回名字) - /// - /// - public static string GetEnumStringDescription(Enum enumValue) - { - string value = enumValue.ToString(); - FieldInfo field = enumValue.GetType().GetField(value); - object[] objs = field.GetCustomAttributes(typeof(DescriptionAttribute), false); //获取描述属性 - if (objs.Length == 0) //当描述属性没有时,直接返回名称 - return value; - DescriptionAttribute descriptionAttribute = (DescriptionAttribute)objs[0]; - return descriptionAttribute.Description; - } - - /// - /// 获取枚举类的键值对 - /// - /// - /// - public static IEnumerable> GetEnumKeyValuePairs() where T : Enum - { - var enumType = typeof(T); - var fields = enumType.GetFields(); - - foreach (var fi in fields) - { - if (fi.FieldType != enumType || !fi.IsLiteral) - continue; - - var name = fi.Name; - var value = (int)enumType.GetField(name).GetValue(null); - yield return new KeyValuePair(name, value); - } - } - } -} diff --git a/HighWayIot.Common/HighWayIot.Common.csproj b/HighWayIot.Common/HighWayIot.Common.csproj index bd3af4d..077edf4 100644 --- a/HighWayIot.Common/HighWayIot.Common.csproj +++ b/HighWayIot.Common/HighWayIot.Common.csproj @@ -47,7 +47,6 @@ - diff --git a/HighWayIot.Plc/PlcEntity/RgvStationEnum.cs b/HighWayIot.Plc/PlcEntity/RgvStationEnum.cs index 3f039e4..ea801d8 100644 --- a/HighWayIot.Plc/PlcEntity/RgvStationEnum.cs +++ b/HighWayIot.Plc/PlcEntity/RgvStationEnum.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -8,22 +9,55 @@ namespace HighWayIot.Plc.PlcEntity { public enum RgvStationEnum { + [Description("裝圈工位RIFD触发")] RgvRingInstallStation = 1, + + [Description("1#工位RIFD触发")] Rgv1Station, + + [Description("2#工位RIFD触发")] Rgv2Station, + + [Description("3#工位RIFD触发")] Rgv3Station, + + [Description("4#工位RIFD触发")] Rgv4Station, + + [Description("5#工位RIFD触发")] Rgv5Station, + + [Description("卸胎工位RIFD触发")] RgvTireUnloadingStation, + + [Description("弯道等待工位RIFD触发")] RgvBendWaitStation, + + [Description("3#称重工位RIFD触发")] Rgv3WeighCalibrationStation, + + [Description("4#称重工位RIFD触发")] Rgv4WeighCalibrationStation, + + [Description("5#称重工位RIFD触发")] Rgv5WeighCalibrationStation, + + [Description("主线入端识别工位RIFD触发")] RgvMainLineEntranceStation, + + [Description("主线出端识别工位RIFD触发")] RgvMainLineExitStation, + + [Description("辅线1#工位RIFD触发")] RgvAuxline1Station, + + [Description("辅线2#工位RIFD触发")] RgvAuxline2Station, + + [Description("辅线3#工位RIFD触发")] RgvAuxline3Station, + + [Description("辅线4#工位RIFD触发")] RgvAuxline4Station, } } diff --git a/HighWayIot.Plc/PlcHelper/WorkStationWrite.cs b/HighWayIot.Plc/PlcHelper/WorkStationWrite.cs index 3453205..df6c892 100644 --- a/HighWayIot.Plc/PlcHelper/WorkStationWrite.cs +++ b/HighWayIot.Plc/PlcHelper/WorkStationWrite.cs @@ -10,13 +10,13 @@ namespace HighWayIot.Plc.PlcHelper public class WorkStationWrite { /// - /// RFID工位识别 + /// RFID工位识别写入 /// /// /// public bool WriteStationSingal(RgvStationEnum rgvStation) { - + return false; } } } diff --git a/HighWayIot.Rfid/BaseRFIDDataAnalyse.cs b/HighWayIot.Rfid/BaseRFIDDataAnalyse.cs index f1df7da..ae2eb7d 100644 --- a/HighWayIot.Rfid/BaseRFIDDataAnalyse.cs +++ b/HighWayIot.Rfid/BaseRFIDDataAnalyse.cs @@ -20,7 +20,7 @@ namespace HighWayIot.Rfid /// /// /// - public BaseReciveDataEntity BaseAnalyse(byte[] data) + public static BaseReciveDataEntity BaseReceiveAnalyse(byte[] data) { BaseReciveDataEntity result = new BaseReciveDataEntity(); @@ -64,7 +64,7 @@ namespace HighWayIot.Rfid /// /// /// - public byte[] BaseSendDataAnalyse(BaseSendDataEntity entity) + public static byte[] BaseSendDataAnalyse(BaseSendDataEntity entity) { byte[] result = new byte[entity.Data.Length + 6]; diff --git a/HighWayIot.Rfid/Entity/Receive02HEntity.cs b/HighWayIot.Rfid/Entity/Receive02HEntity.cs new file mode 100644 index 0000000..d6f556b --- /dev/null +++ b/HighWayIot.Rfid/Entity/Receive02HEntity.cs @@ -0,0 +1,51 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Security.Cryptography; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Rfid.Entity +{ + public class Receive02HEntity + { + /// + /// 标签个数 + /// + public byte TagCount { get; set; } + + /// + /// 时间段内读到的数据集合 + /// + public List Data { get; set; } + + } + + public class Single02HReceive + { + /// + /// 读取次数 + /// + public byte Count { get; set; } + + /// + /// 信号强度 + /// + public byte RSSI { get; set; } + + /// + /// 天线端口 + /// + public byte Ant { get; set; } + + /// + /// EPC区域 + /// + public byte[] PC { get; set; } + + /// + /// EPC内容 + /// + public byte[] EPC { get; set; } + } +} diff --git a/HighWayIot.Rfid/HighWayIot.Rfid.csproj b/HighWayIot.Rfid/HighWayIot.Rfid.csproj index efeb9f3..4d481a3 100644 --- a/HighWayIot.Rfid/HighWayIot.Rfid.csproj +++ b/HighWayIot.Rfid/HighWayIot.Rfid.csproj @@ -45,12 +45,12 @@ - - - - - + + + + + diff --git a/HighWayIot.Rfid/RfidDataAnalyse.cs b/HighWayIot.Rfid/RfidDataAnalyse.cs new file mode 100644 index 0000000..368520e --- /dev/null +++ b/HighWayIot.Rfid/RfidDataAnalyse.cs @@ -0,0 +1,79 @@ +using HighWayIot.Rfid.Entity; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace HighWayIot.Rfid +{ + public class RfidDataAnalyse + { + /// + /// 02H时间段盘点发送 + /// + /// 盘点时间毫秒数 + /// + public byte[] Send02H(ushort millisecond) + { + byte[] bytes = BitConverter.GetBytes(millisecond); + + BaseSendDataEntity entity = new BaseSendDataEntity() + { + Code = 0x02, + Data = bytes + }; + + return BaseRFIDDataAnalyse.BaseSendDataAnalyse(entity); + } + + /// + /// 接受02H盘点数据 (默认EPC 12位) + /// + /// + /// + public Receive02HEntity Receive02H(byte[] bytes) + { + BaseReciveDataEntity recive = BaseRFIDDataAnalyse.BaseReceiveAnalyse(bytes); + byte[] DataBytes = recive.Data; + + Receive02HEntity entity = new Receive02HEntity(); + + //取读到多少个标签 + int index = 0; + entity.TagCount = DataBytes[index]; + index++; + + //取每一个读到的标签 + entity.Data = new List(); + for (int i = 0; i < entity.TagCount; i++) + { + Single02HReceive EPCData = new Single02HReceive(); + + //取单个标签读取的次数 + EPCData.Count = DataBytes[index]; + index++; + + //取信号强度 + EPCData.RSSI = DataBytes[index]; + index++; + + //取天线端口 + EPCData.Ant = DataBytes[index]; + index++; + + //取EPC区域 + Array.Copy(DataBytes, index, EPCData.PC, 0, 2); + index += 2; + + //取读到标签的EPC + Array.Copy(DataBytes, index, EPCData.EPC, 0, 12); + index += 12; + + entity.Data.Add(EPCData); + } + + return entity; + } + } +} diff --git a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj index d52e9f2..94d4302 100644 --- a/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj +++ b/HighWayIot.TouchSocket/HighWayIot.TouchSocket.csproj @@ -67,8 +67,8 @@ - + @@ -76,5 +76,11 @@ + + + {DEABC30C-EC6F-472E-BD67-D65702FDAF74} + HighWayIot.Log4net + + \ No newline at end of file diff --git a/HighWayIot.TouchSocket/TouchSocketTcpClient.cs b/HighWayIot.TouchSocket/TouchSocketTcpClient.cs index 3fa7d32..46c0d66 100644 --- a/HighWayIot.TouchSocket/TouchSocketTcpClient.cs +++ b/HighWayIot.TouchSocket/TouchSocketTcpClient.cs @@ -1,9 +1,5 @@ using HighWayIot.Log4net; using System; -using System.Collections.Generic; -using System.Linq; -using System.Net.Http; -using System.Net.Sockets; using System.Text; using System.Threading.Tasks; using TouchSocket.Core; diff --git a/HighWayIot.Winform/Business/GeneralUtils.cs b/HighWayIot.Winform/Business/GeneralUtils.cs index eec34d6..b1e28de 100644 --- a/HighWayIot.Winform/Business/GeneralUtils.cs +++ b/HighWayIot.Winform/Business/GeneralUtils.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.ComponentModel; using System.Linq; using System.Net; +using System.Reflection; using System.Text; using System.Threading.Tasks; @@ -79,5 +80,41 @@ namespace HighWayIot.Winform.Business return default; } } + + /// + /// 获取枚举类的键值对 + /// + /// + /// + public static IEnumerable> GetEnumKeyValuePairs() where T : Enum + { + var enumType = typeof(T); + var fields = enumType.GetFields(); + + foreach (var fi in fields) + { + if (fi.FieldType != enumType || !fi.IsLiteral) + continue; + + var name = fi.Name; + var value = (int)enumType.GetField(name).GetValue(null); + yield return new KeyValuePair(name, value); + } + } + + /// + /// 获取枚举类值的description元数据(没有Des返回名字) + /// + /// + public static string GetEnumStringDescription(Enum enumValue) + { + string value = enumValue.ToString(); + FieldInfo field = enumValue.GetType().GetField(value); + object[] objs = field.GetCustomAttributes(typeof(DescriptionAttribute), false); //获取描述属性 + if (objs.Length == 0) //当描述属性没有时,直接返回名称 + return value; + DescriptionAttribute descriptionAttribute = (DescriptionAttribute)objs[0]; + return descriptionAttribute.Description; + } } } diff --git a/HighWayIot.Winform/HighWayIot.Winform.csproj b/HighWayIot.Winform/HighWayIot.Winform.csproj index b6a2634..26e17fa 100644 --- a/HighWayIot.Winform/HighWayIot.Winform.csproj +++ b/HighWayIot.Winform/HighWayIot.Winform.csproj @@ -70,11 +70,17 @@ - + UserControl - - DeviceDataManage.cs + + RFIDParamSettingPage.cs + + + UserControl + + + EquipParamSettingPage.cs UserControl @@ -218,8 +224,11 @@ Resources.resx True - - DeviceDataManage.cs + + RFIDParamSettingPage.cs + + + EquipParamSettingPage.cs AlarmLogPage.cs diff --git a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs index 7bccf94..4dddd92 100644 --- a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs +++ b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs @@ -66,6 +66,8 @@ namespace HighWayIot.Winform.MainForm this.TimeStripLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.TimeDisplayTimer = new System.Windows.Forms.Timer(this.components); this.DataRefreshTimer = new System.Windows.Forms.Timer(this.components); + this.RFIDParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DeviceParamManageToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MainMenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -227,10 +229,12 @@ namespace HighWayIot.Winform.MainForm // // DeviceDataManageToolStripMenuItem // + this.DeviceDataManageToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.RFIDParamManageToolStripMenuItem, + this.DeviceParamManageToolStripMenuItem}); this.DeviceDataManageToolStripMenuItem.Name = "DeviceDataManageToolStripMenuItem"; - this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(92, 22); - this.DeviceDataManageToolStripMenuItem.Text = "设备数据管理"; - this.DeviceDataManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(68, 22); + this.DeviceDataManageToolStripMenuItem.Text = "参数管理"; // // UserControlTabs // @@ -328,6 +332,20 @@ namespace HighWayIot.Winform.MainForm // this.DataRefreshTimer.Tick += new System.EventHandler(this.DataRefreshTimer_Tick); // + // RFIDParamManageToolStripMenuItem + // + this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem"; + this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置"; + this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // DeviceParamManageToolStripMenuItem + // + this.DeviceParamManageToolStripMenuItem.Name = "DeviceParamManageToolStripMenuItem"; + this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); + this.DeviceParamManageToolStripMenuItem.Text = "设备参数配置"; + this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // // BaseForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); @@ -385,5 +403,7 @@ namespace HighWayIot.Winform.MainForm private ToolStripMenuItem MaterialTypeConfigStripItem; private ToolStripMenuItem DeviceDataManageToolStripMenuItem; private Timer DataRefreshTimer; + private ToolStripMenuItem RFIDParamManageToolStripMenuItem; + private ToolStripMenuItem DeviceParamManageToolStripMenuItem; } } \ No newline at end of file diff --git a/HighWayIot.Winform/MainForm/BaseForm.cs b/HighWayIot.Winform/MainForm/BaseForm.cs index 1d7adbf..377938f 100644 --- a/HighWayIot.Winform/MainForm/BaseForm.cs +++ b/HighWayIot.Winform/MainForm/BaseForm.cs @@ -2,6 +2,7 @@ using HighWayIot.Winform.Business; using HighWayIot.Winform.UserControlPages; using HighWayIot.Winform.UserControlPages.MaterialConfigPages; +using HighWayIot.Winform.UserControlPages.ParamConfigPages; using HighWayIot.Winform.UserControlPages.SysConfigPages; using System; using System.Collections.Generic; @@ -122,8 +123,11 @@ namespace HighWayIot.Winform.MainForm case "生产排程": UserPanelSwitch(typeof(ProductionScheduling), button.Text); break; - case "设备数据管理": - UserPanelSwitch(typeof(ProductionScheduling), button.Text); + case "RFID参数配置": + UserPanelSwitch(typeof(RFIDParamSettingPage), button.Text); + break; + case "设备参数配置": + UserPanelSwitch(typeof(EquipParamSettingPage), button.Text); break; case "": break; diff --git a/HighWayIot.Winform/UserControlPages/DeviceDataManage.Designer.cs b/HighWayIot.Winform/UserControlPages/DeviceDataManage.Designer.cs deleted file mode 100644 index 00e4139..0000000 --- a/HighWayIot.Winform/UserControlPages/DeviceDataManage.Designer.cs +++ /dev/null @@ -1,111 +0,0 @@ -namespace HighWayIot.Winform.UserControlPages -{ - partial class DeviceDataManage - { - /// - /// 必需的设计器变量。 - /// - 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.comboBox1 = new System.Windows.Forms.ComboBox(); - this.groupBox1 = new System.Windows.Forms.GroupBox(); - this.label1 = new System.Windows.Forms.Label(); - this.button1 = new System.Windows.Forms.Button(); - this.button2 = new System.Windows.Forms.Button(); - this.groupBox1.SuspendLayout(); - this.SuspendLayout(); - // - // comboBox1 - // - this.comboBox1.FormattingEnabled = true; - this.comboBox1.Location = new System.Drawing.Point(94, 30); - this.comboBox1.Name = "comboBox1"; - this.comboBox1.Size = new System.Drawing.Size(110, 20); - this.comboBox1.TabIndex = 0; - // - // groupBox1 - // - this.groupBox1.Controls.Add(this.button2); - this.groupBox1.Controls.Add(this.button1); - this.groupBox1.Controls.Add(this.label1); - this.groupBox1.Controls.Add(this.comboBox1); - this.groupBox1.Location = new System.Drawing.Point(3, 3); - this.groupBox1.Name = "groupBox1"; - this.groupBox1.Size = new System.Drawing.Size(355, 179); - this.groupBox1.TabIndex = 1; - this.groupBox1.TabStop = false; - this.groupBox1.Text = "小车参数设置"; - // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(23, 34); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(65, 12); - this.label1.TabIndex = 1; - this.label1.Text = "设备号选择"; - // - // button1 - // - this.button1.Font = new System.Drawing.Font("宋体", 12F); - this.button1.Location = new System.Drawing.Point(25, 70); - this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(126, 41); - this.button1.TabIndex = 2; - this.button1.Text = "从PLC上传"; - this.button1.UseVisualStyleBackColor = true; - // - // button2 - // - this.button2.Font = new System.Drawing.Font("宋体", 12F); - this.button2.Location = new System.Drawing.Point(195, 70); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(126, 41); - this.button2.TabIndex = 3; - this.button2.Text = "下传到PLC"; - this.button2.UseVisualStyleBackColor = true; - // - // DeviceDataManage - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.SystemColors.ControlLight; - this.Controls.Add(this.groupBox1); - this.Name = "DeviceDataManage"; - this.Size = new System.Drawing.Size(1293, 884); - this.groupBox1.ResumeLayout(false); - this.groupBox1.PerformLayout(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.ComboBox comboBox1; - private System.Windows.Forms.GroupBox groupBox1; - private System.Windows.Forms.Button button1; - private System.Windows.Forms.Label label1; - private System.Windows.Forms.Button button2; - } -} diff --git a/HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.Designer.cs b/HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.Designer.cs new file mode 100644 index 0000000..b317bd3 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.Designer.cs @@ -0,0 +1,98 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages.ParamConfigPages +{ + partial class EquipParamSettingPage + { + /// + /// 必需的设计器变量。 + /// + 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.RoleDataGridView = new System.Windows.Forms.DataGridView(); + this.AddRole = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // RoleDataGridView + // + this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); + this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RoleDataGridView.Name = "RoleDataGridView"; + this.RoleDataGridView.RowTemplate.Height = 25; + this.RoleDataGridView.Size = new System.Drawing.Size(883, 497); + this.RoleDataGridView.TabIndex = 0; + this.RoleDataGridView.Tag = ""; + // + // AddRole + // + this.AddRole.Location = new System.Drawing.Point(11, 11); + this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.AddRole.Name = "AddRole"; + this.AddRole.Size = new System.Drawing.Size(103, 39); + this.AddRole.TabIndex = 1; + this.AddRole.Text = "查询操作信息"; + this.AddRole.UseVisualStyleBackColor = true; + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(883, 61); + this.ButtonPanel.TabIndex = 4; + // + // OperateConfigPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.RoleDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "OperateConfigPage"; + this.Size = new System.Drawing.Size(883, 562); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView RoleDataGridView; + private Button AddRole; + private Panel ButtonPanel; + } +} diff --git a/HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.cs b/HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.cs new file mode 100644 index 0000000..b174bbb --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.cs @@ -0,0 +1,25 @@ +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 HighWayIot.Winform.UserControlPages.ParamConfigPages +{ + public partial class EquipParamSettingPage : UserControl + { + public EquipParamSettingPage() + { + InitializeComponent(); + } + + private void UpdateRole_Click(object sender, EventArgs e) + { + + } + } +} diff --git a/HighWayIot.Winform/UserControlPages/DeviceDataManage.resx b/HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.resx similarity index 100% rename from HighWayIot.Winform/UserControlPages/DeviceDataManage.resx rename to HighWayIot.Winform/UserControlPages/ParamConfigPages/EquipParamSettingPage.resx diff --git a/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.Designer.cs b/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.Designer.cs new file mode 100644 index 0000000..9f93b13 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.Designer.cs @@ -0,0 +1,98 @@ +using System.Drawing; +using System.Windows.Forms; + +namespace HighWayIot.Winform.UserControlPages.ParamConfigPages +{ + partial class RFIDParamSettingPage + { + /// + /// 必需的设计器变量。 + /// + 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.RoleDataGridView = new System.Windows.Forms.DataGridView(); + this.AddRole = new System.Windows.Forms.Button(); + this.ButtonPanel = new System.Windows.Forms.Panel(); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).BeginInit(); + this.ButtonPanel.SuspendLayout(); + this.SuspendLayout(); + // + // RoleDataGridView + // + this.RoleDataGridView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.RoleDataGridView.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize; + this.RoleDataGridView.Location = new System.Drawing.Point(0, 65); + this.RoleDataGridView.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.RoleDataGridView.Name = "RoleDataGridView"; + this.RoleDataGridView.RowTemplate.Height = 25; + this.RoleDataGridView.Size = new System.Drawing.Size(1171, 742); + this.RoleDataGridView.TabIndex = 0; + this.RoleDataGridView.Tag = ""; + // + // AddRole + // + this.AddRole.Location = new System.Drawing.Point(11, 11); + this.AddRole.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.AddRole.Name = "AddRole"; + this.AddRole.Size = new System.Drawing.Size(103, 39); + this.AddRole.TabIndex = 1; + this.AddRole.Text = "查询操作信息"; + this.AddRole.UseVisualStyleBackColor = true; + // + // ButtonPanel + // + this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.ButtonPanel.Controls.Add(this.AddRole); + this.ButtonPanel.Location = new System.Drawing.Point(0, 0); + this.ButtonPanel.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.ButtonPanel.Name = "ButtonPanel"; + this.ButtonPanel.Size = new System.Drawing.Size(1171, 61); + this.ButtonPanel.TabIndex = 4; + // + // RFIDParamSettingPage + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.ControlLight; + this.Controls.Add(this.ButtonPanel); + this.Controls.Add(this.RoleDataGridView); + this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2); + this.Name = "RFIDParamSettingPage"; + this.Size = new System.Drawing.Size(1171, 807); + ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); + this.ButtonPanel.ResumeLayout(false); + this.ResumeLayout(false); + + } + + #endregion + + private DataGridView RoleDataGridView; + private Button AddRole; + private Panel ButtonPanel; + } +} diff --git a/HighWayIot.Winform/UserControlPages/DeviceDataManage.cs b/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.cs similarity index 53% rename from HighWayIot.Winform/UserControlPages/DeviceDataManage.cs rename to HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.cs index 1084733..1126abb 100644 --- a/HighWayIot.Winform/UserControlPages/DeviceDataManage.cs +++ b/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.cs @@ -8,13 +8,18 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; -namespace HighWayIot.Winform.UserControlPages +namespace HighWayIot.Winform.UserControlPages.ParamConfigPages { - public partial class DeviceDataManage : UserControl + public partial class RFIDParamSettingPage : UserControl { - public DeviceDataManage() + public RFIDParamSettingPage() { InitializeComponent(); } + + private void UpdateRole_Click(object sender, EventArgs e) + { + + } } } diff --git a/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.resx b/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/HighWayIot.Winform/UserControlPages/ParamConfigPages/RFIDParamSettingPage.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