章政 пре 7 година
родитељ
комит
aaad98a810
3 измењених фајлова са 84 додато и 132 уклоњено
  1. 39 82
      UAS_DeviceMonitor/Main.Designer.cs
  2. 29 17
      UAS_DeviceMonitor/Main.cs
  3. 16 33
      UAS_DeviceMonitor/Main.resx

+ 39 - 82
UAS_DeviceMonitor/Main.Designer.cs

@@ -45,8 +45,6 @@ namespace UAS_DeviceMonitor
             this.RibDeviceInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.DeviceCommandSetting = new DevExpress.XtraBars.Ribbon.RibbonPage();
             this.RibDeviceCommand = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
-            this.ribbonPage2 = new DevExpress.XtraBars.Ribbon.RibbonPage();
-            this.RibDeviceBadInf = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonStatusBar = new DevExpress.XtraBars.Ribbon.RibbonStatusBar();
             this.ribbonPageGroup1 = new DevExpress.XtraBars.Ribbon.RibbonPageGroup();
             this.ribbonPage1 = new DevExpress.XtraBars.Ribbon.RibbonPage();
@@ -66,7 +64,7 @@ namespace UAS_DeviceMonitor
             this.de_address = new DevExpress.XtraGrid.Columns.GridColumn();
             this.de_wccode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PageCommandSet = new DevExpress.XtraTab.XtraTabPage();
-            this.GridCommandSetting = new DevExpress.XtraGrid.GridControl();
+            this.GridCommandSetting = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
             this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.dc_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dc_code = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -75,10 +73,7 @@ namespace UAS_DeviceMonitor
             this.PageDeviceKind = new DevExpress.XtraTab.XtraTabPage();
             this.PageDeviceStatus = new DevExpress.XtraTab.XtraTabPage();
             this.PagePollingSetting = new DevExpress.XtraTab.XtraTabPage();
-            this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
-            this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
-            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
-            this.GridPollingSetting = new DevExpress.XtraGrid.GridControl();
+            this.GridPollingSetting = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
             this.GridViewPollSetting = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.dpc_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_decode = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -88,12 +83,12 @@ namespace UAS_DeviceMonitor
             this.dpc_dccode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_function = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_enable = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+            this.dpc_enableCheckEdit = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.dpc_status = new DevExpress.XtraGrid.Columns.GridColumn();
             this.dpc_remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.PagePolling = new DevExpress.XtraTab.XtraTabPage();
-            this.GridPolling = new DevExpress.XtraGrid.GridControl();
-            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.GridPolling = new UAS_DeviceMonitor.CustomerControl.AutoDataGridControl.AutoDataGridControl();
+            this.GridViewPolling = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.pl_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pl_code = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pl_name = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -112,10 +107,10 @@ namespace UAS_DeviceMonitor
             this.PagePollingSetting.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dpc_enableCheckEdit)).BeginInit();
             this.PagePolling.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.GridPolling)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GridViewPolling)).BeginInit();
             this.SuspendLayout();
             // 
             // RibbonNav
@@ -139,8 +134,7 @@ namespace UAS_DeviceMonitor
             this.RibbonNav.Name = "RibbonNav";
             this.RibbonNav.Pages.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPage[] {
             this.DeviceInf,
-            this.DeviceCommandSetting,
-            this.ribbonPage2});
+            this.DeviceCommandSetting});
             this.RibbonNav.Size = new System.Drawing.Size(1033, 128);
             this.RibbonNav.StatusBar = this.ribbonStatusBar;
             // 
@@ -260,19 +254,6 @@ namespace UAS_DeviceMonitor
             this.RibDeviceCommand.Name = "RibDeviceCommand";
             this.RibDeviceCommand.Text = "ribbonPageGroup3";
             // 
-            // ribbonPage2
-            // 
-            this.ribbonPage2.Groups.AddRange(new DevExpress.XtraBars.Ribbon.RibbonPageGroup[] {
-            this.RibDeviceBadInf});
-            this.ribbonPage2.Name = "ribbonPage2";
-            this.ribbonPage2.Text = "设备故障监控";
-            // 
-            // RibDeviceBadInf
-            // 
-            this.RibDeviceBadInf.ItemLinks.Add(this.barButtonItem5);
-            this.RibDeviceBadInf.Name = "RibDeviceBadInf";
-            this.RibDeviceBadInf.Text = "ribbonPageGroup4";
-            // 
             // ribbonStatusBar
             // 
             this.ribbonStatusBar.Location = new System.Drawing.Point(0, 680);
@@ -451,10 +432,12 @@ namespace UAS_DeviceMonitor
             this.GridCommandSetting.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.GridCommandSetting.GetDataSQL = null;
             this.GridCommandSetting.Location = new System.Drawing.Point(0, -1);
             this.GridCommandSetting.MainView = this.gridView2;
             this.GridCommandSetting.MenuManager = this.RibbonNav;
             this.GridCommandSetting.Name = "GridCommandSetting";
+            this.GridCommandSetting.RowCount = 0;
             this.GridCommandSetting.Size = new System.Drawing.Size(1027, 511);
             this.GridCommandSetting.TabIndex = 1;
             this.GridCommandSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -518,50 +501,22 @@ namespace UAS_DeviceMonitor
             // 
             // PagePollingSetting
             // 
-            this.PagePollingSetting.Controls.Add(this.simpleButton3);
-            this.PagePollingSetting.Controls.Add(this.simpleButton2);
-            this.PagePollingSetting.Controls.Add(this.simpleButton1);
             this.PagePollingSetting.Controls.Add(this.GridPollingSetting);
             this.PagePollingSetting.Name = "PagePollingSetting";
             this.PagePollingSetting.PageVisible = false;
             this.PagePollingSetting.Size = new System.Drawing.Size(1027, 546);
             this.PagePollingSetting.Text = "xtraTabPage1";
             // 
-            // simpleButton3
-            // 
-            this.simpleButton3.Location = new System.Drawing.Point(787, 520);
-            this.simpleButton3.Name = "simpleButton3";
-            this.simpleButton3.Size = new System.Drawing.Size(75, 23);
-            this.simpleButton3.TabIndex = 3;
-            this.simpleButton3.Text = "simpleButton3";
-            this.simpleButton3.Click += new System.EventHandler(this.simpleButton3_Click);
-            // 
-            // simpleButton2
-            // 
-            this.simpleButton2.Location = new System.Drawing.Point(868, 520);
-            this.simpleButton2.Name = "simpleButton2";
-            this.simpleButton2.Size = new System.Drawing.Size(75, 23);
-            this.simpleButton2.TabIndex = 2;
-            this.simpleButton2.Text = "simpleButton2";
-            this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
-            // 
-            // simpleButton1
-            // 
-            this.simpleButton1.Location = new System.Drawing.Point(949, 520);
-            this.simpleButton1.Name = "simpleButton1";
-            this.simpleButton1.Size = new System.Drawing.Size(75, 23);
-            this.simpleButton1.TabIndex = 1;
-            this.simpleButton1.Text = "simpleButton1";
-            this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
-            // 
             // GridPollingSetting
             // 
+            this.GridPollingSetting.GetDataSQL = null;
             this.GridPollingSetting.Location = new System.Drawing.Point(0, 0);
             this.GridPollingSetting.MainView = this.GridViewPollSetting;
             this.GridPollingSetting.MenuManager = this.RibbonNav;
             this.GridPollingSetting.Name = "GridPollingSetting";
             this.GridPollingSetting.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemCheckEdit1});
+            this.dpc_enableCheckEdit});
+            this.GridPollingSetting.RowCount = 0;
             this.GridPollingSetting.Size = new System.Drawing.Size(1027, 514);
             this.GridPollingSetting.TabIndex = 0;
             this.GridPollingSetting.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -582,6 +537,7 @@ namespace UAS_DeviceMonitor
             this.dpc_remark});
             this.GridViewPollSetting.GridControl = this.GridPollingSetting;
             this.GridViewPollSetting.Name = "GridViewPollSetting";
+            this.GridViewPollSetting.OptionsSelection.MultiSelect = true;
             // 
             // dpc_id
             // 
@@ -640,17 +596,21 @@ namespace UAS_DeviceMonitor
             // dpc_enable
             // 
             this.dpc_enable.Caption = "是否启用";
-            this.dpc_enable.ColumnEdit = this.repositoryItemCheckEdit1;
+            this.dpc_enable.ColumnEdit = this.dpc_enableCheckEdit;
+            this.dpc_enable.FieldName = "DPC_ENABLE";
             this.dpc_enable.Name = "dpc_enable";
             this.dpc_enable.Visible = true;
             this.dpc_enable.VisibleIndex = 6;
             // 
-            // repositoryItemCheckEdit1
+            // dpc_enableCheckEdit
             // 
-            this.repositoryItemCheckEdit1.AutoHeight = false;
-            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
-            this.repositoryItemCheckEdit1.PictureChecked = ((System.Drawing.Image)(resources.GetObject("repositoryItemCheckEdit1.PictureChecked")));
-            this.repositoryItemCheckEdit1.PictureUnchecked = ((System.Drawing.Image)(resources.GetObject("repositoryItemCheckEdit1.PictureUnchecked")));
+            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";
             // 
             // dpc_status
             // 
@@ -679,26 +639,28 @@ namespace UAS_DeviceMonitor
             // GridPolling
             // 
             this.GridPolling.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.GridPolling.GetDataSQL = null;
             this.GridPolling.Location = new System.Drawing.Point(0, 0);
-            this.GridPolling.MainView = this.gridView3;
+            this.GridPolling.MainView = this.GridViewPolling;
             this.GridPolling.MenuManager = this.RibbonNav;
             this.GridPolling.Name = "GridPolling";
+            this.GridPolling.RowCount = 0;
             this.GridPolling.Size = new System.Drawing.Size(1027, 546);
             this.GridPolling.TabIndex = 0;
             this.GridPolling.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView3});
+            this.GridViewPolling});
             // 
-            // gridView3
+            // GridViewPolling
             // 
-            this.gridView3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.GridViewPolling.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.pl_id,
             this.pl_code,
             this.pl_name,
             this.pl_type,
             this.pl_dccode,
             this.pl_remark});
-            this.gridView3.GridControl = this.GridPolling;
-            this.gridView3.Name = "gridView3";
+            this.GridViewPolling.GridControl = this.GridPolling;
+            this.GridViewPolling.Name = "GridViewPolling";
             // 
             // pl_id
             // 
@@ -775,10 +737,10 @@ namespace UAS_DeviceMonitor
             this.PagePollingSetting.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.GridPollingSetting)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.GridViewPollSetting)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.dpc_enableCheckEdit)).EndInit();
             this.PagePolling.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.GridPolling)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.GridViewPolling)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -799,11 +761,9 @@ namespace UAS_DeviceMonitor
         private DevExpress.XtraTab.XtraTabControl MainTabControl;
         private DevExpress.XtraBars.BarButtonItem ButtonDeviceStatus;
         private DevExpress.XtraBars.Ribbon.RibbonPage DeviceCommandSetting;
-        private DevExpress.XtraBars.Ribbon.RibbonPage ribbonPage2;
         private DevExpress.XtraBars.BarButtonItem ButtonCommandSet;
         private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceCommand;
         private DevExpress.XtraBars.BarButtonItem barButtonItem5;
-        private DevExpress.XtraBars.Ribbon.RibbonPageGroup RibDeviceBadInf;
         private DevExpress.XtraTab.XtraTabPage PageDeviceList;
         private DevExpress.XtraTab.XtraTabPage PageCommandSet;
         private DevExpress.XtraTab.XtraTabPage PageDeviceKind;
@@ -825,15 +785,15 @@ namespace UAS_DeviceMonitor
         private DevExpress.XtraGrid.Columns.GridColumn de_address;
         private DevExpress.XtraGrid.Columns.GridColumn de_wccode;
         private CustomerControl.PagingControl.PageControl pageControl1;
-        private DevExpress.XtraGrid.GridControl GridCommandSetting;
+        private AutoDataGridControl GridCommandSetting;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
         private DevExpress.XtraGrid.Columns.GridColumn dc_id;
         private DevExpress.XtraGrid.Columns.GridColumn dc_code;
         private DevExpress.XtraGrid.Columns.GridColumn dc_name;
         private DevExpress.XtraGrid.Columns.GridColumn dc_command;
-        private DevExpress.XtraGrid.GridControl GridPolling;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
-        private DevExpress.XtraGrid.GridControl GridPollingSetting;
+        private AutoDataGridControl GridPolling;
+        private DevExpress.XtraGrid.Views.Grid.GridView GridViewPolling;
+        private AutoDataGridControl GridPollingSetting;
         private DevExpress.XtraGrid.Views.Grid.GridView GridViewPollSetting;
         private DevExpress.XtraGrid.Columns.GridColumn pl_id;
         private DevExpress.XtraGrid.Columns.GridColumn pl_code;
@@ -851,9 +811,6 @@ namespace UAS_DeviceMonitor
         private DevExpress.XtraGrid.Columns.GridColumn dpc_enable;
         private DevExpress.XtraGrid.Columns.GridColumn dpc_status;
         private DevExpress.XtraGrid.Columns.GridColumn dpc_remark;
-        private DevExpress.XtraEditors.SimpleButton simpleButton1;
-        private DevExpress.XtraEditors.SimpleButton simpleButton2;
-        private DevExpress.XtraEditors.SimpleButton simpleButton3;
-        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit dpc_enableCheckEdit;
     }
 }

+ 29 - 17
UAS_DeviceMonitor/Main.cs

@@ -17,11 +17,13 @@ namespace UAS_DeviceMonitor
         {
             SystemInf.dh = new DataHelper();
             InitializeComponent();
+            dpc_enableCheckEdit.QueryCheckStateByValue += CheckedEdit_QueryCheckStateByValue; ;
         }
 
         private void Main_Load(object sender, EventArgs e)
         {
             GridDeviceList.GetDataSQL = "select de_id,de_code,de_name,de_spec,de_indate,de_runstatus,de_address,de_wccode,de_vendcode,de_vendname from device".ToUpper();
+            GridPollingSetting.GetDataSQL = "SELECT DPC_ID,DPC_DECODE ,DPC_PLCODE ,DPC_PLNAME ,DPC_INTERVAL ,DPC_DCCODE ,DPC_FUNCTION , DPC_ENABLE,DPC_STATUS ,DPC_REMARK FROM DEVICEPOLLINGCONFIG";
             pageControl1.Gridcontrol = GridDeviceList;
         }
 
@@ -50,24 +52,34 @@ namespace UAS_DeviceMonitor
             }
         }
 
-        private void simpleButton1_Click(object sender, EventArgs e)
+        private void CheckedEdit_QueryCheckStateByValue(object sender, DevExpress.XtraEditors.Controls.QueryCheckStateByValueEventArgs e)
         {
-            DataTable dt = (DataTable)GridPollingSetting.DataSource;
-            string sql = "insert into devicePollingConfig(dpc_id,dpc_decode ,dpc_plcode ,dpc_plname ,dpc_interval ,dpc_dccode ,dpc_function ,dpc_enable ,dpc_status ,dpc_remark )values(devicePollingConfig_seq.nextval,:dpc_decode ,:dpc_plcode ,:dpc_plname ,:dpc_interval ,:dpc_dccode ,:dpc_function ,:dpc_enable ,:dpc_status ,:dpc_remark)";
-            SystemInf.dh.SaveDataTable(dt, "devicePollingConfig","dpc_id", sql);
-            GridPollingSetting.DataSource = (DataTable)SystemInf.dh.ExecuteSql("select dpc_id,dpc_decode ,dpc_plcode ,dpc_plname ,dpc_interval ,dpc_dccode ,dpc_function ,dpc_enable ,dpc_status ,dpc_remark from devicePollingConfig", "select");
-        }
-
-        private void simpleButton2_Click(object sender, EventArgs e)
-        {
-            DataTable dt = (DataTable)SystemInf.dh.ExecuteSql("select dpc_id,dpc_decode ,dpc_plcode ,dpc_plname ,dpc_interval ,dpc_dccode ,dpc_function ,dpc_enable ,dpc_status ,dpc_remark from devicePollingConfig", "select");
-            GridPollingSetting.DataSource = dt;
-        }
-
-        private void simpleButton3_Click(object sender, EventArgs e)
-        {
-            DataTable dt = (DataTable)GridPollingSetting.DataSource;
-            dt.Rows.Add();
+            string val = "";
+            if (e.Value != null)
+            {
+                val = e.Value.ToString();
+            }
+            else
+            {
+                val = "False";//默认为不选   
+            }
+            switch (val)
+            {
+                case "True":
+                case "Yes":
+                case "1":
+                    e.CheckState = System.Windows.Forms.CheckState.Checked;
+                    break;
+                case "False":
+                case "No":
+                case "0":
+                    e.CheckState = System.Windows.Forms.CheckState.Unchecked;
+                    break;
+                default:
+                    e.CheckState = System.Windows.Forms.CheckState.Checked;
+                    break;
+            }
+            e.Handled = true;
         }
     }
 }

+ 16 - 33
UAS_DeviceMonitor/Main.resx

@@ -517,7 +517,7 @@
         ifbQIqnXAgAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="repositoryItemCheckEdit1.PictureChecked" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="dpc_enableCheckEdit.PictureChecked" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABV0RVh0VGl0
         bGUAQ2hlY2s7TWFyaztUaWNrCwDHJAAACDVJREFUWEe9l1lUVFcWhk1nHk3S80uv7rVir+4oGkURQRRB
@@ -558,39 +558,22 @@
         hhPxG1wabpBfA56b77wqp8ahevH/gfKYNu1/cCf3p2AdSaUAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="repositoryItemCheckEdit1.PictureUnchecked" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="dpc_enableCheckEdit.PictureUnchecked" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
 </value>
   </data>
 </root>