diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)

diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 058a788..6c0662b 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -8,15 +8,17 @@
 #include "formcommsetting.h"
 #include "formaddrsetting.h"
 
-NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) :
+NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewCheckMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<7;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_3->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -98,6 +100,8 @@
 
 void NewCheckMethod::on_pushButton_3_clicked()
 {
+    if(!bEditMode)
+        return;
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;

diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 058a788..6c0662b 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -8,15 +8,17 @@
 #include "formcommsetting.h"
 #include "formaddrsetting.h"
 
-NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) :
+NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewCheckMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<7;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_3->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -98,6 +100,8 @@
 
 void NewCheckMethod::on_pushButton_3_clicked()
 {
+    if(!bEditMode)
+        return;
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index 0d0f7ad..235d876 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewCheckMethod();
     void getMethodInfo();
     void chooseDevices(QString checkIds,QString bizIds);
@@ -38,6 +38,7 @@
     QString checkId="";
     Ui::NewCheckMethod *ui;
     VerificationProgramInfo programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWCHECKMETHOD_H

diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 058a788..6c0662b 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -8,15 +8,17 @@
 #include "formcommsetting.h"
 #include "formaddrsetting.h"
 
-NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) :
+NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewCheckMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<7;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_3->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -98,6 +100,8 @@
 
 void NewCheckMethod::on_pushButton_3_clicked()
 {
+    if(!bEditMode)
+        return;
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index 0d0f7ad..235d876 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewCheckMethod();
     void getMethodInfo();
     void chooseDevices(QString checkIds,QString bizIds);
@@ -38,6 +38,7 @@
     QString checkId="";
     Ui::NewCheckMethod *ui;
     VerificationProgramInfo programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWCHECKMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index c9cb49c..64b173b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,15 +7,17 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 
-NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId) :
+NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewVerifyMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<6;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_9->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -155,16 +157,17 @@
         idList = checkIds.split(",");
         for(const QString& id : idList)
         {
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.id!=""){
                 rowCount = ui->tableWidget->rowCount();
 
                 ui->tableWidget->insertRow(rowCount);
                 ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件"));
-                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result[0].equipment_name)); //设置数据
-                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result[0].model)); //设置数据
-                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
-                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacturer));
+                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据
+                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据
+                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer));
                 QPushButton *btn_1 = new QPushButton();
                 btn_1->setText(tr("设置命令"));
                 btn_1->setStyleSheet("QPushButton{"
@@ -233,6 +236,9 @@
 
 void NewVerifyMethod::on_pushButton_9_clicked()
 {
+    if(!bEditMode){
+        return;
+    }
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;

diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 058a788..6c0662b 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -8,15 +8,17 @@
 #include "formcommsetting.h"
 #include "formaddrsetting.h"
 
-NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) :
+NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewCheckMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<7;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_3->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -98,6 +100,8 @@
 
 void NewCheckMethod::on_pushButton_3_clicked()
 {
+    if(!bEditMode)
+        return;
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index 0d0f7ad..235d876 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewCheckMethod();
     void getMethodInfo();
     void chooseDevices(QString checkIds,QString bizIds);
@@ -38,6 +38,7 @@
     QString checkId="";
     Ui::NewCheckMethod *ui;
     VerificationProgramInfo programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWCHECKMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index c9cb49c..64b173b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,15 +7,17 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 
-NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId) :
+NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewVerifyMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<6;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_9->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -155,16 +157,17 @@
         idList = checkIds.split(",");
         for(const QString& id : idList)
         {
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.id!=""){
                 rowCount = ui->tableWidget->rowCount();
 
                 ui->tableWidget->insertRow(rowCount);
                 ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件"));
-                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result[0].equipment_name)); //设置数据
-                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result[0].model)); //设置数据
-                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
-                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacturer));
+                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据
+                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据
+                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer));
                 QPushButton *btn_1 = new QPushButton();
                 btn_1->setText(tr("设置命令"));
                 btn_1->setStyleSheet("QPushButton{"
@@ -233,6 +236,9 @@
 
 void NewVerifyMethod::on_pushButton_9_clicked()
 {
+    if(!bEditMode){
+        return;
+    }
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 46743de..661be87 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
     void chooseDevices(QString bizIds,QString checkIds);
@@ -38,6 +38,7 @@
     QString methodId="";
     QString checkId="";
     CheckProgramManage programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWVERIFYMETHOD_H

diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 058a788..6c0662b 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -8,15 +8,17 @@
 #include "formcommsetting.h"
 #include "formaddrsetting.h"
 
-NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) :
+NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewCheckMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<7;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_3->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -98,6 +100,8 @@
 
 void NewCheckMethod::on_pushButton_3_clicked()
 {
+    if(!bEditMode)
+        return;
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index 0d0f7ad..235d876 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewCheckMethod();
     void getMethodInfo();
     void chooseDevices(QString checkIds,QString bizIds);
@@ -38,6 +38,7 @@
     QString checkId="";
     Ui::NewCheckMethod *ui;
     VerificationProgramInfo programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWCHECKMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index c9cb49c..64b173b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,15 +7,17 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 
-NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId) :
+NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewVerifyMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<6;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_9->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -155,16 +157,17 @@
         idList = checkIds.split(",");
         for(const QString& id : idList)
         {
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.id!=""){
                 rowCount = ui->tableWidget->rowCount();
 
                 ui->tableWidget->insertRow(rowCount);
                 ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件"));
-                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result[0].equipment_name)); //设置数据
-                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result[0].model)); //设置数据
-                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
-                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacturer));
+                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据
+                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据
+                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer));
                 QPushButton *btn_1 = new QPushButton();
                 btn_1->setText(tr("设置命令"));
                 btn_1->setStyleSheet("QPushButton{"
@@ -233,6 +236,9 @@
 
 void NewVerifyMethod::on_pushButton_9_clicked()
 {
+    if(!bEditMode){
+        return;
+    }
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 46743de..661be87 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
     void chooseDevices(QString bizIds,QString checkIds);
@@ -38,6 +38,7 @@
     QString methodId="";
     QString checkId="";
     CheckProgramManage programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWVERIFYMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp
index 0f6d260..20d9c62 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.cpp
+++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp
@@ -2,6 +2,7 @@
 #include "ui_verifywindow.h"
 #include <QMessageBox>
 #include <QInputDialog>
+#include "newverifymethod.h"
 
 VerifyWindow::VerifyWindow(QWidget *parent) :
     QWidget(parent),
@@ -34,6 +35,20 @@
     ui->tableWidgetMethod->setRowCount(0);
     int rowCount = 0;
     int row=0;
+    QString sFilterName = ui->lineEdit_9->text();
+    QString sFilterUser = ui->lineEdit_10->text();
+    for(int i=programList.length()-1;i>=0;i--){
+        bool bAdd=true;
+        if(sFilterName!=""&&!programList[i].check_name.contains(sFilterName)){
+            bAdd=false;
+        }
+        if(sFilterUser!=""&&!programList[i].create_name.contains(sFilterUser)){
+            bAdd=false;
+        }
+        if(!bAdd){
+            programList.removeAt(i);
+        }
+    }
     for (const CheckProgramManage& program : programList) {
          rowCount = ui->tableWidgetMethod->rowCount();
 
@@ -128,11 +143,10 @@
             ConnectInfo info;
             info.state="未连接";
             info.type = 0;
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
-                info.deviceName = result[0].equipment_name;
-            }
-            result.clear();
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+
+            info.deviceName = result.equipment_name;
+
             QList<VerificationProgramConfigInterface> addrList = BaseCommonApi::getVerificationProgramConfigInterface(id);
             if(addrList.length()>0){
                 info.programInterface = addrList[0];
@@ -156,7 +170,25 @@
 
 void VerifyWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewVerifyMethod* checkWindow = new NewVerifyMethod(nullptr,sId,false);
+    //checkWindow->verifyManageWnd=nullptr;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void VerifyWindow::on_tableWidgetMethod_cellChanged(int row, int column)
@@ -456,3 +488,15 @@
 {
     showDevice();
 }
+
+void VerifyWindow::on_pushButton_10_clicked()
+{
+    getVerifyMethod();
+}
+
+void VerifyWindow::on_pushButton_11_clicked()
+{
+    ui->lineEdit_9->setText("");
+    ui->lineEdit_10->setText("");
+    getVerifyMethod();
+}

diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 058a788..6c0662b 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -8,15 +8,17 @@
 #include "formcommsetting.h"
 #include "formaddrsetting.h"
 
-NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) :
+NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewCheckMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<7;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_3->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -98,6 +100,8 @@
 
 void NewCheckMethod::on_pushButton_3_clicked()
 {
+    if(!bEditMode)
+        return;
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index 0d0f7ad..235d876 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewCheckMethod();
     void getMethodInfo();
     void chooseDevices(QString checkIds,QString bizIds);
@@ -38,6 +38,7 @@
     QString checkId="";
     Ui::NewCheckMethod *ui;
     VerificationProgramInfo programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWCHECKMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index c9cb49c..64b173b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,15 +7,17 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 
-NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId) :
+NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewVerifyMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<6;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_9->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -155,16 +157,17 @@
         idList = checkIds.split(",");
         for(const QString& id : idList)
         {
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.id!=""){
                 rowCount = ui->tableWidget->rowCount();
 
                 ui->tableWidget->insertRow(rowCount);
                 ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件"));
-                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result[0].equipment_name)); //设置数据
-                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result[0].model)); //设置数据
-                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
-                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacturer));
+                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据
+                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据
+                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer));
                 QPushButton *btn_1 = new QPushButton();
                 btn_1->setText(tr("设置命令"));
                 btn_1->setStyleSheet("QPushButton{"
@@ -233,6 +236,9 @@
 
 void NewVerifyMethod::on_pushButton_9_clicked()
 {
+    if(!bEditMode){
+        return;
+    }
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 46743de..661be87 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
     void chooseDevices(QString bizIds,QString checkIds);
@@ -38,6 +38,7 @@
     QString methodId="";
     QString checkId="";
     CheckProgramManage programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWVERIFYMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp
index 0f6d260..20d9c62 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.cpp
+++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp
@@ -2,6 +2,7 @@
 #include "ui_verifywindow.h"
 #include <QMessageBox>
 #include <QInputDialog>
+#include "newverifymethod.h"
 
 VerifyWindow::VerifyWindow(QWidget *parent) :
     QWidget(parent),
@@ -34,6 +35,20 @@
     ui->tableWidgetMethod->setRowCount(0);
     int rowCount = 0;
     int row=0;
+    QString sFilterName = ui->lineEdit_9->text();
+    QString sFilterUser = ui->lineEdit_10->text();
+    for(int i=programList.length()-1;i>=0;i--){
+        bool bAdd=true;
+        if(sFilterName!=""&&!programList[i].check_name.contains(sFilterName)){
+            bAdd=false;
+        }
+        if(sFilterUser!=""&&!programList[i].create_name.contains(sFilterUser)){
+            bAdd=false;
+        }
+        if(!bAdd){
+            programList.removeAt(i);
+        }
+    }
     for (const CheckProgramManage& program : programList) {
          rowCount = ui->tableWidgetMethod->rowCount();
 
@@ -128,11 +143,10 @@
             ConnectInfo info;
             info.state="未连接";
             info.type = 0;
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
-                info.deviceName = result[0].equipment_name;
-            }
-            result.clear();
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+
+            info.deviceName = result.equipment_name;
+
             QList<VerificationProgramConfigInterface> addrList = BaseCommonApi::getVerificationProgramConfigInterface(id);
             if(addrList.length()>0){
                 info.programInterface = addrList[0];
@@ -156,7 +170,25 @@
 
 void VerifyWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewVerifyMethod* checkWindow = new NewVerifyMethod(nullptr,sId,false);
+    //checkWindow->verifyManageWnd=nullptr;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void VerifyWindow::on_tableWidgetMethod_cellChanged(int row, int column)
@@ -456,3 +488,15 @@
 {
     showDevice();
 }
+
+void VerifyWindow::on_pushButton_10_clicked()
+{
+    getVerifyMethod();
+}
+
+void VerifyWindow::on_pushButton_11_clicked()
+{
+    ui->lineEdit_9->setText("");
+    ui->lineEdit_10->setText("");
+    getVerifyMethod();
+}
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.h b/softwareDirectory/AutoVerScheme/verifywindow.h
index 5cd4b06..4efeff2 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.h
+++ b/softwareDirectory/AutoVerScheme/verifywindow.h
@@ -46,6 +46,10 @@
     void on_pushButton_12_clicked();
     void on_deviceButton_clicked(CatDeviceInfor info,int idx);
 
+    void on_pushButton_10_clicked();
+
+    void on_pushButton_11_clicked();
+
 private:
     Ui::VerifyWindow *ui;
     QList<CheckProgramManage> programList;

diff --git a/softwareDirectory/AutoVerScheme/checkwindow.cpp b/softwareDirectory/AutoVerScheme/checkwindow.cpp
index 48b7c7c..8197120 100644
--- a/softwareDirectory/AutoVerScheme/checkwindow.cpp
+++ b/softwareDirectory/AutoVerScheme/checkwindow.cpp
@@ -4,6 +4,7 @@
 #include <QMessageBox>
 #include "basecommonapi.h"
 #include <QInputDialog>
+#include "newcheckmethod.h"
 
 CheckWindow::CheckWindow(QWidget *parent) :
     QWidget(parent),
@@ -441,7 +442,25 @@
 
 void CheckWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewCheckMethod* checkWindow = new NewCheckMethod(nullptr,sId,false);
+    //checkWindow->checkManageWnd=this;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void CheckWindow::on_tableWidgetDevice_cellChanged(int row, int column)
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 058a788..6c0662b 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -8,15 +8,17 @@
 #include "formcommsetting.h"
 #include "formaddrsetting.h"
 
-NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId) :
+NewCheckMethod::NewCheckMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewCheckMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<7;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_3->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -98,6 +100,8 @@
 
 void NewCheckMethod::on_pushButton_3_clicked()
 {
+    if(!bEditMode)
+        return;
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index 0d0f7ad..235d876 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewCheckMethod();
     void getMethodInfo();
     void chooseDevices(QString checkIds,QString bizIds);
@@ -38,6 +38,7 @@
     QString checkId="";
     Ui::NewCheckMethod *ui;
     VerificationProgramInfo programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWCHECKMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index c9cb49c..64b173b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,15 +7,17 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 
-NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId) :
+NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
     methodId(sId),
+    bEditMode(bEdit),
     ui(new Ui::NewVerifyMethod)
 {
     ui->setupUi(this);
     ui->tableWidget->verticalHeader()->setParent(nullptr);
     for(int i=0;i<6;i++)
         ui->tableWidget->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->pushButton_9->setEnabled(bEditMode);
     getMethodInfo();
 }
 
@@ -155,16 +157,17 @@
         idList = checkIds.split(",");
         for(const QString& id : idList)
         {
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.id!=""){
                 rowCount = ui->tableWidget->rowCount();
 
                 ui->tableWidget->insertRow(rowCount);
                 ui->tableWidget->setItem(row, 0, new QTableWidgetItem("核查件"));
-                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result[0].equipment_name)); //设置数据
-                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result[0].model)); //设置数据
-                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
-                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacturer));
+                ui->tableWidget->setItem(row, 1, new QTableWidgetItem(result.equipment_name)); //设置数据
+                ui->tableWidget->setItem(row, 2, new QTableWidgetItem(result.model)); //设置数据
+                ui->tableWidget->setItem(row, 3, new QTableWidgetItem(result.manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result.manufacturer));
                 QPushButton *btn_1 = new QPushButton();
                 btn_1->setText(tr("设置命令"));
                 btn_1->setStyleSheet("QPushButton{"
@@ -233,6 +236,9 @@
 
 void NewVerifyMethod::on_pushButton_9_clicked()
 {
+    if(!bEditMode){
+        return;
+    }
     if(programInfo.id=="")
     {
         BaseCommonApi baseApi;
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 46743de..661be87 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -14,7 +14,7 @@
     Q_OBJECT
 
 public:
-    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="");
+    explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
     void chooseDevices(QString bizIds,QString checkIds);
@@ -38,6 +38,7 @@
     QString methodId="";
     QString checkId="";
     CheckProgramManage programInfo;
+    bool bEditMode=true;
 };
 
 #endif // NEWVERIFYMETHOD_H
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp
index 0f6d260..20d9c62 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.cpp
+++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp
@@ -2,6 +2,7 @@
 #include "ui_verifywindow.h"
 #include <QMessageBox>
 #include <QInputDialog>
+#include "newverifymethod.h"
 
 VerifyWindow::VerifyWindow(QWidget *parent) :
     QWidget(parent),
@@ -34,6 +35,20 @@
     ui->tableWidgetMethod->setRowCount(0);
     int rowCount = 0;
     int row=0;
+    QString sFilterName = ui->lineEdit_9->text();
+    QString sFilterUser = ui->lineEdit_10->text();
+    for(int i=programList.length()-1;i>=0;i--){
+        bool bAdd=true;
+        if(sFilterName!=""&&!programList[i].check_name.contains(sFilterName)){
+            bAdd=false;
+        }
+        if(sFilterUser!=""&&!programList[i].create_name.contains(sFilterUser)){
+            bAdd=false;
+        }
+        if(!bAdd){
+            programList.removeAt(i);
+        }
+    }
     for (const CheckProgramManage& program : programList) {
          rowCount = ui->tableWidgetMethod->rowCount();
 
@@ -128,11 +143,10 @@
             ConnectInfo info;
             info.state="未连接";
             info.type = 0;
-            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
-            if(result.length()>0){
-                info.deviceName = result[0].equipment_name;
-            }
-            result.clear();
+            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+
+            info.deviceName = result.equipment_name;
+
             QList<VerificationProgramConfigInterface> addrList = BaseCommonApi::getVerificationProgramConfigInterface(id);
             if(addrList.length()>0){
                 info.programInterface = addrList[0];
@@ -156,7 +170,25 @@
 
 void VerifyWindow::on_editButton_clicked()
 {
-
+    QPushButton *pushButton_ = dynamic_cast<QPushButton*>(this->sender());
+    if(NULL == pushButton_)
+    {
+        return;
+    }
+    // 获取按钮的x坐标和y坐标
+    int x = pushButton_->parentWidget()->frameGeometry().x();
+    int y = pushButton_->parentWidget()->frameGeometry().y();
+    // 根据按钮的x和y坐标来定位对应的单元格
+    QModelIndex index = ui->tableWidgetMethod->indexAt(QPoint(x, y));
+    // 获取该按钮所在表格的行号和列号
+    int editIdx = index.row();
+    //int column = index.column();
+    QString sId =  programList[editIdx].id;
+    NewVerifyMethod* checkWindow = new NewVerifyMethod(nullptr,sId,false);
+    //checkWindow->verifyManageWnd=nullptr;
+    checkWindow->setWindowState(Qt::WindowMaximized);
+    checkWindow->setWindowModality(Qt::ApplicationModal);
+    checkWindow->show();
 }
 
 void VerifyWindow::on_tableWidgetMethod_cellChanged(int row, int column)
@@ -456,3 +488,15 @@
 {
     showDevice();
 }
+
+void VerifyWindow::on_pushButton_10_clicked()
+{
+    getVerifyMethod();
+}
+
+void VerifyWindow::on_pushButton_11_clicked()
+{
+    ui->lineEdit_9->setText("");
+    ui->lineEdit_10->setText("");
+    getVerifyMethod();
+}
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.h b/softwareDirectory/AutoVerScheme/verifywindow.h
index 5cd4b06..4efeff2 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.h
+++ b/softwareDirectory/AutoVerScheme/verifywindow.h
@@ -46,6 +46,10 @@
     void on_pushButton_12_clicked();
     void on_deviceButton_clicked(CatDeviceInfor info,int idx);
 
+    void on_pushButton_10_clicked();
+
+    void on_pushButton_11_clicked();
+
 private:
     Ui::VerifyWindow *ui;
     QList<CheckProgramManage> programList;
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.ui b/softwareDirectory/AutoVerScheme/verifywindow.ui
index 750ff51..0f2b44b 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.ui
+++ b/softwareDirectory/AutoVerScheme/verifywindow.ui
@@ -216,10 +216,18 @@
               <number>12</number>
              </property>
              <item>
-              <widget class="QLineEdit" name="lineEdit_9"/>
+              <widget class="QLineEdit" name="lineEdit_9">
+               <property name="placeholderText">
+                <string>核查程序名称</string>
+               </property>
+              </widget>
              </item>
              <item>
-              <widget class="QLineEdit" name="lineEdit_10"/>
+              <widget class="QLineEdit" name="lineEdit_10">
+               <property name="placeholderText">
+                <string>创建人</string>
+               </property>
+              </widget>
              </item>
              <item>
               <spacer name="horizontalSpacer_10">