diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
index 939e00f..e96a3e1 100644
--- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
+++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
@@ -2,12 +2,14 @@
 #include "ui_formaddrsetting.h"
 #include <QMessageBox>
 
-FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id,QString deviceId,bool check) :
+FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id,QString deviceId,bool check,QString equipId,QString catId) :
     QWidget(parent),
     iType(type),
     sId(id),
     sDeviceId(deviceId),
     checkMode(check),
+    sEquipId(equipId),
+    sCatId(catId),
     ui(new Ui::FormAddrSetting)
 {
     ui->setupUi(this);
@@ -34,11 +36,15 @@
     }
     if(checkMode)
     {
-        QStringList headlist;
-        QList<QStringList> caliList =BaseCommonApi::Search_CalibrationTable(sDeviceId,&headlist);
-        for (const QStringList& item : caliList){
-            this->ui->comboBox->addItem(item[2]);
-        }
+//        QStringList headlist;
+//        QList<QStringList> caliList =BaseCommonApi::Search_CalibrationTable(sDeviceId,&headlist);
+//        for (const QStringList& item : caliList){
+//            this->ui->comboBox->addItem(item[2]);
+//        }
+        QList<Params> params =  BaseCommonApi::getParams(sEquipId,sCatId);
+         for (const Params& item : params){
+             this->ui->comboBox->addItem(item.param);
+         }
     }
     else
     {

diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
index 939e00f..e96a3e1 100644
--- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
+++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
@@ -2,12 +2,14 @@
 #include "ui_formaddrsetting.h"
 #include <QMessageBox>
 
-FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id,QString deviceId,bool check) :
+FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id,QString deviceId,bool check,QString equipId,QString catId) :
     QWidget(parent),
     iType(type),
     sId(id),
     sDeviceId(deviceId),
     checkMode(check),
+    sEquipId(equipId),
+    sCatId(catId),
     ui(new Ui::FormAddrSetting)
 {
     ui->setupUi(this);
@@ -34,11 +36,15 @@
     }
     if(checkMode)
     {
-        QStringList headlist;
-        QList<QStringList> caliList =BaseCommonApi::Search_CalibrationTable(sDeviceId,&headlist);
-        for (const QStringList& item : caliList){
-            this->ui->comboBox->addItem(item[2]);
-        }
+//        QStringList headlist;
+//        QList<QStringList> caliList =BaseCommonApi::Search_CalibrationTable(sDeviceId,&headlist);
+//        for (const QStringList& item : caliList){
+//            this->ui->comboBox->addItem(item[2]);
+//        }
+        QList<Params> params =  BaseCommonApi::getParams(sEquipId,sCatId);
+         for (const Params& item : params){
+             this->ui->comboBox->addItem(item.param);
+         }
     }
     else
     {
diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h
index afabfca..d92bc7c 100644
--- a/softwareDirectory/AutoVerScheme/formaddrsetting.h
+++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h
@@ -13,7 +13,7 @@
     Q_OBJECT
 
 public:
-    explicit FormAddrSetting(QWidget *parent = nullptr,int type=0,QString id="",QString deviceId="",bool check=true);
+    explicit FormAddrSetting(QWidget *parent = nullptr,int type=0,QString id="",QString deviceId="",bool check=true,QString equipId="",QString catId="");
     ~FormAddrSetting();
 private:
     void initCmdTable();
@@ -43,6 +43,8 @@
     int iType=0;
     int editIdx=-1;
     bool checkMode=true;
+    QString sEquipId;
+    QString sCatId;
 };
 
 #endif // FORMADDRSETTING_H

diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
index 939e00f..e96a3e1 100644
--- a/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
+++ b/softwareDirectory/AutoVerScheme/formaddrsetting.cpp
@@ -2,12 +2,14 @@
 #include "ui_formaddrsetting.h"
 #include <QMessageBox>
 
-FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id,QString deviceId,bool check) :
+FormAddrSetting::FormAddrSetting(QWidget *parent,int type,QString id,QString deviceId,bool check,QString equipId,QString catId) :
     QWidget(parent),
     iType(type),
     sId(id),
     sDeviceId(deviceId),
     checkMode(check),
+    sEquipId(equipId),
+    sCatId(catId),
     ui(new Ui::FormAddrSetting)
 {
     ui->setupUi(this);
@@ -34,11 +36,15 @@
     }
     if(checkMode)
     {
-        QStringList headlist;
-        QList<QStringList> caliList =BaseCommonApi::Search_CalibrationTable(sDeviceId,&headlist);
-        for (const QStringList& item : caliList){
-            this->ui->comboBox->addItem(item[2]);
-        }
+//        QStringList headlist;
+//        QList<QStringList> caliList =BaseCommonApi::Search_CalibrationTable(sDeviceId,&headlist);
+//        for (const QStringList& item : caliList){
+//            this->ui->comboBox->addItem(item[2]);
+//        }
+        QList<Params> params =  BaseCommonApi::getParams(sEquipId,sCatId);
+         for (const Params& item : params){
+             this->ui->comboBox->addItem(item.param);
+         }
     }
     else
     {
diff --git a/softwareDirectory/AutoVerScheme/formaddrsetting.h b/softwareDirectory/AutoVerScheme/formaddrsetting.h
index afabfca..d92bc7c 100644
--- a/softwareDirectory/AutoVerScheme/formaddrsetting.h
+++ b/softwareDirectory/AutoVerScheme/formaddrsetting.h
@@ -13,7 +13,7 @@
     Q_OBJECT
 
 public:
-    explicit FormAddrSetting(QWidget *parent = nullptr,int type=0,QString id="",QString deviceId="",bool check=true);
+    explicit FormAddrSetting(QWidget *parent = nullptr,int type=0,QString id="",QString deviceId="",bool check=true,QString equipId="",QString catId="");
     ~FormAddrSetting();
 private:
     void initCmdTable();
@@ -43,6 +43,8 @@
     int iType=0;
     int editIdx=-1;
     bool checkMode=true;
+    QString sEquipId;
+    QString sCatId;
 };
 
 #endif // FORMADDRSETTING_H
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index 6410912..965f532 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -104,10 +104,18 @@
 
 void NewCheckMethod::showCheckPoint()
 {
-    FormCheckPoint *checkWindow = new FormCheckPoint(nullptr,checkId);
-    //checkWindow.setWindowState(Qt::WindowMaximized);
-    checkWindow->setWindowModality(Qt::ApplicationModal);
-    checkWindow->show();
+//    FormCheckPoint *checkWindow = new FormCheckPoint(nullptr,checkId);
+//    //checkWindow.setWindowState(Qt::WindowMaximized);
+//    checkWindow->setWindowModality(Qt::ApplicationModal);
+//    checkWindow->show();
+    QString equipId = QString::number(ui->comboBoxEquipment->currentIndex()+1);
+    QString catId;
+    int idx = ui->comboBoxCategory->currentIndex();
+    if(idx>=0&&idx<catList.length())
+        catId = catList[idx].id;
+    FormAddrSetting *form = new FormAddrSetting(nullptr,0,"",checkId,true,equipId,catId);
+    form->setWindowModality(Qt::ApplicationModal);
+    form->show();
 }
 
 void NewCheckMethod::on_pushButton_3_clicked()