|
|
@@ -36,18 +36,19 @@ namespace UAS_DeviceMonitor
|
|
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Main));
|
|
|
this.RibbonNav = new DevExpress.XtraBars.Ribbon.RibbonControl();
|
|
|
this.ButtonDeviceList = new DevExpress.XtraBars.BarButtonItem();
|
|
|
- this.ButtonDeviceKind = new DevExpress.XtraBars.BarButtonItem();
|
|
|
- this.ButtonDeviceStatus = new DevExpress.XtraBars.BarButtonItem();
|
|
|
+ this.ButtonDeviceNetSetting = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.ButtonCommandSet = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.ButtonPollingSetting = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.ButtionPolling = new DevExpress.XtraBars.BarButtonItem();
|
|
|
+ this.ButtonDeviceStatus = new DevExpress.XtraBars.BarButtonItem();
|
|
|
+ this.ButtonWorkCenterStatus = new DevExpress.XtraBars.BarButtonItem();
|
|
|
this.DeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPage();
|
|
|
this.RibDeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
|
|
|
this.DeviceCommandSetting = new DevExpress.XtraBars.Ribbon.RibbonPage();
|
|
|
this.RibDeviceCommand = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
|
|
|
this.MainTabControl = new DevExpress.XtraTab.XtraTabControl();
|
|
|
this.PageDeviceList = new DevExpress.XtraTab.XtraTabPage();
|
|
|
- this.PageControlDeviceList = new UAS_DeviceMonitor.CustomerControl.PagingControl.PageControl();
|
|
|
+ this.ToolPageControlDeviceList = new UAS_DeviceMonitor.CustomerControl.PagingControl.PageControl();
|
|
|
this.GridDeviceList = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
|
|
|
this.GridViewDeviceList = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
|
|
|
this.de_id = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
@@ -74,8 +75,9 @@ namespace UAS_DeviceMonitor
|
|
|
this.dc_code = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dc_name = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dc_command = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
- this.PageDeviceKind = new DevExpress.XtraTab.XtraTabPage();
|
|
|
- this.PageDeviceStatus = new DevExpress.XtraTab.XtraTabPage();
|
|
|
+ this.PageDeviceNetSetting = new DevExpress.XtraTab.XtraTabPage();
|
|
|
+ this.GridDeviceNetSetting = new DevExpress.XtraGrid.GridControl();
|
|
|
+ this.GridViewDeviceNetSetting = new DevExpress.XtraGrid.Views.Grid.GridView();
|
|
|
this.PagePollingSetting = new DevExpress.XtraTab.XtraTabPage();
|
|
|
this.ButtonDeleteCommandSet = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
|
|
|
this.ButtonNewCommandSet = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
|
|
|
@@ -99,12 +101,12 @@ namespace UAS_DeviceMonitor
|
|
|
this.dpc_plname = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dpc_interval = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dpc_dccode = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
- this.PollingSetItemLookUpEdit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
|
|
|
this.dpc_function = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dpc_enable = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dpc_status = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dpc_remark = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.POLLSETTINGSTATUSCOLUMN = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.PollingSetItemLookUpEdit = new DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit();
|
|
|
this.PagePolling = new DevExpress.XtraTab.XtraTabPage();
|
|
|
this.ButtonAddPolling = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
|
|
|
this.ButtonDeletePolling = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
|
|
|
@@ -118,6 +120,12 @@ namespace UAS_DeviceMonitor
|
|
|
this.pl_type = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.pl_dccode = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.pl_remark = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.PageDeviceStatus = new DevExpress.XtraTab.XtraTabPage();
|
|
|
+ this.GridDeviceStatus = new DevExpress.XtraGrid.GridControl();
|
|
|
+ this.GridViewDeviceStatus = new DevExpress.XtraGrid.Views.Grid.GridView();
|
|
|
+ this.PageWorkCenterStatus = new DevExpress.XtraTab.XtraTabPage();
|
|
|
+ this.GridWorkCenterStatus = new DevExpress.XtraGrid.GridControl();
|
|
|
+ this.GridViewWorkCenterStatus = new DevExpress.XtraGrid.Views.Grid.GridView();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
|
|
|
this.MainTabControl.SuspendLayout();
|
|
|
@@ -129,6 +137,9 @@ namespace UAS_DeviceMonitor
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridCommandSetting)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridViewCommandSet)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.CheckEditCommandSet)).BeginInit();
|
|
|
+ this.PageDeviceNetSetting.SuspendLayout();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridDeviceNetSetting)).BeginInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceNetSetting)).BeginInit();
|
|
|
this.PagePollingSetting.SuspendLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).BeginInit();
|
|
|
@@ -139,6 +150,12 @@ namespace UAS_DeviceMonitor
|
|
|
this.PagePolling.SuspendLayout();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridPolling)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridViewPolling)).BeginInit();
|
|
|
+ this.PageDeviceStatus.SuspendLayout();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridDeviceStatus)).BeginInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceStatus)).BeginInit();
|
|
|
+ this.PageWorkCenterStatus.SuspendLayout();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridWorkCenterStatus)).BeginInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewWorkCenterStatus)).BeginInit();
|
|
|
this.SuspendLayout();
|
|
|
//
|
|
|
// RibbonNav
|
|
|
@@ -149,13 +166,14 @@ namespace UAS_DeviceMonitor
|
|
|
this.RibbonNav.Items.AddRange(new DevExpress.XtraBars.BarItem[] {
|
|
|
this.RibbonNav.ExpandCollapseItem,
|
|
|
this.ButtonDeviceList,
|
|
|
- this.ButtonDeviceKind,
|
|
|
- this.ButtonDeviceStatus,
|
|
|
+ this.ButtonDeviceNetSetting,
|
|
|
this.ButtonCommandSet,
|
|
|
this.ButtonPollingSetting,
|
|
|
- this.ButtionPolling});
|
|
|
+ this.ButtionPolling,
|
|
|
+ this.ButtonDeviceStatus,
|
|
|
+ this.ButtonWorkCenterStatus});
|
|
|
this.RibbonNav.Location = new System.Drawing.Point(0, 0);
|
|
|
- this.RibbonNav.MaxItemId = 13;
|
|
|
+ this.RibbonNav.MaxItemId = 15;
|
|
|
this.RibbonNav.Name = "RibbonNav";
|
|
|
this.RibbonNav.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
|
|
|
this.DeviceInf,
|
|
|
@@ -164,37 +182,26 @@ namespace UAS_DeviceMonitor
|
|
|
//
|
|
|
// ButtonDeviceList
|
|
|
//
|
|
|
- this.ButtonDeviceList.Caption = "设备清单";
|
|
|
+ this.ButtonDeviceList.Caption = "设备主档资料";
|
|
|
this.ButtonDeviceList.Id = 5;
|
|
|
this.ButtonDeviceList.LargeGlyph = global::UAS_DeviceMonitor.Properties.Resources.netstatus_tx_64px_18991_easyicon_net;
|
|
|
this.ButtonDeviceList.Name = "ButtonDeviceList";
|
|
|
this.ButtonDeviceList.Tag = "PageDeviceList";
|
|
|
this.ButtonDeviceList.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
//
|
|
|
- // ButtonDeviceKind
|
|
|
- //
|
|
|
- this.ButtonDeviceKind.Caption = "设备类型维护";
|
|
|
- this.ButtonDeviceKind.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceKind.Glyph")));
|
|
|
- this.ButtonDeviceKind.Id = 6;
|
|
|
- this.ButtonDeviceKind.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceKind.LargeGlyph")));
|
|
|
- this.ButtonDeviceKind.Name = "ButtonDeviceKind";
|
|
|
- this.ButtonDeviceKind.RibbonStyle = DevExpress.XtraBars.Ribbon.RibbonItemStyles.Large;
|
|
|
- this.ButtonDeviceKind.Tag = "PageDeviceKind";
|
|
|
- this.ButtonDeviceKind.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
- //
|
|
|
- // ButtonDeviceStatus
|
|
|
+ // ButtonDeviceNetSetting
|
|
|
//
|
|
|
- this.ButtonDeviceStatus.Caption = "运行状态";
|
|
|
- this.ButtonDeviceStatus.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceStatus.Glyph")));
|
|
|
- this.ButtonDeviceStatus.Id = 8;
|
|
|
- this.ButtonDeviceStatus.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceStatus.LargeGlyph")));
|
|
|
- this.ButtonDeviceStatus.Name = "ButtonDeviceStatus";
|
|
|
- this.ButtonDeviceStatus.Tag = "PageDeviceStatus";
|
|
|
- this.ButtonDeviceStatus.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
+ this.ButtonDeviceNetSetting.Caption = "设备联网配置";
|
|
|
+ this.ButtonDeviceNetSetting.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceNetSetting.Glyph")));
|
|
|
+ this.ButtonDeviceNetSetting.Id = 8;
|
|
|
+ this.ButtonDeviceNetSetting.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceNetSetting.LargeGlyph")));
|
|
|
+ this.ButtonDeviceNetSetting.Name = "ButtonDeviceNetSetting";
|
|
|
+ this.ButtonDeviceNetSetting.Tag = "PageDeviceNetSetting";
|
|
|
+ this.ButtonDeviceNetSetting.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
//
|
|
|
// ButtonCommandSet
|
|
|
//
|
|
|
- this.ButtonCommandSet.Caption = "指令设置";
|
|
|
+ this.ButtonCommandSet.Caption = "通信规则定义";
|
|
|
this.ButtonCommandSet.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.Glyph")));
|
|
|
this.ButtonCommandSet.Id = 9;
|
|
|
this.ButtonCommandSet.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonCommandSet.LargeGlyph")));
|
|
|
@@ -204,7 +211,7 @@ namespace UAS_DeviceMonitor
|
|
|
//
|
|
|
// ButtonPollingSetting
|
|
|
//
|
|
|
- this.ButtonPollingSetting.Caption = "轮询配置";
|
|
|
+ this.ButtonPollingSetting.Caption = "设备轮询配置";
|
|
|
this.ButtonPollingSetting.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonPollingSetting.Glyph")));
|
|
|
this.ButtonPollingSetting.Id = 11;
|
|
|
this.ButtonPollingSetting.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonPollingSetting.LargeGlyph")));
|
|
|
@@ -214,7 +221,7 @@ namespace UAS_DeviceMonitor
|
|
|
//
|
|
|
// ButtionPolling
|
|
|
//
|
|
|
- this.ButtionPolling.Caption = "轮询业务";
|
|
|
+ this.ButtionPolling.Caption = "轮询业务定义";
|
|
|
this.ButtionPolling.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtionPolling.Glyph")));
|
|
|
this.ButtionPolling.Id = 12;
|
|
|
this.ButtionPolling.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtionPolling.LargeGlyph")));
|
|
|
@@ -222,19 +229,41 @@ namespace UAS_DeviceMonitor
|
|
|
this.ButtionPolling.Tag = "PagePolling";
|
|
|
this.ButtionPolling.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
//
|
|
|
+ // ButtonDeviceStatus
|
|
|
+ //
|
|
|
+ this.ButtonDeviceStatus.Caption = "设备运行监控";
|
|
|
+ this.ButtonDeviceStatus.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceStatus.Glyph")));
|
|
|
+ this.ButtonDeviceStatus.Id = 13;
|
|
|
+ this.ButtonDeviceStatus.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonDeviceStatus.LargeGlyph")));
|
|
|
+ this.ButtonDeviceStatus.Name = "ButtonDeviceStatus";
|
|
|
+ this.ButtonDeviceStatus.Tag = "PageDeviceStatus";
|
|
|
+ this.ButtonDeviceStatus.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
+ //
|
|
|
+ // ButtonWorkCenterStatus
|
|
|
+ //
|
|
|
+ this.ButtonWorkCenterStatus.Caption = "车间全局监控";
|
|
|
+ this.ButtonWorkCenterStatus.Glyph = ((System.Drawing.Image)(resources.GetObject("ButtonWorkCenterStatus.Glyph")));
|
|
|
+ this.ButtonWorkCenterStatus.Id = 14;
|
|
|
+ this.ButtonWorkCenterStatus.LargeGlyph = ((System.Drawing.Image)(resources.GetObject("ButtonWorkCenterStatus.LargeGlyph")));
|
|
|
+ this.ButtonWorkCenterStatus.Name = "ButtonWorkCenterStatus";
|
|
|
+ this.ButtonWorkCenterStatus.Tag = "PageWorkCenterStatus";
|
|
|
+ this.ButtonWorkCenterStatus.ItemClick += new DevExpress.XtraBars.ItemClickEventHandler(this.ButtonItem_ItemClick);
|
|
|
+ //
|
|
|
// DeviceInf
|
|
|
//
|
|
|
this.DeviceInf.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
|
|
|
this.RibDeviceInf});
|
|
|
this.DeviceInf.Name = "DeviceInf";
|
|
|
- this.DeviceInf.Text = "设备信息";
|
|
|
+ this.DeviceInf.Text = "设备参数配置";
|
|
|
//
|
|
|
// RibDeviceInf
|
|
|
//
|
|
|
this.RibDeviceInf.AllowTextClipping = false;
|
|
|
+ this.RibDeviceInf.ItemLinks.Add(this.ButtonCommandSet, true);
|
|
|
this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceList);
|
|
|
- this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceKind);
|
|
|
- this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceStatus);
|
|
|
+ this.RibDeviceInf.ItemLinks.Add(this.ButtonDeviceNetSetting);
|
|
|
+ this.RibDeviceInf.ItemLinks.Add(this.ButtionPolling);
|
|
|
+ this.RibDeviceInf.ItemLinks.Add(this.ButtonPollingSetting);
|
|
|
this.RibDeviceInf.Name = "RibDeviceInf";
|
|
|
this.RibDeviceInf.ShowCaptionButton = false;
|
|
|
//
|
|
|
@@ -243,13 +272,12 @@ namespace UAS_DeviceMonitor
|
|
|
this.DeviceCommandSetting.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
|
|
|
this.RibDeviceCommand});
|
|
|
this.DeviceCommandSetting.Name = "DeviceCommandSetting";
|
|
|
- this.DeviceCommandSetting.Text = "设备指令配置";
|
|
|
+ this.DeviceCommandSetting.Text = "设备运行监控";
|
|
|
//
|
|
|
// RibDeviceCommand
|
|
|
//
|
|
|
- this.RibDeviceCommand.ItemLinks.Add(this.ButtonCommandSet);
|
|
|
- this.RibDeviceCommand.ItemLinks.Add(this.ButtionPolling);
|
|
|
- this.RibDeviceCommand.ItemLinks.Add(this.ButtonPollingSetting);
|
|
|
+ this.RibDeviceCommand.ItemLinks.Add(this.ButtonDeviceStatus);
|
|
|
+ this.RibDeviceCommand.ItemLinks.Add(this.ButtonWorkCenterStatus);
|
|
|
this.RibDeviceCommand.Name = "RibDeviceCommand";
|
|
|
this.RibDeviceCommand.Text = "ribbonPageGroup3";
|
|
|
//
|
|
|
@@ -265,28 +293,29 @@ namespace UAS_DeviceMonitor
|
|
|
this.MainTabControl.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
|
|
|
this.PageDeviceList,
|
|
|
this.PageCommandSet,
|
|
|
- this.PageDeviceKind,
|
|
|
- this.PageDeviceStatus,
|
|
|
+ this.PageDeviceNetSetting,
|
|
|
this.PagePollingSetting,
|
|
|
- this.PagePolling});
|
|
|
+ this.PagePolling,
|
|
|
+ this.PageDeviceStatus,
|
|
|
+ this.PageWorkCenterStatus});
|
|
|
//
|
|
|
// PageDeviceList
|
|
|
//
|
|
|
- this.PageDeviceList.Controls.Add(this.PageControlDeviceList);
|
|
|
+ this.PageDeviceList.Controls.Add(this.ToolPageControlDeviceList);
|
|
|
this.PageDeviceList.Controls.Add(this.GridDeviceList);
|
|
|
this.PageDeviceList.Name = "PageDeviceList";
|
|
|
this.PageDeviceList.PageVisible = false;
|
|
|
this.PageDeviceList.Size = new System.Drawing.Size(1027, 577);
|
|
|
this.PageDeviceList.Text = "xtraTabPage1";
|
|
|
//
|
|
|
- // PageControlDeviceList
|
|
|
+ // ToolPageControlDeviceList
|
|
|
//
|
|
|
- this.PageControlDeviceList.Dock = System.Windows.Forms.DockStyle.Bottom;
|
|
|
- this.PageControlDeviceList.Gridcontrol = null;
|
|
|
- this.PageControlDeviceList.Location = new System.Drawing.Point(0, 548);
|
|
|
- this.PageControlDeviceList.Name = "PageControlDeviceList";
|
|
|
- this.PageControlDeviceList.Size = new System.Drawing.Size(1027, 29);
|
|
|
- this.PageControlDeviceList.TabIndex = 1;
|
|
|
+ this.ToolPageControlDeviceList.Dock = System.Windows.Forms.DockStyle.Bottom;
|
|
|
+ this.ToolPageControlDeviceList.Gridcontrol = null;
|
|
|
+ this.ToolPageControlDeviceList.Location = new System.Drawing.Point(0, 548);
|
|
|
+ this.ToolPageControlDeviceList.Name = "ToolPageControlDeviceList";
|
|
|
+ this.ToolPageControlDeviceList.Size = new System.Drawing.Size(1027, 29);
|
|
|
+ this.ToolPageControlDeviceList.TabIndex = 1;
|
|
|
//
|
|
|
// GridDeviceList
|
|
|
//
|
|
|
@@ -322,6 +351,7 @@ namespace UAS_DeviceMonitor
|
|
|
this.GridViewDeviceList.GridControl = this.GridDeviceList;
|
|
|
this.GridViewDeviceList.IndicatorWidth = 30;
|
|
|
this.GridViewDeviceList.Name = "GridViewDeviceList";
|
|
|
+ this.GridViewDeviceList.OptionsView.ShowGroupPanel = false;
|
|
|
//
|
|
|
// de_id
|
|
|
//
|
|
|
@@ -506,6 +536,7 @@ namespace UAS_DeviceMonitor
|
|
|
this.GridViewCommandSet.GridControl = this.GridCommandSetting;
|
|
|
this.GridViewCommandSet.IndicatorWidth = 30;
|
|
|
this.GridViewCommandSet.Name = "GridViewCommandSet";
|
|
|
+ this.GridViewCommandSet.OptionsView.ShowGroupPanel = false;
|
|
|
//
|
|
|
// CommandSetCheckedColumn
|
|
|
//
|
|
|
@@ -556,19 +587,32 @@ namespace UAS_DeviceMonitor
|
|
|
this.dc_command.VisibleIndex = 3;
|
|
|
this.dc_command.Width = 768;
|
|
|
//
|
|
|
- // PageDeviceKind
|
|
|
+ // PageDeviceNetSetting
|
|
|
//
|
|
|
- this.PageDeviceKind.Name = "PageDeviceKind";
|
|
|
- this.PageDeviceKind.PageVisible = false;
|
|
|
- this.PageDeviceKind.Size = new System.Drawing.Size(1027, 577);
|
|
|
- this.PageDeviceKind.Text = "xtraTabPage2";
|
|
|
+ this.PageDeviceNetSetting.Controls.Add(this.GridDeviceNetSetting);
|
|
|
+ this.PageDeviceNetSetting.Name = "PageDeviceNetSetting";
|
|
|
+ this.PageDeviceNetSetting.PageVisible = false;
|
|
|
+ this.PageDeviceNetSetting.Size = new System.Drawing.Size(1027, 577);
|
|
|
//
|
|
|
- // PageDeviceStatus
|
|
|
+ // GridDeviceNetSetting
|
|
|
//
|
|
|
- this.PageDeviceStatus.Name = "PageDeviceStatus";
|
|
|
- this.PageDeviceStatus.PageVisible = false;
|
|
|
- this.PageDeviceStatus.Size = new System.Drawing.Size(1027, 577);
|
|
|
- this.PageDeviceStatus.Text = "xtraTabPage3";
|
|
|
+ this.GridDeviceNetSetting.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.GridDeviceNetSetting.Location = new System.Drawing.Point(0, 2);
|
|
|
+ this.GridDeviceNetSetting.MainView = this.GridViewDeviceNetSetting;
|
|
|
+ this.GridDeviceNetSetting.MenuManager = this.RibbonNav;
|
|
|
+ this.GridDeviceNetSetting.Name = "GridDeviceNetSetting";
|
|
|
+ this.GridDeviceNetSetting.Size = new System.Drawing.Size(1024, 572);
|
|
|
+ this.GridDeviceNetSetting.TabIndex = 0;
|
|
|
+ this.GridDeviceNetSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
+ this.GridViewDeviceNetSetting});
|
|
|
+ //
|
|
|
+ // GridViewDeviceNetSetting
|
|
|
+ //
|
|
|
+ this.GridViewDeviceNetSetting.GridControl = this.GridDeviceNetSetting;
|
|
|
+ this.GridViewDeviceNetSetting.Name = "GridViewDeviceNetSetting";
|
|
|
+ this.GridViewDeviceNetSetting.OptionsView.ShowGroupPanel = false;
|
|
|
//
|
|
|
// PagePollingSetting
|
|
|
//
|
|
|
@@ -678,6 +722,7 @@ namespace UAS_DeviceMonitor
|
|
|
this.GridViewPollSetting.IndicatorWidth = 30;
|
|
|
this.GridViewPollSetting.Name = "GridViewPollSetting";
|
|
|
this.GridViewPollSetting.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CheckBoxRowSelect;
|
|
|
+ this.GridViewPollSetting.OptionsView.ShowGroupPanel = false;
|
|
|
this.GridViewPollSetting.CellValueChanging += new DevExpress.XtraGrid.Views.Base.CellValueChangedEventHandler(this.GridViewPollSetting_CellValueChanging);
|
|
|
//
|
|
|
// PollSettingCheckedColumn
|
|
|
@@ -816,16 +861,6 @@ namespace UAS_DeviceMonitor
|
|
|
this.dpc_dccode.VisibleIndex = 5;
|
|
|
this.dpc_dccode.Width = 90;
|
|
|
//
|
|
|
- // PollingSetItemLookUpEdit
|
|
|
- //
|
|
|
- this.PollingSetItemLookUpEdit.AutoHeight = false;
|
|
|
- this.PollingSetItemLookUpEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
|
|
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
|
|
- this.PollingSetItemLookUpEdit.Name = "PollingSetItemLookUpEdit";
|
|
|
- this.PollingSetItemLookUpEdit.NullText = "";
|
|
|
- this.PollingSetItemLookUpEdit.ShowFooter = false;
|
|
|
- this.PollingSetItemLookUpEdit.ShowHeader = false;
|
|
|
- //
|
|
|
// dpc_function
|
|
|
//
|
|
|
this.dpc_function.Caption = "解析函数";
|
|
|
@@ -873,6 +908,16 @@ namespace UAS_DeviceMonitor
|
|
|
this.POLLSETTINGSTATUSCOLUMN.VisibleIndex = 10;
|
|
|
this.POLLSETTINGSTATUSCOLUMN.Width = 98;
|
|
|
//
|
|
|
+ // PollingSetItemLookUpEdit
|
|
|
+ //
|
|
|
+ this.PollingSetItemLookUpEdit.AutoHeight = false;
|
|
|
+ this.PollingSetItemLookUpEdit.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
|
|
|
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
|
|
|
+ this.PollingSetItemLookUpEdit.Name = "PollingSetItemLookUpEdit";
|
|
|
+ this.PollingSetItemLookUpEdit.NullText = "";
|
|
|
+ this.PollingSetItemLookUpEdit.ShowFooter = false;
|
|
|
+ this.PollingSetItemLookUpEdit.ShowHeader = false;
|
|
|
+ //
|
|
|
// PagePolling
|
|
|
//
|
|
|
this.PagePolling.Controls.Add(this.ButtonAddPolling);
|
|
|
@@ -951,6 +996,7 @@ namespace UAS_DeviceMonitor
|
|
|
this.GridViewPolling.GridControl = this.GridPolling;
|
|
|
this.GridViewPolling.IndicatorWidth = 30;
|
|
|
this.GridViewPolling.Name = "GridViewPolling";
|
|
|
+ this.GridViewPolling.OptionsView.ShowGroupPanel = false;
|
|
|
//
|
|
|
// PollingCheckedColumn
|
|
|
//
|
|
|
@@ -1010,6 +1056,62 @@ namespace UAS_DeviceMonitor
|
|
|
this.pl_remark.Visible = true;
|
|
|
this.pl_remark.VisibleIndex = 5;
|
|
|
//
|
|
|
+ // PageDeviceStatus
|
|
|
+ //
|
|
|
+ this.PageDeviceStatus.Controls.Add(this.GridDeviceStatus);
|
|
|
+ this.PageDeviceStatus.Name = "PageDeviceStatus";
|
|
|
+ this.PageDeviceStatus.PageVisible = false;
|
|
|
+ this.PageDeviceStatus.Size = new System.Drawing.Size(1027, 577);
|
|
|
+ this.PageDeviceStatus.Text = "xtraTabPage1";
|
|
|
+ //
|
|
|
+ // GridDeviceStatus
|
|
|
+ //
|
|
|
+ this.GridDeviceStatus.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.GridDeviceStatus.Location = new System.Drawing.Point(3, 0);
|
|
|
+ this.GridDeviceStatus.MainView = this.GridViewDeviceStatus;
|
|
|
+ this.GridDeviceStatus.MenuManager = this.RibbonNav;
|
|
|
+ this.GridDeviceStatus.Name = "GridDeviceStatus";
|
|
|
+ this.GridDeviceStatus.Size = new System.Drawing.Size(1024, 577);
|
|
|
+ this.GridDeviceStatus.TabIndex = 0;
|
|
|
+ this.GridDeviceStatus.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
+ this.GridViewDeviceStatus});
|
|
|
+ //
|
|
|
+ // GridViewDeviceStatus
|
|
|
+ //
|
|
|
+ this.GridViewDeviceStatus.GridControl = this.GridDeviceStatus;
|
|
|
+ this.GridViewDeviceStatus.Name = "GridViewDeviceStatus";
|
|
|
+ this.GridViewDeviceStatus.OptionsView.ShowGroupPanel = false;
|
|
|
+ //
|
|
|
+ // PageWorkCenterStatus
|
|
|
+ //
|
|
|
+ this.PageWorkCenterStatus.Controls.Add(this.GridWorkCenterStatus);
|
|
|
+ this.PageWorkCenterStatus.Name = "PageWorkCenterStatus";
|
|
|
+ this.PageWorkCenterStatus.PageVisible = false;
|
|
|
+ this.PageWorkCenterStatus.Size = new System.Drawing.Size(1027, 577);
|
|
|
+ this.PageWorkCenterStatus.Text = "车间全局监控";
|
|
|
+ //
|
|
|
+ // GridWorkCenterStatus
|
|
|
+ //
|
|
|
+ this.GridWorkCenterStatus.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.GridWorkCenterStatus.Location = new System.Drawing.Point(0, 0);
|
|
|
+ this.GridWorkCenterStatus.MainView = this.GridViewWorkCenterStatus;
|
|
|
+ this.GridWorkCenterStatus.MenuManager = this.RibbonNav;
|
|
|
+ this.GridWorkCenterStatus.Name = "GridWorkCenterStatus";
|
|
|
+ this.GridWorkCenterStatus.Size = new System.Drawing.Size(1024, 574);
|
|
|
+ this.GridWorkCenterStatus.TabIndex = 0;
|
|
|
+ this.GridWorkCenterStatus.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
+ this.GridViewWorkCenterStatus});
|
|
|
+ //
|
|
|
+ // GridViewWorkCenterStatus
|
|
|
+ //
|
|
|
+ this.GridViewWorkCenterStatus.GridControl = this.GridWorkCenterStatus;
|
|
|
+ this.GridViewWorkCenterStatus.Name = "GridViewWorkCenterStatus";
|
|
|
+ this.GridViewWorkCenterStatus.OptionsView.ShowGroupPanel = false;
|
|
|
+ //
|
|
|
// Main
|
|
|
//
|
|
|
this.AllowFormGlass = DevExpress.Utils.DefaultBoolean.False;
|
|
|
@@ -1037,6 +1139,9 @@ namespace UAS_DeviceMonitor
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridCommandSetting)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridViewCommandSet)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.CheckEditCommandSet)).EndInit();
|
|
|
+ this.PageDeviceNetSetting.ResumeLayout(false);
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridDeviceNetSetting)).EndInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceNetSetting)).EndInit();
|
|
|
this.PagePollingSetting.ResumeLayout(false);
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).EndInit();
|
|
|
@@ -1047,6 +1152,12 @@ namespace UAS_DeviceMonitor
|
|
|
this.PagePolling.ResumeLayout(false);
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridPolling)).EndInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.GridViewPolling)).EndInit();
|
|
|
+ this.PageDeviceStatus.ResumeLayout(false);
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridDeviceStatus)).EndInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewDeviceStatus)).EndInit();
|
|
|
+ this.PageWorkCenterStatus.ResumeLayout(false);
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridWorkCenterStatus)).EndInit();
|
|
|
+ ((System.ComponentModel.ISupportInitialize)(this.GridViewWorkCenterStatus)).EndInit();
|
|
|
this.ResumeLayout(false);
|
|
|
this.PerformLayout();
|
|
|
|
|
|
@@ -1058,16 +1169,14 @@ namespace UAS_DeviceMonitor
|
|
|
private DevExpress.XtraBars.BarButtonItem ButtonDeviceList;
|
|
|
private DevExpress.XtraBars.Ribbon.RibbonPage DeviceInf;
|
|
|
private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceInf;
|
|
|
- private DevExpress.XtraBars.BarButtonItem ButtonDeviceKind;
|
|
|
private DevExpress.XtraTab.XtraTabControl MainTabControl;
|
|
|
- private DevExpress.XtraBars.BarButtonItem ButtonDeviceStatus;
|
|
|
+ private DevExpress.XtraBars.BarButtonItem ButtonDeviceNetSetting;
|
|
|
private DevExpress.XtraBars.Ribbon.RibbonPage DeviceCommandSetting;
|
|
|
private DevExpress.XtraBars.BarButtonItem ButtonCommandSet;
|
|
|
private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceCommand;
|
|
|
private DevExpress.XtraTab.XtraTabPage PageDeviceList;
|
|
|
private DevExpress.XtraTab.XtraTabPage PageCommandSet;
|
|
|
- private DevExpress.XtraTab.XtraTabPage PageDeviceKind;
|
|
|
- private DevExpress.XtraTab.XtraTabPage PageDeviceStatus;
|
|
|
+ private DevExpress.XtraTab.XtraTabPage PageDeviceNetSetting;
|
|
|
private AutoDataGridControl GridDeviceList;
|
|
|
private DevExpress.XtraBars.BarButtonItem ButtonPollingSetting;
|
|
|
private DevExpress.XtraBars.BarButtonItem ButtionPolling;
|
|
|
@@ -1083,7 +1192,7 @@ namespace UAS_DeviceMonitor
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn de_vendname;
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn de_address;
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn de_wccode;
|
|
|
- private CustomerControl.PagingControl.PageControl PageControlDeviceList;
|
|
|
+ private CustomerControl.PagingControl.PageControl ToolPageControlDeviceList;
|
|
|
private AutoDataGridControl GridCommandSetting;
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn dc_id;
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn dc_code;
|
|
|
@@ -1138,5 +1247,15 @@ namespace UAS_DeviceMonitor
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
|
|
|
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
|
|
|
+ private DevExpress.XtraBars.BarButtonItem ButtonDeviceStatus;
|
|
|
+ private DevExpress.XtraBars.BarButtonItem ButtonWorkCenterStatus;
|
|
|
+ private DevExpress.XtraGrid.GridControl GridDeviceNetSetting;
|
|
|
+ private DevExpress.XtraGrid.Views.Grid.GridView GridViewDeviceNetSetting;
|
|
|
+ private DevExpress.XtraTab.XtraTabPage PageDeviceStatus;
|
|
|
+ private DevExpress.XtraTab.XtraTabPage PageWorkCenterStatus;
|
|
|
+ private DevExpress.XtraGrid.GridControl GridDeviceStatus;
|
|
|
+ private DevExpress.XtraGrid.Views.Grid.GridView GridViewDeviceStatus;
|
|
|
+ private DevExpress.XtraGrid.GridControl GridWorkCenterStatus;
|
|
|
+ private DevExpress.XtraGrid.Views.Grid.GridView GridViewWorkCenterStatus;
|
|
|
}
|
|
|
}
|