|
|
@@ -76,8 +76,20 @@ namespace UAS_DeviceMonitor
|
|
|
this.dc_name = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.dc_command = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.PageDeviceNetSetting = new DevExpress.XtraTab.XtraTabPage();
|
|
|
- this.GridDeviceNetSetting = new DevExpress.XtraGrid.GridControl();
|
|
|
- this.GridViewDeviceNetSetting = new DevExpress.XtraGrid.Views.Grid.GridView();
|
|
|
+ this.ButtonDeleteNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
|
|
|
+ this.ButtonAddNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
|
|
|
+ this.ButtonSaveNetConfig = new UAS_DeviceMonitor.CustomerControl.Button.ButtonSaveGrid();
|
|
|
+ this.GridDeviceNetSetting = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
|
|
|
+ this.GridViewDeviceNetSetting = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
|
|
|
+ this.NetSettingCheckedColumn = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_id = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_decode = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_getway = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_upperip = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_port = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_mac = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_ip = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
+ this.dnc_type = new DevExpress.XtraGrid.Columns.GridColumn();
|
|
|
this.PagePollingSetting = new DevExpress.XtraTab.XtraTabPage();
|
|
|
this.ButtonDeleteCommandSet = new UAS_DeviceMonitor.CustomerControl.Button.ButtonDeleteRow();
|
|
|
this.ButtonNewCommandSet = new UAS_DeviceMonitor.CustomerControl.Button.ButtonAddRow();
|
|
|
@@ -121,11 +133,11 @@ namespace UAS_DeviceMonitor
|
|
|
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.GridDeviceStatus = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
|
|
|
+ this.GridViewDeviceStatus = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
|
|
|
this.PageWorkCenterStatus = new DevExpress.XtraTab.XtraTabPage();
|
|
|
- this.GridWorkCenterStatus = new DevExpress.XtraGrid.GridControl();
|
|
|
- this.GridViewWorkCenterStatus = new DevExpress.XtraGrid.Views.Grid.GridView();
|
|
|
+ this.GridWorkCenterStatus = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
|
|
|
+ this.GridViewWorkCenterStatus = new UAS_DeviceMonitor.CustomerControl.GridViewWithSerialNum.GridViewWithSerialNum();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.RibbonNav)).BeginInit();
|
|
|
((System.ComponentModel.ISupportInitialize)(this.MainTabControl)).BeginInit();
|
|
|
this.MainTabControl.SuspendLayout();
|
|
|
@@ -589,31 +601,158 @@ namespace UAS_DeviceMonitor
|
|
|
//
|
|
|
// PageDeviceNetSetting
|
|
|
//
|
|
|
+ this.PageDeviceNetSetting.Controls.Add(this.ButtonDeleteNetConfig);
|
|
|
+ this.PageDeviceNetSetting.Controls.Add(this.ButtonAddNetConfig);
|
|
|
+ this.PageDeviceNetSetting.Controls.Add(this.ButtonSaveNetConfig);
|
|
|
this.PageDeviceNetSetting.Controls.Add(this.GridDeviceNetSetting);
|
|
|
this.PageDeviceNetSetting.Name = "PageDeviceNetSetting";
|
|
|
this.PageDeviceNetSetting.PageVisible = false;
|
|
|
this.PageDeviceNetSetting.Size = new System.Drawing.Size(1027, 577);
|
|
|
//
|
|
|
+ // ButtonDeleteNetConfig
|
|
|
+ //
|
|
|
+ this.ButtonDeleteNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
|
|
+ this.ButtonDeleteNetConfig.Grid = null;
|
|
|
+ this.ButtonDeleteNetConfig.Location = new System.Drawing.Point(813, 548);
|
|
|
+ this.ButtonDeleteNetConfig.Name = "ButtonDeleteNetConfig";
|
|
|
+ this.ButtonDeleteNetConfig.Size = new System.Drawing.Size(64, 23);
|
|
|
+ this.ButtonDeleteNetConfig.TabIndex = 12;
|
|
|
+ this.ButtonDeleteNetConfig.Text = "删除";
|
|
|
+ //
|
|
|
+ // ButtonAddNetConfig
|
|
|
+ //
|
|
|
+ this.ButtonAddNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
|
|
+ this.ButtonAddNetConfig.Grid = null;
|
|
|
+ this.ButtonAddNetConfig.Location = new System.Drawing.Point(883, 548);
|
|
|
+ this.ButtonAddNetConfig.Name = "ButtonAddNetConfig";
|
|
|
+ this.ButtonAddNetConfig.Size = new System.Drawing.Size(64, 23);
|
|
|
+ this.ButtonAddNetConfig.TabIndex = 11;
|
|
|
+ this.ButtonAddNetConfig.Text = "新增";
|
|
|
+ //
|
|
|
+ // ButtonSaveNetConfig
|
|
|
+ //
|
|
|
+ this.ButtonSaveNetConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
|
|
|
+ this.ButtonSaveNetConfig.Grid = null;
|
|
|
+ this.ButtonSaveNetConfig.HandlerOtherFirst = false;
|
|
|
+ this.ButtonSaveNetConfig.Location = new System.Drawing.Point(953, 548);
|
|
|
+ this.ButtonSaveNetConfig.Name = "ButtonSaveNetConfig";
|
|
|
+ this.ButtonSaveNetConfig.Size = new System.Drawing.Size(64, 23);
|
|
|
+ this.ButtonSaveNetConfig.TabIndex = 10;
|
|
|
+ this.ButtonSaveNetConfig.Text = "保存";
|
|
|
+ //
|
|
|
// GridDeviceNetSetting
|
|
|
//
|
|
|
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.Condition = null;
|
|
|
+ this.GridDeviceNetSetting.GetDataSQL = null;
|
|
|
+ this.GridDeviceNetSetting.ID = null;
|
|
|
+ this.GridDeviceNetSetting.InsertSQL = null;
|
|
|
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.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
|
|
|
+ this.dpc_enableCheckEdit});
|
|
|
+ this.GridDeviceNetSetting.RowCount = 0;
|
|
|
+ this.GridDeviceNetSetting.Size = new System.Drawing.Size(1024, 540);
|
|
|
this.GridDeviceNetSetting.TabIndex = 0;
|
|
|
+ this.GridDeviceNetSetting.TableName = null;
|
|
|
this.GridDeviceNetSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
this.GridViewDeviceNetSetting});
|
|
|
//
|
|
|
// GridViewDeviceNetSetting
|
|
|
//
|
|
|
+ this.GridViewDeviceNetSetting.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
|
|
|
+ this.NetSettingCheckedColumn,
|
|
|
+ this.dnc_id,
|
|
|
+ this.dnc_decode,
|
|
|
+ this.dnc_getway,
|
|
|
+ this.dnc_upperip,
|
|
|
+ this.dnc_port,
|
|
|
+ this.dnc_mac,
|
|
|
+ this.dnc_ip,
|
|
|
+ this.dnc_type});
|
|
|
this.GridViewDeviceNetSetting.GridControl = this.GridDeviceNetSetting;
|
|
|
+ this.GridViewDeviceNetSetting.IndicatorWidth = 30;
|
|
|
this.GridViewDeviceNetSetting.Name = "GridViewDeviceNetSetting";
|
|
|
this.GridViewDeviceNetSetting.OptionsView.ShowGroupPanel = false;
|
|
|
//
|
|
|
+ // NetSettingCheckedColumn
|
|
|
+ //
|
|
|
+ this.NetSettingCheckedColumn.Caption = " ";
|
|
|
+ this.NetSettingCheckedColumn.ColumnEdit = this.dpc_enableCheckEdit;
|
|
|
+ this.NetSettingCheckedColumn.FieldName = "CHECKEDCOLUMN";
|
|
|
+ this.NetSettingCheckedColumn.Name = "NetSettingCheckedColumn";
|
|
|
+ this.NetSettingCheckedColumn.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.False;
|
|
|
+ this.NetSettingCheckedColumn.OptionsFilter.AllowFilter = false;
|
|
|
+ this.NetSettingCheckedColumn.Tag = "0";
|
|
|
+ this.NetSettingCheckedColumn.Visible = true;
|
|
|
+ this.NetSettingCheckedColumn.VisibleIndex = 0;
|
|
|
+ //
|
|
|
+ // dnc_id
|
|
|
+ //
|
|
|
+ this.dnc_id.Caption = "ID";
|
|
|
+ this.dnc_id.FieldName = "DNC_ID";
|
|
|
+ this.dnc_id.Name = "dnc_id";
|
|
|
+ //
|
|
|
+ // dnc_decode
|
|
|
+ //
|
|
|
+ this.dnc_decode.Caption = "设备编号";
|
|
|
+ this.dnc_decode.FieldName = "DNC_DECODE";
|
|
|
+ this.dnc_decode.Name = "dnc_decode";
|
|
|
+ this.dnc_decode.Visible = true;
|
|
|
+ this.dnc_decode.VisibleIndex = 1;
|
|
|
+ //
|
|
|
+ // dnc_getway
|
|
|
+ //
|
|
|
+ this.dnc_getway.Caption = "网关";
|
|
|
+ this.dnc_getway.FieldName = "DNC_GATEWAY";
|
|
|
+ this.dnc_getway.Name = "dnc_getway";
|
|
|
+ this.dnc_getway.Visible = true;
|
|
|
+ this.dnc_getway.VisibleIndex = 2;
|
|
|
+ //
|
|
|
+ // dnc_upperip
|
|
|
+ //
|
|
|
+ this.dnc_upperip.Caption = "上级IP";
|
|
|
+ this.dnc_upperip.FieldName = "DNC_UPPERIP";
|
|
|
+ this.dnc_upperip.Name = "dnc_upperip";
|
|
|
+ this.dnc_upperip.Visible = true;
|
|
|
+ this.dnc_upperip.VisibleIndex = 3;
|
|
|
+ //
|
|
|
+ // dnc_port
|
|
|
+ //
|
|
|
+ this.dnc_port.Caption = "端口";
|
|
|
+ this.dnc_port.FieldName = "DNC_PORT";
|
|
|
+ this.dnc_port.Name = "dnc_port";
|
|
|
+ this.dnc_port.Visible = true;
|
|
|
+ this.dnc_port.VisibleIndex = 4;
|
|
|
+ //
|
|
|
+ // dnc_mac
|
|
|
+ //
|
|
|
+ this.dnc_mac.Caption = "MAC";
|
|
|
+ this.dnc_mac.FieldName = "DNC_MAC";
|
|
|
+ this.dnc_mac.Name = "dnc_mac";
|
|
|
+ this.dnc_mac.Visible = true;
|
|
|
+ this.dnc_mac.VisibleIndex = 5;
|
|
|
+ //
|
|
|
+ // dnc_ip
|
|
|
+ //
|
|
|
+ this.dnc_ip.Caption = "IP";
|
|
|
+ this.dnc_ip.FieldName = "DNC_IP";
|
|
|
+ this.dnc_ip.Name = "dnc_ip";
|
|
|
+ this.dnc_ip.Visible = true;
|
|
|
+ this.dnc_ip.VisibleIndex = 6;
|
|
|
+ //
|
|
|
+ // dnc_type
|
|
|
+ //
|
|
|
+ this.dnc_type.Caption = "类型";
|
|
|
+ this.dnc_type.FieldName = "DNC_TYPE";
|
|
|
+ this.dnc_type.Name = "dnc_type";
|
|
|
+ this.dnc_type.Visible = true;
|
|
|
+ this.dnc_type.VisibleIndex = 7;
|
|
|
+ //
|
|
|
// PagePollingSetting
|
|
|
//
|
|
|
this.PagePollingSetting.Controls.Add(this.ButtonDeleteCommandSet);
|
|
|
@@ -742,8 +881,6 @@ namespace UAS_DeviceMonitor
|
|
|
this.dpc_enableCheckEdit.AutoHeight = false;
|
|
|
this.dpc_enableCheckEdit.Name = "dpc_enableCheckEdit";
|
|
|
this.dpc_enableCheckEdit.NullStyle = DevExpress.XtraEditors.Controls.StyleIndeterminate.Unchecked;
|
|
|
- this.dpc_enableCheckEdit.PictureChecked = ((System.Drawing.Image)(resources.GetObject("dpc_enableCheckEdit.PictureChecked")));
|
|
|
- this.dpc_enableCheckEdit.PictureUnchecked = ((System.Drawing.Image)(resources.GetObject("dpc_enableCheckEdit.PictureUnchecked")));
|
|
|
this.dpc_enableCheckEdit.ValueChecked = "-1";
|
|
|
this.dpc_enableCheckEdit.ValueUnchecked = "0";
|
|
|
//
|
|
|
@@ -1069,18 +1206,25 @@ namespace UAS_DeviceMonitor
|
|
|
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.Condition = null;
|
|
|
+ this.GridDeviceStatus.GetDataSQL = null;
|
|
|
+ this.GridDeviceStatus.ID = null;
|
|
|
+ this.GridDeviceStatus.InsertSQL = null;
|
|
|
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.RowCount = 0;
|
|
|
this.GridDeviceStatus.Size = new System.Drawing.Size(1024, 577);
|
|
|
this.GridDeviceStatus.TabIndex = 0;
|
|
|
+ this.GridDeviceStatus.TableName = null;
|
|
|
this.GridDeviceStatus.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
this.GridViewDeviceStatus});
|
|
|
//
|
|
|
// GridViewDeviceStatus
|
|
|
//
|
|
|
this.GridViewDeviceStatus.GridControl = this.GridDeviceStatus;
|
|
|
+ this.GridViewDeviceStatus.IndicatorWidth = 30;
|
|
|
this.GridViewDeviceStatus.Name = "GridViewDeviceStatus";
|
|
|
this.GridViewDeviceStatus.OptionsView.ShowGroupPanel = false;
|
|
|
//
|
|
|
@@ -1097,18 +1241,25 @@ namespace UAS_DeviceMonitor
|
|
|
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.Condition = null;
|
|
|
+ this.GridWorkCenterStatus.GetDataSQL = null;
|
|
|
+ this.GridWorkCenterStatus.ID = null;
|
|
|
+ this.GridWorkCenterStatus.InsertSQL = null;
|
|
|
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.RowCount = 0;
|
|
|
this.GridWorkCenterStatus.Size = new System.Drawing.Size(1024, 574);
|
|
|
this.GridWorkCenterStatus.TabIndex = 0;
|
|
|
+ this.GridWorkCenterStatus.TableName = null;
|
|
|
this.GridWorkCenterStatus.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
|
|
|
this.GridViewWorkCenterStatus});
|
|
|
//
|
|
|
// GridViewWorkCenterStatus
|
|
|
//
|
|
|
this.GridViewWorkCenterStatus.GridControl = this.GridWorkCenterStatus;
|
|
|
+ this.GridViewWorkCenterStatus.IndicatorWidth = 30;
|
|
|
this.GridViewWorkCenterStatus.Name = "GridViewWorkCenterStatus";
|
|
|
this.GridViewWorkCenterStatus.OptionsView.ShowGroupPanel = false;
|
|
|
//
|
|
|
@@ -1249,13 +1400,25 @@ namespace UAS_DeviceMonitor
|
|
|
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 AutoDataGridControl GridDeviceNetSetting;
|
|
|
+ private GridViewWithSerialNum 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;
|
|
|
+ private AutoDataGridControl GridDeviceStatus;
|
|
|
+ private GridViewWithSerialNum GridViewDeviceStatus;
|
|
|
+ private AutoDataGridControl GridWorkCenterStatus;
|
|
|
+ private GridViewWithSerialNum GridViewWorkCenterStatus;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_id;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_decode;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_getway;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_upperip;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_port;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_mac;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_ip;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn dnc_type;
|
|
|
+ private CustomerControl.Button.ButtonDeleteRow ButtonDeleteNetConfig;
|
|
|
+ private CustomerControl.Button.ButtonAddRow ButtonAddNetConfig;
|
|
|
+ private CustomerControl.Button.ButtonSaveGrid ButtonSaveNetConfig;
|
|
|
+ private DevExpress.XtraGrid.Columns.GridColumn NetSettingCheckedColumn;
|
|
|
}
|
|
|
}
|