From 2b05362eba2f989b7857349cc9a3a1c12f8181b6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 26 9月 2025 11:35:50 +0800
Subject: [PATCH] 222

---
 DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs |   65 +++++++++++++++++---------------
 1 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
index 7fd50f2..46a51a3 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_DataCaptureV3/FormMain.cs
@@ -1560,6 +1560,9 @@
                 DeleteDataHandler _deleteDataHandler = new DeleteDataHandler();
                 _dataCaptureHandler.Add(_deleteDataHandler);
 
+                DeleteDataOtherHandler _deleteDataOtherHandler = new DeleteDataOtherHandler();
+                _dataCaptureHandler.Add(_deleteDataOtherHandler);
+
                 #endregion
 
                 try
@@ -1874,18 +1877,18 @@
                     switch (config.DataCapturePointCode)
                     {
                         //娴嬭瘯璋冭瘯
-                        case "OP1002":
-                            DataCaptureHandler_OP1002.Instance._dataCaptureConfig = config;
-                            _dataCaptureHandler.Add(DataCaptureHandler_OP1002.Instance);
-                            break;
-                            //case "OP1003":
-                            //    DataCaptureHandler_OP1003.Instance._dataCaptureConfig = config;
-                            //    _dataCaptureHandler.Add(DataCaptureHandler_OP1003.Instance);
-                            //    break;
-                            //#region 02 娴嬮噺瀹屾垚鏍囪
-                            //case "OP2002A":
+                        //case "OP1002":
+                        //    DataCaptureHandler_OP1002.Instance._dataCaptureConfig = config;
+                        //    _dataCaptureHandler.Add(DataCaptureHandler_OP1002.Instance);
+                        //    break;
+                        //case "OP1003":
+                        //    DataCaptureHandler_OP1003.Instance._dataCaptureConfig = config;
+                        //    _dataCaptureHandler.Add(DataCaptureHandler_OP1003.Instance);
+                        //    break;
+                        //#region 02 娴嬮噺瀹屾垚鏍囪
+                        //case "OP2002A":
                             //case "OP2002B":
-                            //case "OP2002C":
+                          case "OP2002C":
                             //case "OP3002CH3":
                             //case "OP3002CH4":
                             //case "OP3002CH5":
@@ -1897,27 +1900,27 @@
                             //case "OP6002C":
                             //case "OP6002D":
                             //case "OP3502":
-                            //    DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
-                            //    dc02._dataCaptureConfig = config;
-                            //    _dataCaptureHandler.Add(dc02);
-                            //    break;
-                            //#region 01 浜岀淮鐮佽鍙�
+                            DataCaptureHandler_02 dc02 = new DataCaptureHandler_02();
+                            dc02._dataCaptureConfig = config;
+                            _dataCaptureHandler.Add(dc02);
+                            break;
+                        //#region 01 浜岀淮鐮佽鍙�
 
-                            //case "OP3001":
-                            //case "OP3501":
-                            //case "OP5001A":
-                            //case "OP5001B":
-                            //case "OP6001":
-                            //case "OP7001":
-                            //case "OP8001":
-                            //    DataCaptureHandler_01 dc01 = new DataCaptureHandler_01();
-                            //    dc01._dataCaptureConfig = config;
-                            //    _dataCaptureHandler.Add(dc01);
-                            //    break;
-                            //case "OP0501":
-                            //    DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config;
-                            //    _dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance);
-                            //    break;
+                        //case "OP3001":
+                        //case "OP3501":
+                        //case "OP5001A":
+                        //case "OP5001B":
+                        //case "OP6001":
+                        //case "OP7001":
+                        //case "OP8001":
+                        //DataCaptureHandler_01 dc01 = new DataCaptureHandler_01();
+                        //dc01._dataCaptureConfig = config;
+                        //_dataCaptureHandler.Add(dc01);
+                        //break;
+                        //case "OP0501":
+                            //DataCaptureHandler_OP0501.Instance._dataCaptureConfig = config;
+                            //_dataCaptureHandler.Add(DataCaptureHandler_OP0501.Instance);
+                            //break;
                             #endregion
                             //case "OP7009"://娓呮礂鏈鸿幏鍙栭噰闆嗘暟鎹�
                             //    DataCaptureHandler_OP7009.Instance._dataCaptureConfig = config;

--
Gitblit v1.9.3