diff --git a/HighWayIot.Winform/HighWayIot.Winform.csproj b/HighWayIot.Winform/HighWayIot.Winform.csproj index 729fae8..7f4c74b 100644 --- a/HighWayIot.Winform/HighWayIot.Winform.csproj +++ b/HighWayIot.Winform/HighWayIot.Winform.csproj @@ -334,6 +334,27 @@ + + + + + + + + + + + + + + + + + + + + + Always diff --git a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs index 2834e37..4a54aa2 100644 --- a/HighWayIot.Winform/MainForm/BaseForm.Designer.cs +++ b/HighWayIot.Winform/MainForm/BaseForm.Designer.cs @@ -35,17 +35,6 @@ namespace HighWayIot.Winform.MainForm this.components = new System.ComponentModel.Container(); System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(BaseForm)); this.MainMenu = new System.Windows.Forms.MenuStrip(); - this.SysConfigStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.UserStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.RoleStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.ShiftTimeConfigStripItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LogoutStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SysQuitStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LogManageStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.DaliyReportStripItem = new System.Windows.Forms.ToolStripMenuItem(); - this.OperateLogStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.AlarmLogStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.MonitorMainPageStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.ProductionSchedulingStripItem = new System.Windows.Forms.ToolStripMenuItem(); this.MaterialMenuStripItem = new System.Windows.Forms.ToolStripMenuItem(); this.MaterialConfigStripItem = new System.Windows.Forms.ToolStripMenuItem(); @@ -69,6 +58,17 @@ namespace HighWayIot.Winform.MainForm this.StripLabel2 = new System.Windows.Forms.ToolStripStatusLabel(); this.TimeStripLabel = new System.Windows.Forms.ToolStripStatusLabel(); this.TimeDisplayTimer = new System.Windows.Forms.Timer(this.components); + this.SysConfigStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.UserStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.RoleStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.ShiftTimeConfigStripItem = new System.Windows.Forms.ToolStripMenuItem(); + this.LogoutStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.SysQuitStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.LogManageStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.DaliyReportStripItem = new System.Windows.Forms.ToolStripMenuItem(); + this.OperateLogStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.AlarmLogStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.MonitorMainPageStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); this.MainMenu.SuspendLayout(); this.statusStrip1.SuspendLayout(); this.SuspendLayout(); @@ -92,95 +92,11 @@ namespace HighWayIot.Winform.MainForm this.MainMenu.TabIndex = 1; this.MainMenu.Text = "menuStrip1"; // - // SysConfigStripMenuItem - // - this.SysConfigStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.UserStripMenuItem, - this.RoleStripMenuItem, - this.ShiftTimeConfigStripItem, - this.LogoutStripMenuItem, - this.SysQuitStripMenuItem}); - this.SysConfigStripMenuItem.Name = "SysConfigStripMenuItem"; - this.SysConfigStripMenuItem.Size = new System.Drawing.Size(68, 22); - this.SysConfigStripMenuItem.Text = "系统设置"; - // - // UserStripMenuItem - // - this.UserStripMenuItem.Name = "UserStripMenuItem"; - this.UserStripMenuItem.Size = new System.Drawing.Size(136, 22); - this.UserStripMenuItem.Text = "用户管理"; - this.UserStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); - // - // RoleStripMenuItem - // - this.RoleStripMenuItem.Name = "RoleStripMenuItem"; - this.RoleStripMenuItem.Size = new System.Drawing.Size(136, 22); - this.RoleStripMenuItem.Text = "角色管理"; - this.RoleStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); - // - // ShiftTimeConfigStripItem - // - this.ShiftTimeConfigStripItem.Name = "ShiftTimeConfigStripItem"; - this.ShiftTimeConfigStripItem.Size = new System.Drawing.Size(136, 22); - this.ShiftTimeConfigStripItem.Text = "班时间维护"; - this.ShiftTimeConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); - // - // LogoutStripMenuItem - // - this.LogoutStripMenuItem.Name = "LogoutStripMenuItem"; - this.LogoutStripMenuItem.Size = new System.Drawing.Size(136, 22); - this.LogoutStripMenuItem.Text = "注销"; - this.LogoutStripMenuItem.Click += new System.EventHandler(this.LogoutStripMenuItem_Click); - // - // SysQuitStripMenuItem - // - this.SysQuitStripMenuItem.Name = "SysQuitStripMenuItem"; - this.SysQuitStripMenuItem.Size = new System.Drawing.Size(136, 22); - this.SysQuitStripMenuItem.Text = "退出系统"; - this.SysQuitStripMenuItem.Click += new System.EventHandler(this.SysQuitStripMenuItem_Click); - // - // LogManageStripMenuItem - // - this.LogManageStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.DaliyReportStripItem, - this.OperateLogStripMenuItem, - this.AlarmLogStripMenuItem}); - this.LogManageStripMenuItem.Name = "LogManageStripMenuItem"; - this.LogManageStripMenuItem.Size = new System.Drawing.Size(68, 22); - this.LogManageStripMenuItem.Text = "日志管理"; - // - // DaliyReportStripItem - // - this.DaliyReportStripItem.Name = "DaliyReportStripItem"; - this.DaliyReportStripItem.Size = new System.Drawing.Size(124, 22); - this.DaliyReportStripItem.Text = "日报表"; - this.DaliyReportStripItem.Click += new System.EventHandler(this.StripMenuItemClick); - // - // OperateLogStripMenuItem - // - this.OperateLogStripMenuItem.Name = "OperateLogStripMenuItem"; - this.OperateLogStripMenuItem.Size = new System.Drawing.Size(124, 22); - this.OperateLogStripMenuItem.Text = "操作日志"; - this.OperateLogStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); - // - // AlarmLogStripMenuItem - // - this.AlarmLogStripMenuItem.Name = "AlarmLogStripMenuItem"; - this.AlarmLogStripMenuItem.Size = new System.Drawing.Size(124, 22); - this.AlarmLogStripMenuItem.Text = "报警日志"; - this.AlarmLogStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); - // - // MonitorMainPageStripMenuItem - // - this.MonitorMainPageStripMenuItem.Name = "MonitorMainPageStripMenuItem"; - this.MonitorMainPageStripMenuItem.Size = new System.Drawing.Size(80, 22); - this.MonitorMainPageStripMenuItem.Text = "监控主页面"; - this.MonitorMainPageStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); - // // ProductionSchedulingStripItem // + this.ProductionSchedulingStripItem.Image = global::HighWayIot.Winform.Properties.Resources.生产排程; this.ProductionSchedulingStripItem.Name = "ProductionSchedulingStripItem"; - this.ProductionSchedulingStripItem.Size = new System.Drawing.Size(68, 22); + this.ProductionSchedulingStripItem.Size = new System.Drawing.Size(84, 22); this.ProductionSchedulingStripItem.Text = "生产排程"; this.ProductionSchedulingStripItem.Click += new System.EventHandler(this.StripMenuItemClick); // @@ -189,42 +105,48 @@ namespace HighWayIot.Winform.MainForm this.MaterialMenuStripItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.MaterialConfigStripItem, this.MaterialTypeConfigStripItem}); + this.MaterialMenuStripItem.Image = global::HighWayIot.Winform.Properties.Resources.物料库存管控; this.MaterialMenuStripItem.Name = "MaterialMenuStripItem"; - this.MaterialMenuStripItem.Size = new System.Drawing.Size(80, 22); + this.MaterialMenuStripItem.Size = new System.Drawing.Size(96, 22); this.MaterialMenuStripItem.Text = "原材料管理"; // // MaterialConfigStripItem // + this.MaterialConfigStripItem.Image = global::HighWayIot.Winform.Properties.Resources.物料管理; this.MaterialConfigStripItem.Name = "MaterialConfigStripItem"; - this.MaterialConfigStripItem.Size = new System.Drawing.Size(148, 22); + this.MaterialConfigStripItem.Size = new System.Drawing.Size(180, 22); this.MaterialConfigStripItem.Text = "物料管理"; this.MaterialConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); // // MaterialTypeConfigStripItem // + this.MaterialTypeConfigStripItem.Image = global::HighWayIot.Winform.Properties.Resources.物料需求; this.MaterialTypeConfigStripItem.Name = "MaterialTypeConfigStripItem"; - this.MaterialTypeConfigStripItem.Size = new System.Drawing.Size(148, 22); + this.MaterialTypeConfigStripItem.Size = new System.Drawing.Size(180, 22); this.MaterialTypeConfigStripItem.Text = "物料类型管理"; this.MaterialTypeConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); // // RecipeConfigStripItem // + this.RecipeConfigStripItem.Image = global::HighWayIot.Winform.Properties.Resources.业务_配方; this.RecipeConfigStripItem.Name = "RecipeConfigStripItem"; - this.RecipeConfigStripItem.Size = new System.Drawing.Size(68, 22); + this.RecipeConfigStripItem.Size = new System.Drawing.Size(84, 22); this.RecipeConfigStripItem.Text = "配方管理"; this.RecipeConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); // // EquipMaterialBindingStripItem // + this.EquipMaterialBindingStripItem.Image = global::HighWayIot.Winform.Properties.Resources.绑定; this.EquipMaterialBindingStripItem.Name = "EquipMaterialBindingStripItem"; - this.EquipMaterialBindingStripItem.Size = new System.Drawing.Size(116, 22); + this.EquipMaterialBindingStripItem.Size = new System.Drawing.Size(132, 22); this.EquipMaterialBindingStripItem.Text = "机台物料信息绑定"; this.EquipMaterialBindingStripItem.Click += new System.EventHandler(this.StripMenuItemClick); // // TestMenuItem // + this.TestMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.PLC; this.TestMenuItem.Name = "TestMenuItem"; - this.TestMenuItem.Size = new System.Drawing.Size(89, 22); + this.TestMenuItem.Size = new System.Drawing.Size(105, 22); this.TestMenuItem.Text = "PLC测试页面"; this.TestMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // @@ -233,21 +155,24 @@ namespace HighWayIot.Winform.MainForm this.DeviceDataManageToolStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.RFIDParamManageToolStripMenuItem, this.DeviceParamManageToolStripMenuItem}); + this.DeviceDataManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.参数; this.DeviceDataManageToolStripMenuItem.Name = "DeviceDataManageToolStripMenuItem"; - this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(68, 22); + this.DeviceDataManageToolStripMenuItem.Size = new System.Drawing.Size(84, 22); this.DeviceDataManageToolStripMenuItem.Text = "参数管理"; // // RFIDParamManageToolStripMenuItem // + this.RFIDParamManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources._165_RFID; this.RFIDParamManageToolStripMenuItem.Name = "RFIDParamManageToolStripMenuItem"; - this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.RFIDParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.RFIDParamManageToolStripMenuItem.Text = "RFID参数配置"; this.RFIDParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // // DeviceParamManageToolStripMenuItem // + this.DeviceParamManageToolStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.设备; this.DeviceParamManageToolStripMenuItem.Name = "DeviceParamManageToolStripMenuItem"; - this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(151, 22); + this.DeviceParamManageToolStripMenuItem.Size = new System.Drawing.Size(180, 22); this.DeviceParamManageToolStripMenuItem.Text = "设备参数配置"; this.DeviceParamManageToolStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); // @@ -357,6 +282,102 @@ namespace HighWayIot.Winform.MainForm this.TimeDisplayTimer.Interval = 1000; this.TimeDisplayTimer.Tick += new System.EventHandler(this.TimeDisplayTimer_Tick); // + // SysConfigStripMenuItem + // + this.SysConfigStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.UserStripMenuItem, + this.RoleStripMenuItem, + this.ShiftTimeConfigStripItem, + this.LogoutStripMenuItem, + this.SysQuitStripMenuItem}); + this.SysConfigStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.系统设置; + this.SysConfigStripMenuItem.Name = "SysConfigStripMenuItem"; + this.SysConfigStripMenuItem.Size = new System.Drawing.Size(84, 22); + this.SysConfigStripMenuItem.Text = "系统设置"; + // + // UserStripMenuItem + // + this.UserStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.用户; + this.UserStripMenuItem.Name = "UserStripMenuItem"; + this.UserStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.UserStripMenuItem.Text = "用户管理"; + this.UserStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // RoleStripMenuItem + // + this.RoleStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.权限; + this.RoleStripMenuItem.Name = "RoleStripMenuItem"; + this.RoleStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.RoleStripMenuItem.Text = "角色管理"; + this.RoleStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // ShiftTimeConfigStripItem + // + this.ShiftTimeConfigStripItem.Image = global::HighWayIot.Winform.Properties.Resources.时间; + this.ShiftTimeConfigStripItem.Name = "ShiftTimeConfigStripItem"; + this.ShiftTimeConfigStripItem.Size = new System.Drawing.Size(136, 22); + this.ShiftTimeConfigStripItem.Text = "班时间维护"; + this.ShiftTimeConfigStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // LogoutStripMenuItem + // + this.LogoutStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.注销; + this.LogoutStripMenuItem.Name = "LogoutStripMenuItem"; + this.LogoutStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.LogoutStripMenuItem.Text = "注销"; + this.LogoutStripMenuItem.Click += new System.EventHandler(this.LogoutStripMenuItem_Click); + // + // SysQuitStripMenuItem + // + this.SysQuitStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.退出; + this.SysQuitStripMenuItem.Name = "SysQuitStripMenuItem"; + this.SysQuitStripMenuItem.Size = new System.Drawing.Size(136, 22); + this.SysQuitStripMenuItem.Text = "退出系统"; + this.SysQuitStripMenuItem.Click += new System.EventHandler(this.SysQuitStripMenuItem_Click); + // + // LogManageStripMenuItem + // + this.LogManageStripMenuItem.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.DaliyReportStripItem, + this.OperateLogStripMenuItem, + this.AlarmLogStripMenuItem}); + this.LogManageStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.日志管理; + this.LogManageStripMenuItem.Name = "LogManageStripMenuItem"; + this.LogManageStripMenuItem.Size = new System.Drawing.Size(84, 22); + this.LogManageStripMenuItem.Text = "日志管理"; + // + // DaliyReportStripItem + // + this.DaliyReportStripItem.Image = global::HighWayIot.Winform.Properties.Resources.报表数据; + this.DaliyReportStripItem.Name = "DaliyReportStripItem"; + this.DaliyReportStripItem.Size = new System.Drawing.Size(124, 22); + this.DaliyReportStripItem.Text = "日报表"; + this.DaliyReportStripItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // OperateLogStripMenuItem + // + this.OperateLogStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.操作日志; + this.OperateLogStripMenuItem.Name = "OperateLogStripMenuItem"; + this.OperateLogStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.OperateLogStripMenuItem.Text = "操作日志"; + this.OperateLogStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // AlarmLogStripMenuItem + // + this.AlarmLogStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.报警日志; + this.AlarmLogStripMenuItem.Name = "AlarmLogStripMenuItem"; + this.AlarmLogStripMenuItem.Size = new System.Drawing.Size(124, 22); + this.AlarmLogStripMenuItem.Text = "报警日志"; + this.AlarmLogStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // + // MonitorMainPageStripMenuItem + // + this.MonitorMainPageStripMenuItem.Image = global::HighWayIot.Winform.Properties.Resources.监控; + this.MonitorMainPageStripMenuItem.Name = "MonitorMainPageStripMenuItem"; + this.MonitorMainPageStripMenuItem.Size = new System.Drawing.Size(96, 22); + this.MonitorMainPageStripMenuItem.Text = "监控主页面"; + this.MonitorMainPageStripMenuItem.Click += new System.EventHandler(this.StripMenuItemClick); + // // BaseForm // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/HighWayIot.Winform/MainForm/BaseForm.cs b/HighWayIot.Winform/MainForm/BaseForm.cs index 2c9664b..328f13e 100644 --- a/HighWayIot.Winform/MainForm/BaseForm.cs +++ b/HighWayIot.Winform/MainForm/BaseForm.cs @@ -196,6 +196,7 @@ namespace HighWayIot.Winform.MainForm { TabPage tabPage = new TabPage(tag); us.Parent = tabPage; + UserControlTabs.TabPages.Add(tabPage); } break; diff --git a/HighWayIot.Winform/Properties/Resources.Designer.cs b/HighWayIot.Winform/Properties/Resources.Designer.cs index f004a2f..4ec4f5e 100644 --- a/HighWayIot.Winform/Properties/Resources.Designer.cs +++ b/HighWayIot.Winform/Properties/Resources.Designer.cs @@ -60,6 +60,16 @@ namespace HighWayIot.Winform.Properties { } } + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap _165_RFID { + get { + object obj = ResourceManager.GetObject("165-RFID", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// 查找 System.Drawing.Bitmap 类型的本地化资源。 /// @@ -69,5 +79,205 @@ namespace HighWayIot.Winform.Properties { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap PLC { + get { + object obj = ResourceManager.GetObject("PLC", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 业务_配方 { + get { + object obj = ResourceManager.GetObject("业务_配方", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 参数 { + get { + object obj = ResourceManager.GetObject("参数", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 报表数据 { + get { + object obj = ResourceManager.GetObject("报表数据", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 报警日志 { + get { + object obj = ResourceManager.GetObject("报警日志", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 操作日志 { + get { + object obj = ResourceManager.GetObject("操作日志", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 日志管理 { + get { + object obj = ResourceManager.GetObject("日志管理", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 时间 { + get { + object obj = ResourceManager.GetObject("时间", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 权限 { + get { + object obj = ResourceManager.GetObject("权限", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 注销 { + get { + object obj = ResourceManager.GetObject("注销", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 物料库存管控 { + get { + object obj = ResourceManager.GetObject("物料库存管控", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 物料管理 { + get { + object obj = ResourceManager.GetObject("物料管理", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 物料需求 { + get { + object obj = ResourceManager.GetObject("物料需求", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 生产排程 { + get { + object obj = ResourceManager.GetObject("生产排程", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 用户 { + get { + object obj = ResourceManager.GetObject("用户", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 监控 { + get { + object obj = ResourceManager.GetObject("监控", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 系统设置 { + get { + object obj = ResourceManager.GetObject("系统设置", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 绑定 { + get { + object obj = ResourceManager.GetObject("绑定", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 设备 { + get { + object obj = ResourceManager.GetObject("设备", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// 查找 System.Drawing.Bitmap 类型的本地化资源。 + /// + internal static System.Drawing.Bitmap 退出 { + get { + object obj = ResourceManager.GetObject("退出", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/HighWayIot.Winform/Properties/Resources.resx b/HighWayIot.Winform/Properties/Resources.resx index 5aa6168..a84660c 100644 --- a/HighWayIot.Winform/Properties/Resources.resx +++ b/HighWayIot.Winform/Properties/Resources.resx @@ -118,7 +118,70 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, 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\注销.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\用户.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\报表数据.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\PLC.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 + ..\Static\MesnacLogoHighPixel.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\物料需求.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\报警日志.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\设备.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\系统设置.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\165-RFID.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\参数.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/HighWayIot.Winform/Resources/165-RFID.png b/HighWayIot.Winform/Resources/165-RFID.png new file mode 100644 index 0000000..a31d0c4 Binary files /dev/null and b/HighWayIot.Winform/Resources/165-RFID.png differ diff --git a/HighWayIot.Winform/Resources/PLC.png b/HighWayIot.Winform/Resources/PLC.png new file mode 100644 index 0000000..7e021a0 Binary files /dev/null and b/HighWayIot.Winform/Resources/PLC.png differ diff --git a/HighWayIot.Winform/Resources/业务_配方.png b/HighWayIot.Winform/Resources/业务_配方.png new file mode 100644 index 0000000..dc2bf28 Binary files /dev/null and b/HighWayIot.Winform/Resources/业务_配方.png differ diff --git a/HighWayIot.Winform/Resources/参数.png b/HighWayIot.Winform/Resources/参数.png new file mode 100644 index 0000000..123c940 Binary files /dev/null and b/HighWayIot.Winform/Resources/参数.png differ diff --git a/HighWayIot.Winform/Resources/报表数据.png b/HighWayIot.Winform/Resources/报表数据.png new file mode 100644 index 0000000..ad02df0 Binary files /dev/null and b/HighWayIot.Winform/Resources/报表数据.png differ diff --git a/HighWayIot.Winform/Resources/报警日志.png b/HighWayIot.Winform/Resources/报警日志.png new file mode 100644 index 0000000..c054f65 Binary files /dev/null and b/HighWayIot.Winform/Resources/报警日志.png differ diff --git a/HighWayIot.Winform/Resources/操作日志.png b/HighWayIot.Winform/Resources/操作日志.png new file mode 100644 index 0000000..3ccb292 Binary files /dev/null and b/HighWayIot.Winform/Resources/操作日志.png differ diff --git a/HighWayIot.Winform/Resources/日志管理.png b/HighWayIot.Winform/Resources/日志管理.png new file mode 100644 index 0000000..648af31 Binary files /dev/null and b/HighWayIot.Winform/Resources/日志管理.png differ diff --git a/HighWayIot.Winform/Resources/时间.png b/HighWayIot.Winform/Resources/时间.png new file mode 100644 index 0000000..f0089fa Binary files /dev/null and b/HighWayIot.Winform/Resources/时间.png differ diff --git a/HighWayIot.Winform/Resources/权限.png b/HighWayIot.Winform/Resources/权限.png new file mode 100644 index 0000000..0592e23 Binary files /dev/null and b/HighWayIot.Winform/Resources/权限.png differ diff --git a/HighWayIot.Winform/Resources/注销.png b/HighWayIot.Winform/Resources/注销.png new file mode 100644 index 0000000..aa9f762 Binary files /dev/null and b/HighWayIot.Winform/Resources/注销.png differ diff --git a/HighWayIot.Winform/Resources/物料库存管控.png b/HighWayIot.Winform/Resources/物料库存管控.png new file mode 100644 index 0000000..3f75003 Binary files /dev/null and b/HighWayIot.Winform/Resources/物料库存管控.png differ diff --git a/HighWayIot.Winform/Resources/物料管理.png b/HighWayIot.Winform/Resources/物料管理.png new file mode 100644 index 0000000..984d401 Binary files /dev/null and b/HighWayIot.Winform/Resources/物料管理.png differ diff --git a/HighWayIot.Winform/Resources/物料需求.png b/HighWayIot.Winform/Resources/物料需求.png new file mode 100644 index 0000000..32c0050 Binary files /dev/null and b/HighWayIot.Winform/Resources/物料需求.png differ diff --git a/HighWayIot.Winform/Resources/生产排程.png b/HighWayIot.Winform/Resources/生产排程.png new file mode 100644 index 0000000..9e2bef7 Binary files /dev/null and b/HighWayIot.Winform/Resources/生产排程.png differ diff --git a/HighWayIot.Winform/Resources/用户.png b/HighWayIot.Winform/Resources/用户.png new file mode 100644 index 0000000..d6548a3 Binary files /dev/null and b/HighWayIot.Winform/Resources/用户.png differ diff --git a/HighWayIot.Winform/Resources/监控.png b/HighWayIot.Winform/Resources/监控.png new file mode 100644 index 0000000..dec2749 Binary files /dev/null and b/HighWayIot.Winform/Resources/监控.png differ diff --git a/HighWayIot.Winform/Resources/系统设置.png b/HighWayIot.Winform/Resources/系统设置.png new file mode 100644 index 0000000..dde7edd Binary files /dev/null and b/HighWayIot.Winform/Resources/系统设置.png differ diff --git a/HighWayIot.Winform/Resources/绑定.png b/HighWayIot.Winform/Resources/绑定.png new file mode 100644 index 0000000..f07a417 Binary files /dev/null and b/HighWayIot.Winform/Resources/绑定.png differ diff --git a/HighWayIot.Winform/Resources/设备.png b/HighWayIot.Winform/Resources/设备.png new file mode 100644 index 0000000..4256d63 Binary files /dev/null and b/HighWayIot.Winform/Resources/设备.png differ diff --git a/HighWayIot.Winform/Resources/退出.png b/HighWayIot.Winform/Resources/退出.png new file mode 100644 index 0000000..8a894f0 Binary files /dev/null and b/HighWayIot.Winform/Resources/退出.png differ diff --git a/HighWayIot.Winform/UserControlPages/LogPages/AlarmLogPage.cs b/HighWayIot.Winform/UserControlPages/LogPages/AlarmLogPage.cs index 1a4ae4a..b3a59e9 100644 --- a/HighWayIot.Winform/UserControlPages/LogPages/AlarmLogPage.cs +++ b/HighWayIot.Winform/UserControlPages/LogPages/AlarmLogPage.cs @@ -61,7 +61,5 @@ namespace HighWayIot.Winform.UserControlPages LogDataGridView.DataSource = null; LogDataGridView.DataSource = Lists; } - - } } diff --git a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs index bf04417..c1bb4ec 100644 --- a/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/LogPages/DailyReportPage.Designer.cs @@ -32,6 +32,18 @@ namespace HighWayIot.Winform.UserControlPages private void InitializeComponent() { this.ReportDataGridView = new System.Windows.Forms.DataGridView(); + this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.DeviceNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BeginTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RecipeNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SpecName = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.SpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RGVNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.BaseRubFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.MidRubTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.RowTireFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); + this.Operator = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ButtonPanel = new System.Windows.Forms.Panel(); this.label2 = new System.Windows.Forms.Label(); this.RgvNoComboBox = new System.Windows.Forms.ComboBox(); @@ -45,18 +57,6 @@ namespace HighWayIot.Winform.UserControlPages this.RecipeCodeTextBox = new System.Windows.Forms.TextBox(); this.label1 = new System.Windows.Forms.Label(); this.SelectReport = new System.Windows.Forms.Button(); - this.Id = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.DeviceNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.BeginTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.RecipeNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.SpecName = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.SpecCode = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.RGVNo = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Weight = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.BaseRubFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.MidRubTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.RowTireFinishTime = new System.Windows.Forms.DataGridViewTextBoxColumn(); - this.Operator = new System.Windows.Forms.DataGridViewTextBoxColumn(); ((System.ComponentModel.ISupportInitialize)(this.ReportDataGridView)).BeginInit(); this.ButtonPanel.SuspendLayout(); this.SuspendLayout(); @@ -91,6 +91,94 @@ namespace HighWayIot.Winform.UserControlPages this.ReportDataGridView.Size = new System.Drawing.Size(1639, 868); this.ReportDataGridView.TabIndex = 7; // + // Id + // + this.Id.DataPropertyName = "Id"; + this.Id.HeaderText = "ID"; + this.Id.Name = "Id"; + this.Id.ReadOnly = true; + this.Id.Width = 50; + // + // DeviceNo + // + this.DeviceNo.HeaderText = "机位"; + this.DeviceNo.Name = "DeviceNo"; + this.DeviceNo.ReadOnly = true; + this.DeviceNo.Width = 70; + // + // BeginTime + // + this.BeginTime.HeaderText = "开始时间"; + this.BeginTime.Name = "BeginTime"; + this.BeginTime.ReadOnly = true; + this.BeginTime.Width = 150; + // + // RecipeNo + // + this.RecipeNo.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.RecipeNo.FillWeight = 30F; + this.RecipeNo.HeaderText = "成品代号"; + this.RecipeNo.Name = "RecipeNo"; + this.RecipeNo.ReadOnly = true; + // + // SpecName + // + this.SpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.SpecName.FillWeight = 70F; + this.SpecName.HeaderText = "标称尺度"; + this.SpecName.Name = "SpecName"; + this.SpecName.ReadOnly = true; + // + // SpecCode + // + this.SpecCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; + this.SpecCode.FillWeight = 30F; + this.SpecCode.HeaderText = "Spec编号"; + this.SpecCode.Name = "SpecCode"; + this.SpecCode.ReadOnly = true; + // + // RGVNo + // + this.RGVNo.HeaderText = "小车编号"; + this.RGVNo.Name = "RGVNo"; + this.RGVNo.ReadOnly = true; + this.RGVNo.Width = 80; + // + // Weight + // + this.Weight.HeaderText = "生胎重量"; + this.Weight.Name = "Weight"; + this.Weight.ReadOnly = true; + this.Weight.Width = 80; + // + // BaseRubFinishTime + // + this.BaseRubFinishTime.HeaderText = "基部胶完成时间"; + this.BaseRubFinishTime.Name = "BaseRubFinishTime"; + this.BaseRubFinishTime.ReadOnly = true; + this.BaseRubFinishTime.Width = 140; + // + // MidRubTime + // + this.MidRubTime.HeaderText = "中层胶完成时间（分）"; + this.MidRubTime.Name = "MidRubTime"; + this.MidRubTime.ReadOnly = true; + this.MidRubTime.Width = 150; + // + // RowTireFinishTime + // + this.RowTireFinishTime.HeaderText = "生胎完成时间（分）"; + this.RowTireFinishTime.Name = "RowTireFinishTime"; + this.RowTireFinishTime.ReadOnly = true; + this.RowTireFinishTime.Width = 140; + // + // Operator + // + this.Operator.DataPropertyName = "Operator"; + this.Operator.HeaderText = "操作者用户名"; + this.Operator.Name = "Operator"; + this.Operator.ReadOnly = true; + // // ButtonPanel // this.ButtonPanel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) @@ -217,98 +305,10 @@ namespace HighWayIot.Winform.UserControlPages this.SelectReport.Name = "SelectReport"; this.SelectReport.Size = new System.Drawing.Size(103, 39); this.SelectReport.TabIndex = 1; - this.SelectReport.Text = "查询操作信息"; + this.SelectReport.Text = "查询报表"; this.SelectReport.UseVisualStyleBackColor = true; this.SelectReport.Click += new System.EventHandler(this.SelectReport_Click); // - // Id - // - this.Id.DataPropertyName = "Id"; - this.Id.HeaderText = "ID"; - this.Id.Name = "Id"; - this.Id.ReadOnly = true; - this.Id.Width = 50; - // - // DeviceNo - // - this.DeviceNo.HeaderText = "机位"; - this.DeviceNo.Name = "DeviceNo"; - this.DeviceNo.ReadOnly = true; - this.DeviceNo.Width = 70; - // - // BeginTime - // - this.BeginTime.HeaderText = "开始时间"; - this.BeginTime.Name = "BeginTime"; - this.BeginTime.ReadOnly = true; - this.BeginTime.Width = 150; - // - // RecipeNo - // - this.RecipeNo.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.RecipeNo.FillWeight = 30F; - this.RecipeNo.HeaderText = "成品代号"; - this.RecipeNo.Name = "RecipeNo"; - this.RecipeNo.ReadOnly = true; - // - // SpecName - // - this.SpecName.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.SpecName.FillWeight = 70F; - this.SpecName.HeaderText = "标称尺度"; - this.SpecName.Name = "SpecName"; - this.SpecName.ReadOnly = true; - // - // SpecCode - // - this.SpecCode.AutoSizeMode = System.Windows.Forms.DataGridViewAutoSizeColumnMode.Fill; - this.SpecCode.FillWeight = 30F; - this.SpecCode.HeaderText = "Spec编号"; - this.SpecCode.Name = "SpecCode"; - this.SpecCode.ReadOnly = true; - // - // RGVNo - // - this.RGVNo.HeaderText = "小车编号"; - this.RGVNo.Name = "RGVNo"; - this.RGVNo.ReadOnly = true; - this.RGVNo.Width = 80; - // - // Weight - // - this.Weight.HeaderText = "生胎重量"; - this.Weight.Name = "Weight"; - this.Weight.ReadOnly = true; - this.Weight.Width = 80; - // - // BaseRubFinishTime - // - this.BaseRubFinishTime.HeaderText = "基部胶完成时间"; - this.BaseRubFinishTime.Name = "BaseRubFinishTime"; - this.BaseRubFinishTime.ReadOnly = true; - this.BaseRubFinishTime.Width = 140; - // - // MidRubTime - // - this.MidRubTime.HeaderText = "中层胶完成时间（分）"; - this.MidRubTime.Name = "MidRubTime"; - this.MidRubTime.ReadOnly = true; - this.MidRubTime.Width = 150; - // - // RowTireFinishTime - // - this.RowTireFinishTime.HeaderText = "生胎完成时间（分）"; - this.RowTireFinishTime.Name = "RowTireFinishTime"; - this.RowTireFinishTime.ReadOnly = true; - this.RowTireFinishTime.Width = 140; - // - // Operator - // - this.Operator.DataPropertyName = "Operator"; - this.Operator.HeaderText = "操作者用户名"; - this.Operator.Name = "Operator"; - this.Operator.ReadOnly = true; - // // DailyReportPage // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); diff --git a/HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs b/HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs index 6b49471..6331fd5 100644 --- a/HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/ProductionScheduling.Designer.cs @@ -48,7 +48,7 @@ namespace HighWayIot.Winform.UserControlPages 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.Size = new System.Drawing.Size(1105, 676); this.RoleDataGridView.TabIndex = 0; this.RoleDataGridView.Tag = ""; // @@ -70,10 +70,10 @@ namespace HighWayIot.Winform.UserControlPages 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.Size = new System.Drawing.Size(1105, 61); this.ButtonPanel.TabIndex = 4; // - // OperateConfigPage + // ProductionScheduling // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; @@ -81,8 +81,8 @@ namespace HighWayIot.Winform.UserControlPages 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); + this.Name = "ProductionScheduling"; + this.Size = new System.Drawing.Size(1105, 741); ((System.ComponentModel.ISupportInitialize)(this.RoleDataGridView)).EndInit(); this.ButtonPanel.ResumeLayout(false); this.ResumeLayout(false); diff --git a/HighWayIot.Winform/UserControlPages/TestPage.Designer.cs b/HighWayIot.Winform/UserControlPages/TestPage.Designer.cs index 48fe9fb..9050ed0 100644 --- a/HighWayIot.Winform/UserControlPages/TestPage.Designer.cs +++ b/HighWayIot.Winform/UserControlPages/TestPage.Designer.cs @@ -46,7 +46,7 @@ // // button1 // - this.button1.Location = new System.Drawing.Point(89, 57); + this.button1.Location = new System.Drawing.Point(97, 45); this.button1.Name = "button1"; this.button1.Size = new System.Drawing.Size(93, 51); this.button1.TabIndex = 0; @@ -56,7 +56,7 @@ // // button2 // - this.button2.Location = new System.Drawing.Point(218, 57); + this.button2.Location = new System.Drawing.Point(216, 45); this.button2.Name = "button2"; this.button2.Size = new System.Drawing.Size(93, 51); this.button2.TabIndex = 1; @@ -76,7 +76,7 @@ // // WriteButton // - this.WriteButton.Location = new System.Drawing.Point(97, 180); + this.WriteButton.Location = new System.Drawing.Point(127, 180); this.WriteButton.Name = "WriteButton"; this.WriteButton.Size = new System.Drawing.Size(99, 50); this.WriteButton.TabIndex = 3; @@ -161,7 +161,7 @@ // // button3 // - this.button3.Location = new System.Drawing.Point(344, 57); + this.button3.Location = new System.Drawing.Point(337, 45); this.button3.Name = "button3"; this.button3.Size = new System.Drawing.Size(93, 51); this.button3.TabIndex = 14;