diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h
index 8102d24..055c44e 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.h
+++ b/softwareDirectory/AutoVerScheme/checkdevice.h
@@ -2,6 +2,8 @@
 #define CHECKDEVICE_H
 
 #include <QWidget>
+#include "basecommonapi.h"
+#include "newcheckmethod.h"
 
 namespace Ui {
 class CheckDevice;
@@ -15,12 +17,19 @@
     explicit CheckDevice(QWidget *parent = nullptr);
     ~CheckDevice();
 
+private slots:
+    void on_pushButton_19_clicked();
+
 private:
     void getCheckDevice();
     void getStandardDevice();
 
+public:
+    NewCheckMethod *newCheckWnd=nullptr;
 private:
     Ui::CheckDevice *ui;
+    QList<TestedDevice> testedDeviceList;
+    QList<BizDevice> bizDeviceList;
 };
 
 #endif // CHECKDEVICE_H

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h
index 8102d24..055c44e 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.h
+++ b/softwareDirectory/AutoVerScheme/checkdevice.h
@@ -2,6 +2,8 @@
 #define CHECKDEVICE_H
 
 #include <QWidget>
+#include "basecommonapi.h"
+#include "newcheckmethod.h"
 
 namespace Ui {
 class CheckDevice;
@@ -15,12 +17,19 @@
     explicit CheckDevice(QWidget *parent = nullptr);
     ~CheckDevice();
 
+private slots:
+    void on_pushButton_19_clicked();
+
 private:
     void getCheckDevice();
     void getStandardDevice();
 
+public:
+    NewCheckMethod *newCheckWnd=nullptr;
 private:
     Ui::CheckDevice *ui;
+    QList<TestedDevice> testedDeviceList;
+    QList<BizDevice> bizDeviceList;
 };
 
 #endif // CHECKDEVICE_H
diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
index 300668c..b83b561 100644
--- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
+++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
@@ -8,8 +8,11 @@
     ui(new Ui::CheckMethodManage)
 {
     ui->setupUi(this);
-    for(int i=1;i<6;i++)
+    ui->tableWidget_2->verticalHeader()->setParent(nullptr); //隐藏行头
+    for(int i=1;i<5;i++)
         ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->tableWidget_2->setColumnWidth(0, 60);
+    ui->tableWidget_2->setColumnWidth(5, 200);
     getCheckMethod();
 }
 
@@ -102,8 +105,8 @@
          btn_1->setCursor(Qt::PointingHandCursor);
          connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked()));
 
-         //btn_1->setIconSize(QSize(16,16));
-         //btn_1->setIcon(QIcon(":/image/Index/u15.png"));
+         btn_1->setIconSize(QSize(16,16));
+         btn_1->setIcon(QIcon(":/image/Index/u2324.svg"));
          QPushButton *btn_2 = new QPushButton();
          btn_2->setText(tr("删除"));
          btn_2->setStyleSheet("QPushButton{"
@@ -113,8 +116,8 @@
                               "}");
          btn_2->setCursor(Qt::PointingHandCursor);
          connect(btn_2,SIGNAL(clicked()),this,SLOT(on_deleteButton_clicked()));
-         //btn_2->setIconSize(QSize(16,16));
-         //btn_2->setIcon(QIcon(":/image/Index/u102.png"));
+         btn_2->setIconSize(QSize(16,16));
+         btn_2->setIcon(QIcon(":/image/Index/u2325.svg"));
          QWidget *tmp_widget = new QWidget();
          QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget);
          tmp_layout->addWidget(btn_1);

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h
index 8102d24..055c44e 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.h
+++ b/softwareDirectory/AutoVerScheme/checkdevice.h
@@ -2,6 +2,8 @@
 #define CHECKDEVICE_H
 
 #include <QWidget>
+#include "basecommonapi.h"
+#include "newcheckmethod.h"
 
 namespace Ui {
 class CheckDevice;
@@ -15,12 +17,19 @@
     explicit CheckDevice(QWidget *parent = nullptr);
     ~CheckDevice();
 
+private slots:
+    void on_pushButton_19_clicked();
+
 private:
     void getCheckDevice();
     void getStandardDevice();
 
+public:
+    NewCheckMethod *newCheckWnd=nullptr;
 private:
     Ui::CheckDevice *ui;
+    QList<TestedDevice> testedDeviceList;
+    QList<BizDevice> bizDeviceList;
 };
 
 #endif // CHECKDEVICE_H
diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
index 300668c..b83b561 100644
--- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
+++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
@@ -8,8 +8,11 @@
     ui(new Ui::CheckMethodManage)
 {
     ui->setupUi(this);
-    for(int i=1;i<6;i++)
+    ui->tableWidget_2->verticalHeader()->setParent(nullptr); //隐藏行头
+    for(int i=1;i<5;i++)
         ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->tableWidget_2->setColumnWidth(0, 60);
+    ui->tableWidget_2->setColumnWidth(5, 200);
     getCheckMethod();
 }
 
@@ -102,8 +105,8 @@
          btn_1->setCursor(Qt::PointingHandCursor);
          connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked()));
 
-         //btn_1->setIconSize(QSize(16,16));
-         //btn_1->setIcon(QIcon(":/image/Index/u15.png"));
+         btn_1->setIconSize(QSize(16,16));
+         btn_1->setIcon(QIcon(":/image/Index/u2324.svg"));
          QPushButton *btn_2 = new QPushButton();
          btn_2->setText(tr("删除"));
          btn_2->setStyleSheet("QPushButton{"
@@ -113,8 +116,8 @@
                               "}");
          btn_2->setCursor(Qt::PointingHandCursor);
          connect(btn_2,SIGNAL(clicked()),this,SLOT(on_deleteButton_clicked()));
-         //btn_2->setIconSize(QSize(16,16));
-         //btn_2->setIcon(QIcon(":/image/Index/u102.png"));
+         btn_2->setIconSize(QSize(16,16));
+         btn_2->setIcon(QIcon(":/image/Index/u2325.svg"));
          QWidget *tmp_widget = new QWidget();
          QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget);
          tmp_layout->addWidget(btn_1);
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index d9286f1..cfd3b0d 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -12,6 +12,9 @@
     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);
 }
 
 
@@ -40,6 +43,7 @@
             qDebug() << "strStyle:" << strStyle ;
             ui->label_11->setStyleSheet(strStyle);
         }
+        chooseDevices(programInfo.tested_device_id,programInfo.standard_device_id);
     }
 }
 
@@ -50,6 +54,7 @@
 void NewCheckMethod::showCheckDevice()
 {
     CheckDevice *checkWindow = new CheckDevice;
+    checkWindow->newCheckWnd = this;
     checkWindow->setWindowState(Qt::WindowMaximized);
     checkWindow->setWindowModality(Qt::ApplicationModal);
     checkWindow->show();
@@ -124,3 +129,57 @@
 {
     this->close();
 }
+
+void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds)
+{
+    programInfo.tested_device_id=checkIds;
+    programInfo.standard_device_id = bizIds;
+    ui->tableWidget->clearContents();
+    ui->tableWidget->setRowCount(0);
+    QStringList idList;
+    int rowCount = 0;
+    int row=0;
+    if(checkIds!="")
+    {
+        idList = checkIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.length()>0){
+                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].help_instruction)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+
+    if(bizIds!="")
+    {
+        idList = bizIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
+            if(result.length()>0){
+                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].remark)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+}

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h
index 8102d24..055c44e 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.h
+++ b/softwareDirectory/AutoVerScheme/checkdevice.h
@@ -2,6 +2,8 @@
 #define CHECKDEVICE_H
 
 #include <QWidget>
+#include "basecommonapi.h"
+#include "newcheckmethod.h"
 
 namespace Ui {
 class CheckDevice;
@@ -15,12 +17,19 @@
     explicit CheckDevice(QWidget *parent = nullptr);
     ~CheckDevice();
 
+private slots:
+    void on_pushButton_19_clicked();
+
 private:
     void getCheckDevice();
     void getStandardDevice();
 
+public:
+    NewCheckMethod *newCheckWnd=nullptr;
 private:
     Ui::CheckDevice *ui;
+    QList<TestedDevice> testedDeviceList;
+    QList<BizDevice> bizDeviceList;
 };
 
 #endif // CHECKDEVICE_H
diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
index 300668c..b83b561 100644
--- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
+++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
@@ -8,8 +8,11 @@
     ui(new Ui::CheckMethodManage)
 {
     ui->setupUi(this);
-    for(int i=1;i<6;i++)
+    ui->tableWidget_2->verticalHeader()->setParent(nullptr); //隐藏行头
+    for(int i=1;i<5;i++)
         ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->tableWidget_2->setColumnWidth(0, 60);
+    ui->tableWidget_2->setColumnWidth(5, 200);
     getCheckMethod();
 }
 
@@ -102,8 +105,8 @@
          btn_1->setCursor(Qt::PointingHandCursor);
          connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked()));
 
-         //btn_1->setIconSize(QSize(16,16));
-         //btn_1->setIcon(QIcon(":/image/Index/u15.png"));
+         btn_1->setIconSize(QSize(16,16));
+         btn_1->setIcon(QIcon(":/image/Index/u2324.svg"));
          QPushButton *btn_2 = new QPushButton();
          btn_2->setText(tr("删除"));
          btn_2->setStyleSheet("QPushButton{"
@@ -113,8 +116,8 @@
                               "}");
          btn_2->setCursor(Qt::PointingHandCursor);
          connect(btn_2,SIGNAL(clicked()),this,SLOT(on_deleteButton_clicked()));
-         //btn_2->setIconSize(QSize(16,16));
-         //btn_2->setIcon(QIcon(":/image/Index/u102.png"));
+         btn_2->setIconSize(QSize(16,16));
+         btn_2->setIcon(QIcon(":/image/Index/u2325.svg"));
          QWidget *tmp_widget = new QWidget();
          QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget);
          tmp_layout->addWidget(btn_1);
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index d9286f1..cfd3b0d 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -12,6 +12,9 @@
     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);
 }
 
 
@@ -40,6 +43,7 @@
             qDebug() << "strStyle:" << strStyle ;
             ui->label_11->setStyleSheet(strStyle);
         }
+        chooseDevices(programInfo.tested_device_id,programInfo.standard_device_id);
     }
 }
 
@@ -50,6 +54,7 @@
 void NewCheckMethod::showCheckDevice()
 {
     CheckDevice *checkWindow = new CheckDevice;
+    checkWindow->newCheckWnd = this;
     checkWindow->setWindowState(Qt::WindowMaximized);
     checkWindow->setWindowModality(Qt::ApplicationModal);
     checkWindow->show();
@@ -124,3 +129,57 @@
 {
     this->close();
 }
+
+void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds)
+{
+    programInfo.tested_device_id=checkIds;
+    programInfo.standard_device_id = bizIds;
+    ui->tableWidget->clearContents();
+    ui->tableWidget->setRowCount(0);
+    QStringList idList;
+    int rowCount = 0;
+    int row=0;
+    if(checkIds!="")
+    {
+        idList = checkIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.length()>0){
+                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].help_instruction)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+
+    if(bizIds!="")
+    {
+        idList = bizIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
+            if(result.length()>0){
+                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].remark)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+}
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index dfe4e92..b47da6e 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -16,6 +16,7 @@
     explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
     ~NewCheckMethod();
     void getMethodInfo();
+    void chooseDevices(QString checkIds,QString bizIds);
 private slots:
     void showCheckDevice();
     void choosePicture();

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h
index 8102d24..055c44e 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.h
+++ b/softwareDirectory/AutoVerScheme/checkdevice.h
@@ -2,6 +2,8 @@
 #define CHECKDEVICE_H
 
 #include <QWidget>
+#include "basecommonapi.h"
+#include "newcheckmethod.h"
 
 namespace Ui {
 class CheckDevice;
@@ -15,12 +17,19 @@
     explicit CheckDevice(QWidget *parent = nullptr);
     ~CheckDevice();
 
+private slots:
+    void on_pushButton_19_clicked();
+
 private:
     void getCheckDevice();
     void getStandardDevice();
 
+public:
+    NewCheckMethod *newCheckWnd=nullptr;
 private:
     Ui::CheckDevice *ui;
+    QList<TestedDevice> testedDeviceList;
+    QList<BizDevice> bizDeviceList;
 };
 
 #endif // CHECKDEVICE_H
diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
index 300668c..b83b561 100644
--- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
+++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
@@ -8,8 +8,11 @@
     ui(new Ui::CheckMethodManage)
 {
     ui->setupUi(this);
-    for(int i=1;i<6;i++)
+    ui->tableWidget_2->verticalHeader()->setParent(nullptr); //隐藏行头
+    for(int i=1;i<5;i++)
         ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->tableWidget_2->setColumnWidth(0, 60);
+    ui->tableWidget_2->setColumnWidth(5, 200);
     getCheckMethod();
 }
 
@@ -102,8 +105,8 @@
          btn_1->setCursor(Qt::PointingHandCursor);
          connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked()));
 
-         //btn_1->setIconSize(QSize(16,16));
-         //btn_1->setIcon(QIcon(":/image/Index/u15.png"));
+         btn_1->setIconSize(QSize(16,16));
+         btn_1->setIcon(QIcon(":/image/Index/u2324.svg"));
          QPushButton *btn_2 = new QPushButton();
          btn_2->setText(tr("删除"));
          btn_2->setStyleSheet("QPushButton{"
@@ -113,8 +116,8 @@
                               "}");
          btn_2->setCursor(Qt::PointingHandCursor);
          connect(btn_2,SIGNAL(clicked()),this,SLOT(on_deleteButton_clicked()));
-         //btn_2->setIconSize(QSize(16,16));
-         //btn_2->setIcon(QIcon(":/image/Index/u102.png"));
+         btn_2->setIconSize(QSize(16,16));
+         btn_2->setIcon(QIcon(":/image/Index/u2325.svg"));
          QWidget *tmp_widget = new QWidget();
          QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget);
          tmp_layout->addWidget(btn_1);
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index d9286f1..cfd3b0d 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -12,6 +12,9 @@
     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);
 }
 
 
@@ -40,6 +43,7 @@
             qDebug() << "strStyle:" << strStyle ;
             ui->label_11->setStyleSheet(strStyle);
         }
+        chooseDevices(programInfo.tested_device_id,programInfo.standard_device_id);
     }
 }
 
@@ -50,6 +54,7 @@
 void NewCheckMethod::showCheckDevice()
 {
     CheckDevice *checkWindow = new CheckDevice;
+    checkWindow->newCheckWnd = this;
     checkWindow->setWindowState(Qt::WindowMaximized);
     checkWindow->setWindowModality(Qt::ApplicationModal);
     checkWindow->show();
@@ -124,3 +129,57 @@
 {
     this->close();
 }
+
+void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds)
+{
+    programInfo.tested_device_id=checkIds;
+    programInfo.standard_device_id = bizIds;
+    ui->tableWidget->clearContents();
+    ui->tableWidget->setRowCount(0);
+    QStringList idList;
+    int rowCount = 0;
+    int row=0;
+    if(checkIds!="")
+    {
+        idList = checkIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.length()>0){
+                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].help_instruction)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+
+    if(bizIds!="")
+    {
+        idList = bizIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
+            if(result.length()>0){
+                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].remark)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+}
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index dfe4e92..b47da6e 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -16,6 +16,7 @@
     explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
     ~NewCheckMethod();
     void getMethodInfo();
+    void chooseDevices(QString checkIds,QString bizIds);
 private slots:
     void showCheckDevice();
     void choosePicture();
diff --git a/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg b/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg
new file mode 100644
index 0000000..797f1c5
--- /dev/null
+++ b/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -1429 -15 )">
+    <path d="M 9.32735426008969 12  L 9.95515695067265 12  L 11.2556053811659 10.6818181818182  L 9.55156950672646 8.95454545454545  L 8.25112107623318 10.2727272727273  L 8.25112107623318 10.9090909090909  L 9.32735426008969 10.9090909090909  L 9.32735426008969 12  Z M 14.8766816143498 4.19318181818182  C 15.0037369207773 4.06439393939394  15.0074738415546 3.93939393939394  14.8878923766816 3.81818181818182  C 14.7683109118087 3.6969696969697  14.6449925261584 3.70075757575757  14.5179372197309 3.82954545454546  L 10.5941704035874 7.80681818181818  C 10.4671150971599 7.93560606060606  10.4633781763827 8.06060606060606  10.5829596412556 8.18181818181818  C 10.7025411061286 8.3030303030303  10.8258594917788 8.29924242424242  10.9529147982063 8.17045454545455  L 14.8766816143498 4.19318181818182  Z M 15.5605381165919 10.2386363636364  C 15.7100149476831 10.2992424242424  15.7847533632287 10.4090909090909  15.7847533632287 10.5681818181818  L 15.7847533632287 12.7272727272727  C 15.7847533632287 13.6287878787879  15.4689835575486 14.3996212121212  14.8374439461883 15.0397727272727  C 14.2059043348281 15.6799242424242  13.4454409566517 16  12.5560538116592 16  L 3.22869955156951 16  C 2.33931240657698 16  1.5788490284006 15.6799242424242  0.947309417040359 15.0397727272727  C 0.31576980568012 14.3996212121212  0 13.6287878787879  0 12.7272727272727  L 0 3.27272727272727  C 0 2.37121212121212  0.31576980568012 1.60037878787879  0.947309417040359 0.960227272727273  C 1.5788490284006 0.320075757575756  2.33931240657698 0  3.22869955156951 0  L 12.5560538116592 0  C 13.0269058295964 0  13.4641255605381 0.0946969696969688  13.8677130044843 0.284090909090908  C 13.9798206278027 0.337121212121211  14.0470852017937 0.424242424242424  14.0695067264574 0.545454545454545  C 14.0919282511211 0.674242424242424  14.0582959641256 0.784090909090908  13.9686098654709 0.875  L 13.4192825112108 1.43181818181818  C 13.3146487294469 1.53787878787879  13.195067264574 1.56818181818182  13.0605381165919 1.52272727272727  C 12.8886397608371 1.47727272727273  12.7204783258595 1.45454545454546  12.5560538116592 1.45454545454546  L 3.22869955156951 1.45454545454546  C 2.73542600896861 1.45454545454546  2.31315396113602 1.63257575757576  1.96188340807175 1.98863636363636  C 1.61061285500747 2.34469696969697  1.43497757847534 2.77272727272727  1.43497757847534 3.27272727272727  L 1.43497757847534 12.7272727272727  C 1.43497757847534 13.2272727272727  1.61061285500747 13.655303030303  1.96188340807175 14.0113636363636  C 2.31315396113602 14.3674242424242  2.73542600896861 14.5454545454545  3.22869955156951 14.5454545454545  L 12.5560538116592 14.5454545454545  C 13.0493273542601 14.5454545454545  13.4715994020927 14.3674242424242  13.822869955157 14.0113636363636  C 14.1741405082212 13.655303030303  14.3497757847534 13.2272727272727  14.3497757847534 12.7272727272727  L 14.3497757847534 11.2954545454545  C 14.3497757847534 11.1969696969697  14.3834080717489 11.1136363636364  14.4506726457399 11.0454545454545  L 15.1681614349776 10.3181818181818  C 15.280269058296 10.2045454545455  15.4110612855007 10.1780303030303  15.5605381165919 10.2386363636364  Z M 7.17488789237668 9.81818181818182  L 14.7085201793722 2.18181818181818  L 17.9372197309417 5.45454545454546  L 10.4035874439462 13.0909090909091  L 7.17488789237668 13.0909090909091  L 7.17488789237668 9.81818181818182  Z M 20 2.90909090909091  C 20 3.21212121212121  19.8953662182362 3.46969696969697  19.6860986547085 3.68181818181818  L 18.6547085201794 4.72727272727273  L 15.4260089686099 1.45454545454546  L 16.457399103139 0.409090909090908  C 16.6666666666667 0.196969696969695  16.9207772795217 0.0909090909090917  17.219730941704 0.0909090909090917  C 17.5186846038864 0.0909090909090917  17.7727952167414 0.196969696969695  17.9820627802691 0.409090909090908  L 19.6860986547085 2.13636363636364  C 19.8953662182362 2.34848484848485  20 2.60606060606061  20 2.90909090909091  Z " fill-rule="nonzero" fill="#5caa36" stroke="none" transform="matrix(1 0 0 1 1429 15 )" />
+  </g>
+</svg>
\ No newline at end of file

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h
index 8102d24..055c44e 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.h
+++ b/softwareDirectory/AutoVerScheme/checkdevice.h
@@ -2,6 +2,8 @@
 #define CHECKDEVICE_H
 
 #include <QWidget>
+#include "basecommonapi.h"
+#include "newcheckmethod.h"
 
 namespace Ui {
 class CheckDevice;
@@ -15,12 +17,19 @@
     explicit CheckDevice(QWidget *parent = nullptr);
     ~CheckDevice();
 
+private slots:
+    void on_pushButton_19_clicked();
+
 private:
     void getCheckDevice();
     void getStandardDevice();
 
+public:
+    NewCheckMethod *newCheckWnd=nullptr;
 private:
     Ui::CheckDevice *ui;
+    QList<TestedDevice> testedDeviceList;
+    QList<BizDevice> bizDeviceList;
 };
 
 #endif // CHECKDEVICE_H
diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
index 300668c..b83b561 100644
--- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
+++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
@@ -8,8 +8,11 @@
     ui(new Ui::CheckMethodManage)
 {
     ui->setupUi(this);
-    for(int i=1;i<6;i++)
+    ui->tableWidget_2->verticalHeader()->setParent(nullptr); //隐藏行头
+    for(int i=1;i<5;i++)
         ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->tableWidget_2->setColumnWidth(0, 60);
+    ui->tableWidget_2->setColumnWidth(5, 200);
     getCheckMethod();
 }
 
@@ -102,8 +105,8 @@
          btn_1->setCursor(Qt::PointingHandCursor);
          connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked()));
 
-         //btn_1->setIconSize(QSize(16,16));
-         //btn_1->setIcon(QIcon(":/image/Index/u15.png"));
+         btn_1->setIconSize(QSize(16,16));
+         btn_1->setIcon(QIcon(":/image/Index/u2324.svg"));
          QPushButton *btn_2 = new QPushButton();
          btn_2->setText(tr("删除"));
          btn_2->setStyleSheet("QPushButton{"
@@ -113,8 +116,8 @@
                               "}");
          btn_2->setCursor(Qt::PointingHandCursor);
          connect(btn_2,SIGNAL(clicked()),this,SLOT(on_deleteButton_clicked()));
-         //btn_2->setIconSize(QSize(16,16));
-         //btn_2->setIcon(QIcon(":/image/Index/u102.png"));
+         btn_2->setIconSize(QSize(16,16));
+         btn_2->setIcon(QIcon(":/image/Index/u2325.svg"));
          QWidget *tmp_widget = new QWidget();
          QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget);
          tmp_layout->addWidget(btn_1);
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index d9286f1..cfd3b0d 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -12,6 +12,9 @@
     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);
 }
 
 
@@ -40,6 +43,7 @@
             qDebug() << "strStyle:" << strStyle ;
             ui->label_11->setStyleSheet(strStyle);
         }
+        chooseDevices(programInfo.tested_device_id,programInfo.standard_device_id);
     }
 }
 
@@ -50,6 +54,7 @@
 void NewCheckMethod::showCheckDevice()
 {
     CheckDevice *checkWindow = new CheckDevice;
+    checkWindow->newCheckWnd = this;
     checkWindow->setWindowState(Qt::WindowMaximized);
     checkWindow->setWindowModality(Qt::ApplicationModal);
     checkWindow->show();
@@ -124,3 +129,57 @@
 {
     this->close();
 }
+
+void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds)
+{
+    programInfo.tested_device_id=checkIds;
+    programInfo.standard_device_id = bizIds;
+    ui->tableWidget->clearContents();
+    ui->tableWidget->setRowCount(0);
+    QStringList idList;
+    int rowCount = 0;
+    int row=0;
+    if(checkIds!="")
+    {
+        idList = checkIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.length()>0){
+                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].help_instruction)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+
+    if(bizIds!="")
+    {
+        idList = bizIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
+            if(result.length()>0){
+                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].remark)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+}
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index dfe4e92..b47da6e 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -16,6 +16,7 @@
     explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
     ~NewCheckMethod();
     void getMethodInfo();
+    void chooseDevices(QString checkIds,QString bizIds);
 private slots:
     void showCheckDevice();
     void choosePicture();
diff --git a/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg b/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg
new file mode 100644
index 0000000..797f1c5
--- /dev/null
+++ b/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -1429 -15 )">
+    <path d="M 9.32735426008969 12  L 9.95515695067265 12  L 11.2556053811659 10.6818181818182  L 9.55156950672646 8.95454545454545  L 8.25112107623318 10.2727272727273  L 8.25112107623318 10.9090909090909  L 9.32735426008969 10.9090909090909  L 9.32735426008969 12  Z M 14.8766816143498 4.19318181818182  C 15.0037369207773 4.06439393939394  15.0074738415546 3.93939393939394  14.8878923766816 3.81818181818182  C 14.7683109118087 3.6969696969697  14.6449925261584 3.70075757575757  14.5179372197309 3.82954545454546  L 10.5941704035874 7.80681818181818  C 10.4671150971599 7.93560606060606  10.4633781763827 8.06060606060606  10.5829596412556 8.18181818181818  C 10.7025411061286 8.3030303030303  10.8258594917788 8.29924242424242  10.9529147982063 8.17045454545455  L 14.8766816143498 4.19318181818182  Z M 15.5605381165919 10.2386363636364  C 15.7100149476831 10.2992424242424  15.7847533632287 10.4090909090909  15.7847533632287 10.5681818181818  L 15.7847533632287 12.7272727272727  C 15.7847533632287 13.6287878787879  15.4689835575486 14.3996212121212  14.8374439461883 15.0397727272727  C 14.2059043348281 15.6799242424242  13.4454409566517 16  12.5560538116592 16  L 3.22869955156951 16  C 2.33931240657698 16  1.5788490284006 15.6799242424242  0.947309417040359 15.0397727272727  C 0.31576980568012 14.3996212121212  0 13.6287878787879  0 12.7272727272727  L 0 3.27272727272727  C 0 2.37121212121212  0.31576980568012 1.60037878787879  0.947309417040359 0.960227272727273  C 1.5788490284006 0.320075757575756  2.33931240657698 0  3.22869955156951 0  L 12.5560538116592 0  C 13.0269058295964 0  13.4641255605381 0.0946969696969688  13.8677130044843 0.284090909090908  C 13.9798206278027 0.337121212121211  14.0470852017937 0.424242424242424  14.0695067264574 0.545454545454545  C 14.0919282511211 0.674242424242424  14.0582959641256 0.784090909090908  13.9686098654709 0.875  L 13.4192825112108 1.43181818181818  C 13.3146487294469 1.53787878787879  13.195067264574 1.56818181818182  13.0605381165919 1.52272727272727  C 12.8886397608371 1.47727272727273  12.7204783258595 1.45454545454546  12.5560538116592 1.45454545454546  L 3.22869955156951 1.45454545454546  C 2.73542600896861 1.45454545454546  2.31315396113602 1.63257575757576  1.96188340807175 1.98863636363636  C 1.61061285500747 2.34469696969697  1.43497757847534 2.77272727272727  1.43497757847534 3.27272727272727  L 1.43497757847534 12.7272727272727  C 1.43497757847534 13.2272727272727  1.61061285500747 13.655303030303  1.96188340807175 14.0113636363636  C 2.31315396113602 14.3674242424242  2.73542600896861 14.5454545454545  3.22869955156951 14.5454545454545  L 12.5560538116592 14.5454545454545  C 13.0493273542601 14.5454545454545  13.4715994020927 14.3674242424242  13.822869955157 14.0113636363636  C 14.1741405082212 13.655303030303  14.3497757847534 13.2272727272727  14.3497757847534 12.7272727272727  L 14.3497757847534 11.2954545454545  C 14.3497757847534 11.1969696969697  14.3834080717489 11.1136363636364  14.4506726457399 11.0454545454545  L 15.1681614349776 10.3181818181818  C 15.280269058296 10.2045454545455  15.4110612855007 10.1780303030303  15.5605381165919 10.2386363636364  Z M 7.17488789237668 9.81818181818182  L 14.7085201793722 2.18181818181818  L 17.9372197309417 5.45454545454546  L 10.4035874439462 13.0909090909091  L 7.17488789237668 13.0909090909091  L 7.17488789237668 9.81818181818182  Z M 20 2.90909090909091  C 20 3.21212121212121  19.8953662182362 3.46969696969697  19.6860986547085 3.68181818181818  L 18.6547085201794 4.72727272727273  L 15.4260089686099 1.45454545454546  L 16.457399103139 0.409090909090908  C 16.6666666666667 0.196969696969695  16.9207772795217 0.0909090909090917  17.219730941704 0.0909090909090917  C 17.5186846038864 0.0909090909090917  17.7727952167414 0.196969696969695  17.9820627802691 0.409090909090908  L 19.6860986547085 2.13636363636364  C 19.8953662182362 2.34848484848485  20 2.60606060606061  20 2.90909090909091  Z " fill-rule="nonzero" fill="#5caa36" stroke="none" transform="matrix(1 0 0 1 1429 15 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/softwareDirectory/AutoVerScheme/res/image/Index/u2325.svg b/softwareDirectory/AutoVerScheme/res/image/Index/u2325.svg
new file mode 100644
index 0000000..fefe01b
--- /dev/null
+++ b/softwareDirectory/AutoVerScheme/res/image/Index/u2325.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -1495 -15 )">
+    <path d="M 5.35866477272727 6.09375  C 5.42258522727273 6.15625  5.45454545454546 6.23611111111111  5.45454545454546 6.33333333333333  L 5.45454545454546 12.3333333333333  C 5.45454545454546 12.4305555555556  5.42258522727273 12.5104166666667  5.35866477272727 12.5729166666667  C 5.29474431818182 12.6354166666667  5.21306818181818 12.6666666666667  5.11363636363636 12.6666666666667  L 4.43181818181818 12.6666666666667  C 4.33238636363636 12.6666666666667  4.25071022727273 12.6354166666667  4.18678977272727 12.5729166666667  C 4.12286931818182 12.5104166666667  4.09090909090909 12.4305555555556  4.09090909090909 12.3333333333333  L 4.09090909090909 6.33333333333333  C 4.09090909090909 6.23611111111111  4.12286931818182 6.15625  4.18678977272727 6.09375  C 4.25071022727273 6.03125  4.33238636363636 6  4.43181818181818 6  L 5.11363636363636 6  C 5.21306818181818 6  5.29474431818182 6.03125  5.35866477272727 6.09375  Z M 8.0859375 6.09375  C 8.14985795454546 6.15625  8.18181818181818 6.23611111111111  8.18181818181818 6.33333333333333  L 8.18181818181818 12.3333333333333  C 8.18181818181818 12.4305555555556  8.14985795454546 12.5104166666667  8.0859375 12.5729166666667  C 8.02201704545455 12.6354166666667  7.94034090909091 12.6666666666667  7.84090909090909 12.6666666666667  L 7.15909090909091 12.6666666666667  C 7.05965909090909 12.6666666666667  6.97798295454546 12.6354166666667  6.9140625 12.5729166666667  C 6.85014204545455 12.5104166666667  6.81818181818182 12.4305555555556  6.81818181818182 12.3333333333333  L 6.81818181818182 6.33333333333333  C 6.81818181818182 6.23611111111111  6.85014204545455 6.15625  6.9140625 6.09375  C 6.97798295454546 6.03125  7.05965909090909 6  7.15909090909091 6  L 7.84090909090909 6  C 7.94034090909091 6  8.02201704545455 6.03125  8.0859375 6.09375  Z M 10.8132102272727 6.09375  C 10.8771306818182 6.15625  10.9090909090909 6.23611111111111  10.9090909090909 6.33333333333333  L 10.9090909090909 12.3333333333333  C 10.9090909090909 12.4305555555556  10.8771306818182 12.5104166666667  10.8132102272727 12.5729166666667  C 10.7492897727273 12.6354166666667  10.6676136363636 12.6666666666667  10.5681818181818 12.6666666666667  L 9.88636363636364 12.6666666666667  C 9.78693181818182 12.6666666666667  9.70525568181818 12.6354166666667  9.64133522727273 12.5729166666667  C 9.57741477272727 12.5104166666667  9.54545454545455 12.4305555555556  9.54545454545455 12.3333333333333  L 9.54545454545455 6.33333333333333  C 9.54545454545455 6.23611111111111  9.57741477272727 6.15625  9.64133522727273 6.09375  C 9.70525568181818 6.03125  9.78693181818182 6  9.88636363636364 6  L 10.5681818181818 6  C 10.6676136363636 6  10.7492897727273 6.03125  10.8132102272727 6.09375  Z M 12.1981534090909 14.296875  C 12.2478693181818 14.1684027777778  12.2727272727273 14.0277777777778  12.2727272727273 13.875  L 12.2727272727273 4  L 2.72727272727273 4  L 2.72727272727273 13.875  C 2.72727272727273 14.0277777777778  2.75213068181818 14.1684027777778  2.80184659090909 14.296875  C 2.8515625 14.4253472222222  2.90305397727273 14.5190972222222  2.95632102272727 14.578125  C 3.00958806818182 14.6371527777778  3.046875 14.6666666666667  3.06818181818182 14.6666666666667  L 11.9318181818182 14.6666666666667  C 11.953125 14.6666666666667  11.9904119318182 14.6371527777778  12.0436789772727 14.578125  C 12.0969460227273 14.5190972222222  12.1484375 14.4253472222222  12.1981534090909 14.296875  Z M 5.63565340909091 1.44791666666667  L 5.11363636363636 2.66666666666667  L 9.88636363636364 2.66666666666667  L 9.375 1.44791666666667  C 9.32528409090909 1.38541666666667  9.26491477272727 1.34722222222222  9.19389204545455 1.33333333333333  L 5.81676136363636 1.33333333333333  C 5.74573863636364 1.34722222222222  5.68536931818182 1.38541666666667  5.63565340909091 1.44791666666667  Z M 14.9041193181818 2.76041666666667  C 14.9680397727273 2.82291666666667  15 2.90277777777778  15 3  L 15 3.66666666666667  C 15 3.76388888888889  14.9680397727273 3.84375  14.9041193181818 3.90625  C 14.8401988636364 3.96875  14.7585227272727 4  14.6590909090909 4  L 13.6363636363636 4  L 13.6363636363636 13.875  C 13.6363636363636 14.4513888888889  13.4694602272727 14.9496527777778  13.1356534090909 15.3697916666667  C 12.8018465909091 15.7899305555556  12.4005681818182 16  11.9318181818182 16  L 3.06818181818182 16  C 2.59943181818182 16  2.19815340909091 15.796875  1.86434659090909 15.390625  C 1.53053977272727 14.984375  1.36363636363636 14.4930555555556  1.36363636363636 13.9166666666667  L 1.36363636363636 4  L 0.340909090909091 4  C 0.241477272727273 4  0.159801136363636 3.96875  0.0958806818181818 3.90625  C 0.0319602272727273 3.84375  0 3.76388888888889  0 3.66666666666667  L 0 3  C 0 2.90277777777778  0.0319602272727273 2.82291666666667  0.0958806818181818 2.76041666666667  C 0.159801136363636 2.69791666666667  0.241477272727273 2.66666666666667  0.340909090909091 2.66666666666667  L 3.6328125 2.66666666666667  L 4.37855113636364 0.927083333333334  C 4.48508522727273 0.670138888888888  4.67684659090909 0.451388888888888  4.95383522727273 0.270833333333334  C 5.23082386363636 0.0902777777777768  5.51136363636364 0  5.79545454545455 0  L 9.20454545454546 0  C 9.48863636363637 0  9.76917613636364 0.0902777777777768  10.0461647727273 0.270833333333334  C 10.3231534090909 0.451388888888888  10.5149147727273 0.670138888888888  10.6214488636364 0.927083333333334  L 11.3671875 2.66666666666667  L 14.6590909090909 2.66666666666667  C 14.7585227272727 2.66666666666667  14.8401988636364 2.69791666666667  14.9041193181818 2.76041666666667  Z " fill-rule="nonzero" fill="#aa1111" stroke="none" transform="matrix(1 0 0 1 1495 15 )" />
+  </g>
+</svg>
\ No newline at end of file

diff --git a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
index 4d3dc70..9831b40 100644
--- a/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
+++ b/softwareDirectory/AutoVerScheme/AutoVerScheme.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.11.1, 2024-03-14T17:15:39. -->
+<!-- Written by QtCreator 4.11.1, 2024-03-14T21:29:03. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.cpp b/softwareDirectory/AutoVerScheme/checkdevice.cpp
index d540aa6..e6b7fa4 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.cpp
+++ b/softwareDirectory/AutoVerScheme/checkdevice.cpp
@@ -2,6 +2,7 @@
 #include "ui_checkdevice.h"
 #include "basecommonapi.h"
 #include <QCheckBox>
+#include <QMessageBox>
 
 CheckDevice::CheckDevice(QWidget *parent) :
     QWidget(parent),
@@ -20,6 +21,8 @@
 
 CheckDevice::~CheckDevice()
 {
+    testedDeviceList.clear();
+    bizDeviceList.clear();
     delete ui;
 }
 
@@ -27,15 +30,18 @@
 {
     int rowCount=0;
     int row=0;
-    QList<TestedDevice> data = BaseCommonApi::getTestedDevice();
-    for (const TestedDevice& bizDevice : data) {
+    testedDeviceList = BaseCommonApi::getTestedDevice();
+    for (const TestedDevice& bizDevice : testedDeviceList) {
         rowCount = ui->tableWidget_3->rowCount();
         ui->tableWidget_3->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_3->setCellWidget(row, 0, checkBox);
-        ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
-        ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
-        ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_3->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);        //设置首列为 CheckBox 控件
+        ui->tableWidget_3->setItem(row,0,p_check);
+        ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
+        ui->tableWidget_3->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
+        ui->tableWidget_3->setItem(row, 3, new QTableWidgetItem(bizDevice.help_instruction));
         row++;
     }
 }
@@ -44,12 +50,15 @@
 {
     int rowCount=0;
     int row=0;
-    QList<BizDevice> data = BaseCommonApi::getBizDeviceManage();
-    for (const BizDevice& bizDevice : data) {
+    bizDeviceList = BaseCommonApi::getBizDeviceManage();
+    for (const BizDevice& bizDevice : bizDeviceList) {
         rowCount = ui->tableWidget_4->rowCount();
         ui->tableWidget_4->insertRow(rowCount);
-        QCheckBox *checkBox = new QCheckBox;
-        ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        //QCheckBox *checkBox = new QCheckBox;
+        //ui->tableWidget_4->setCellWidget(row, 0, checkBox);
+        QTableWidgetItem* p_check = new QTableWidgetItem();
+        p_check->setCheckState(Qt::Unchecked);
+        ui->tableWidget_4->setItem(row,0,p_check);
         ui->tableWidget_4->setItem(row, 1, new QTableWidgetItem(bizDevice.equipment_name));
         ui->tableWidget_4->setItem(row, 2, new QTableWidgetItem(bizDevice.model));
         ui->tableWidget_4->setItem(row, 3, new QTableWidgetItem(bizDevice.manufacture_no));
@@ -57,3 +66,35 @@
         row++;
     }
 }
+
+void CheckDevice::on_pushButton_19_clicked()
+{
+    QString checkIds="";
+    QString bizIds = "";
+    for(int i=0;i<ui->tableWidget_3->rowCount();i++){
+        if(ui->tableWidget_3->item(i,0)->checkState()==Qt::Checked){
+            if(checkIds=="")
+                checkIds = testedDeviceList[i].id;
+            else
+                checkIds+=","+testedDeviceList[i].id;
+        }
+    }
+    for(int i=0;i<ui->tableWidget_4->rowCount();i++){
+        if(ui->tableWidget_4->item(i,0)->checkState()==Qt::Checked){
+            if(bizIds=="")
+                bizIds = bizDeviceList[i].id;
+            else
+                bizIds+=","+bizDeviceList[i].id;
+        }
+    }
+    if(checkIds==""){
+        QMessageBox::warning(this, "提示", "请选择被检设备！");
+        return;
+    }
+    if(bizIds==""){
+        QMessageBox::warning(this, "提示", "请选择标准设备！");
+        return;
+    }
+    newCheckWnd->chooseDevices(checkIds,bizIds);
+    this->close();
+}
diff --git a/softwareDirectory/AutoVerScheme/checkdevice.h b/softwareDirectory/AutoVerScheme/checkdevice.h
index 8102d24..055c44e 100644
--- a/softwareDirectory/AutoVerScheme/checkdevice.h
+++ b/softwareDirectory/AutoVerScheme/checkdevice.h
@@ -2,6 +2,8 @@
 #define CHECKDEVICE_H
 
 #include <QWidget>
+#include "basecommonapi.h"
+#include "newcheckmethod.h"
 
 namespace Ui {
 class CheckDevice;
@@ -15,12 +17,19 @@
     explicit CheckDevice(QWidget *parent = nullptr);
     ~CheckDevice();
 
+private slots:
+    void on_pushButton_19_clicked();
+
 private:
     void getCheckDevice();
     void getStandardDevice();
 
+public:
+    NewCheckMethod *newCheckWnd=nullptr;
 private:
     Ui::CheckDevice *ui;
+    QList<TestedDevice> testedDeviceList;
+    QList<BizDevice> bizDeviceList;
 };
 
 #endif // CHECKDEVICE_H
diff --git a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
index 300668c..b83b561 100644
--- a/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
+++ b/softwareDirectory/AutoVerScheme/checkmethodmanage.cpp
@@ -8,8 +8,11 @@
     ui(new Ui::CheckMethodManage)
 {
     ui->setupUi(this);
-    for(int i=1;i<6;i++)
+    ui->tableWidget_2->verticalHeader()->setParent(nullptr); //隐藏行头
+    for(int i=1;i<5;i++)
         ui->tableWidget_2->horizontalHeader()->setSectionResizeMode(i,QHeaderView::Stretch);
+    ui->tableWidget_2->setColumnWidth(0, 60);
+    ui->tableWidget_2->setColumnWidth(5, 200);
     getCheckMethod();
 }
 
@@ -102,8 +105,8 @@
          btn_1->setCursor(Qt::PointingHandCursor);
          connect(btn_1,SIGNAL(clicked()),this,SLOT(on_editButton_clicked()));
 
-         //btn_1->setIconSize(QSize(16,16));
-         //btn_1->setIcon(QIcon(":/image/Index/u15.png"));
+         btn_1->setIconSize(QSize(16,16));
+         btn_1->setIcon(QIcon(":/image/Index/u2324.svg"));
          QPushButton *btn_2 = new QPushButton();
          btn_2->setText(tr("删除"));
          btn_2->setStyleSheet("QPushButton{"
@@ -113,8 +116,8 @@
                               "}");
          btn_2->setCursor(Qt::PointingHandCursor);
          connect(btn_2,SIGNAL(clicked()),this,SLOT(on_deleteButton_clicked()));
-         //btn_2->setIconSize(QSize(16,16));
-         //btn_2->setIcon(QIcon(":/image/Index/u102.png"));
+         btn_2->setIconSize(QSize(16,16));
+         btn_2->setIcon(QIcon(":/image/Index/u2325.svg"));
          QWidget *tmp_widget = new QWidget();
          QHBoxLayout *tmp_layout = new QHBoxLayout(tmp_widget);
          tmp_layout->addWidget(btn_1);
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
index d9286f1..cfd3b0d 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.cpp
@@ -12,6 +12,9 @@
     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);
 }
 
 
@@ -40,6 +43,7 @@
             qDebug() << "strStyle:" << strStyle ;
             ui->label_11->setStyleSheet(strStyle);
         }
+        chooseDevices(programInfo.tested_device_id,programInfo.standard_device_id);
     }
 }
 
@@ -50,6 +54,7 @@
 void NewCheckMethod::showCheckDevice()
 {
     CheckDevice *checkWindow = new CheckDevice;
+    checkWindow->newCheckWnd = this;
     checkWindow->setWindowState(Qt::WindowMaximized);
     checkWindow->setWindowModality(Qt::ApplicationModal);
     checkWindow->show();
@@ -124,3 +129,57 @@
 {
     this->close();
 }
+
+void NewCheckMethod::chooseDevices(QString checkIds, QString bizIds)
+{
+    programInfo.tested_device_id=checkIds;
+    programInfo.standard_device_id = bizIds;
+    ui->tableWidget->clearContents();
+    ui->tableWidget->setRowCount(0);
+    QStringList idList;
+    int rowCount = 0;
+    int row=0;
+    if(checkIds!="")
+    {
+        idList = checkIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<TestedCatDevice> result = BaseCommonApi::getTestedCatDevice(id);
+            if(result.length()>0){
+                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].help_instruction)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+
+    if(bizIds!="")
+    {
+        idList = bizIds.split(",");
+        for(const QString& id : idList)
+        {
+            QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
+            if(result.length()>0){
+                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].remark)); //设置数据
+                ui->tableWidget->setItem(row, 4, new QTableWidgetItem(result[0].manufacture_no)); //设置数据
+                ui->tableWidget->setItem(row, 5, new QTableWidgetItem(result[0].manufacturer));
+                row++;
+            }
+        }
+        idList.clear();
+    }
+}
diff --git a/softwareDirectory/AutoVerScheme/newcheckmethod.h b/softwareDirectory/AutoVerScheme/newcheckmethod.h
index dfe4e92..b47da6e 100644
--- a/softwareDirectory/AutoVerScheme/newcheckmethod.h
+++ b/softwareDirectory/AutoVerScheme/newcheckmethod.h
@@ -16,6 +16,7 @@
     explicit NewCheckMethod(QWidget *parent = nullptr,QString sId="");
     ~NewCheckMethod();
     void getMethodInfo();
+    void chooseDevices(QString checkIds,QString bizIds);
 private slots:
     void showCheckDevice();
     void choosePicture();
diff --git a/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg b/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg
new file mode 100644
index 0000000..797f1c5
--- /dev/null
+++ b/softwareDirectory/AutoVerScheme/res/image/Index/u2324.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="20px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -1429 -15 )">
+    <path d="M 9.32735426008969 12  L 9.95515695067265 12  L 11.2556053811659 10.6818181818182  L 9.55156950672646 8.95454545454545  L 8.25112107623318 10.2727272727273  L 8.25112107623318 10.9090909090909  L 9.32735426008969 10.9090909090909  L 9.32735426008969 12  Z M 14.8766816143498 4.19318181818182  C 15.0037369207773 4.06439393939394  15.0074738415546 3.93939393939394  14.8878923766816 3.81818181818182  C 14.7683109118087 3.6969696969697  14.6449925261584 3.70075757575757  14.5179372197309 3.82954545454546  L 10.5941704035874 7.80681818181818  C 10.4671150971599 7.93560606060606  10.4633781763827 8.06060606060606  10.5829596412556 8.18181818181818  C 10.7025411061286 8.3030303030303  10.8258594917788 8.29924242424242  10.9529147982063 8.17045454545455  L 14.8766816143498 4.19318181818182  Z M 15.5605381165919 10.2386363636364  C 15.7100149476831 10.2992424242424  15.7847533632287 10.4090909090909  15.7847533632287 10.5681818181818  L 15.7847533632287 12.7272727272727  C 15.7847533632287 13.6287878787879  15.4689835575486 14.3996212121212  14.8374439461883 15.0397727272727  C 14.2059043348281 15.6799242424242  13.4454409566517 16  12.5560538116592 16  L 3.22869955156951 16  C 2.33931240657698 16  1.5788490284006 15.6799242424242  0.947309417040359 15.0397727272727  C 0.31576980568012 14.3996212121212  0 13.6287878787879  0 12.7272727272727  L 0 3.27272727272727  C 0 2.37121212121212  0.31576980568012 1.60037878787879  0.947309417040359 0.960227272727273  C 1.5788490284006 0.320075757575756  2.33931240657698 0  3.22869955156951 0  L 12.5560538116592 0  C 13.0269058295964 0  13.4641255605381 0.0946969696969688  13.8677130044843 0.284090909090908  C 13.9798206278027 0.337121212121211  14.0470852017937 0.424242424242424  14.0695067264574 0.545454545454545  C 14.0919282511211 0.674242424242424  14.0582959641256 0.784090909090908  13.9686098654709 0.875  L 13.4192825112108 1.43181818181818  C 13.3146487294469 1.53787878787879  13.195067264574 1.56818181818182  13.0605381165919 1.52272727272727  C 12.8886397608371 1.47727272727273  12.7204783258595 1.45454545454546  12.5560538116592 1.45454545454546  L 3.22869955156951 1.45454545454546  C 2.73542600896861 1.45454545454546  2.31315396113602 1.63257575757576  1.96188340807175 1.98863636363636  C 1.61061285500747 2.34469696969697  1.43497757847534 2.77272727272727  1.43497757847534 3.27272727272727  L 1.43497757847534 12.7272727272727  C 1.43497757847534 13.2272727272727  1.61061285500747 13.655303030303  1.96188340807175 14.0113636363636  C 2.31315396113602 14.3674242424242  2.73542600896861 14.5454545454545  3.22869955156951 14.5454545454545  L 12.5560538116592 14.5454545454545  C 13.0493273542601 14.5454545454545  13.4715994020927 14.3674242424242  13.822869955157 14.0113636363636  C 14.1741405082212 13.655303030303  14.3497757847534 13.2272727272727  14.3497757847534 12.7272727272727  L 14.3497757847534 11.2954545454545  C 14.3497757847534 11.1969696969697  14.3834080717489 11.1136363636364  14.4506726457399 11.0454545454545  L 15.1681614349776 10.3181818181818  C 15.280269058296 10.2045454545455  15.4110612855007 10.1780303030303  15.5605381165919 10.2386363636364  Z M 7.17488789237668 9.81818181818182  L 14.7085201793722 2.18181818181818  L 17.9372197309417 5.45454545454546  L 10.4035874439462 13.0909090909091  L 7.17488789237668 13.0909090909091  L 7.17488789237668 9.81818181818182  Z M 20 2.90909090909091  C 20 3.21212121212121  19.8953662182362 3.46969696969697  19.6860986547085 3.68181818181818  L 18.6547085201794 4.72727272727273  L 15.4260089686099 1.45454545454546  L 16.457399103139 0.409090909090908  C 16.6666666666667 0.196969696969695  16.9207772795217 0.0909090909090917  17.219730941704 0.0909090909090917  C 17.5186846038864 0.0909090909090917  17.7727952167414 0.196969696969695  17.9820627802691 0.409090909090908  L 19.6860986547085 2.13636363636364  C 19.8953662182362 2.34848484848485  20 2.60606060606061  20 2.90909090909091  Z " fill-rule="nonzero" fill="#5caa36" stroke="none" transform="matrix(1 0 0 1 1429 15 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/softwareDirectory/AutoVerScheme/res/image/Index/u2325.svg b/softwareDirectory/AutoVerScheme/res/image/Index/u2325.svg
new file mode 100644
index 0000000..fefe01b
--- /dev/null
+++ b/softwareDirectory/AutoVerScheme/res/image/Index/u2325.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" xmlns:xlink="http://www.w3.org/1999/xlink" width="15px" height="16px" xmlns="http://www.w3.org/2000/svg">
+  <g transform="matrix(1 0 0 1 -1495 -15 )">
+    <path d="M 5.35866477272727 6.09375  C 5.42258522727273 6.15625  5.45454545454546 6.23611111111111  5.45454545454546 6.33333333333333  L 5.45454545454546 12.3333333333333  C 5.45454545454546 12.4305555555556  5.42258522727273 12.5104166666667  5.35866477272727 12.5729166666667  C 5.29474431818182 12.6354166666667  5.21306818181818 12.6666666666667  5.11363636363636 12.6666666666667  L 4.43181818181818 12.6666666666667  C 4.33238636363636 12.6666666666667  4.25071022727273 12.6354166666667  4.18678977272727 12.5729166666667  C 4.12286931818182 12.5104166666667  4.09090909090909 12.4305555555556  4.09090909090909 12.3333333333333  L 4.09090909090909 6.33333333333333  C 4.09090909090909 6.23611111111111  4.12286931818182 6.15625  4.18678977272727 6.09375  C 4.25071022727273 6.03125  4.33238636363636 6  4.43181818181818 6  L 5.11363636363636 6  C 5.21306818181818 6  5.29474431818182 6.03125  5.35866477272727 6.09375  Z M 8.0859375 6.09375  C 8.14985795454546 6.15625  8.18181818181818 6.23611111111111  8.18181818181818 6.33333333333333  L 8.18181818181818 12.3333333333333  C 8.18181818181818 12.4305555555556  8.14985795454546 12.5104166666667  8.0859375 12.5729166666667  C 8.02201704545455 12.6354166666667  7.94034090909091 12.6666666666667  7.84090909090909 12.6666666666667  L 7.15909090909091 12.6666666666667  C 7.05965909090909 12.6666666666667  6.97798295454546 12.6354166666667  6.9140625 12.5729166666667  C 6.85014204545455 12.5104166666667  6.81818181818182 12.4305555555556  6.81818181818182 12.3333333333333  L 6.81818181818182 6.33333333333333  C 6.81818181818182 6.23611111111111  6.85014204545455 6.15625  6.9140625 6.09375  C 6.97798295454546 6.03125  7.05965909090909 6  7.15909090909091 6  L 7.84090909090909 6  C 7.94034090909091 6  8.02201704545455 6.03125  8.0859375 6.09375  Z M 10.8132102272727 6.09375  C 10.8771306818182 6.15625  10.9090909090909 6.23611111111111  10.9090909090909 6.33333333333333  L 10.9090909090909 12.3333333333333  C 10.9090909090909 12.4305555555556  10.8771306818182 12.5104166666667  10.8132102272727 12.5729166666667  C 10.7492897727273 12.6354166666667  10.6676136363636 12.6666666666667  10.5681818181818 12.6666666666667  L 9.88636363636364 12.6666666666667  C 9.78693181818182 12.6666666666667  9.70525568181818 12.6354166666667  9.64133522727273 12.5729166666667  C 9.57741477272727 12.5104166666667  9.54545454545455 12.4305555555556  9.54545454545455 12.3333333333333  L 9.54545454545455 6.33333333333333  C 9.54545454545455 6.23611111111111  9.57741477272727 6.15625  9.64133522727273 6.09375  C 9.70525568181818 6.03125  9.78693181818182 6  9.88636363636364 6  L 10.5681818181818 6  C 10.6676136363636 6  10.7492897727273 6.03125  10.8132102272727 6.09375  Z M 12.1981534090909 14.296875  C 12.2478693181818 14.1684027777778  12.2727272727273 14.0277777777778  12.2727272727273 13.875  L 12.2727272727273 4  L 2.72727272727273 4  L 2.72727272727273 13.875  C 2.72727272727273 14.0277777777778  2.75213068181818 14.1684027777778  2.80184659090909 14.296875  C 2.8515625 14.4253472222222  2.90305397727273 14.5190972222222  2.95632102272727 14.578125  C 3.00958806818182 14.6371527777778  3.046875 14.6666666666667  3.06818181818182 14.6666666666667  L 11.9318181818182 14.6666666666667  C 11.953125 14.6666666666667  11.9904119318182 14.6371527777778  12.0436789772727 14.578125  C 12.0969460227273 14.5190972222222  12.1484375 14.4253472222222  12.1981534090909 14.296875  Z M 5.63565340909091 1.44791666666667  L 5.11363636363636 2.66666666666667  L 9.88636363636364 2.66666666666667  L 9.375 1.44791666666667  C 9.32528409090909 1.38541666666667  9.26491477272727 1.34722222222222  9.19389204545455 1.33333333333333  L 5.81676136363636 1.33333333333333  C 5.74573863636364 1.34722222222222  5.68536931818182 1.38541666666667  5.63565340909091 1.44791666666667  Z M 14.9041193181818 2.76041666666667  C 14.9680397727273 2.82291666666667  15 2.90277777777778  15 3  L 15 3.66666666666667  C 15 3.76388888888889  14.9680397727273 3.84375  14.9041193181818 3.90625  C 14.8401988636364 3.96875  14.7585227272727 4  14.6590909090909 4  L 13.6363636363636 4  L 13.6363636363636 13.875  C 13.6363636363636 14.4513888888889  13.4694602272727 14.9496527777778  13.1356534090909 15.3697916666667  C 12.8018465909091 15.7899305555556  12.4005681818182 16  11.9318181818182 16  L 3.06818181818182 16  C 2.59943181818182 16  2.19815340909091 15.796875  1.86434659090909 15.390625  C 1.53053977272727 14.984375  1.36363636363636 14.4930555555556  1.36363636363636 13.9166666666667  L 1.36363636363636 4  L 0.340909090909091 4  C 0.241477272727273 4  0.159801136363636 3.96875  0.0958806818181818 3.90625  C 0.0319602272727273 3.84375  0 3.76388888888889  0 3.66666666666667  L 0 3  C 0 2.90277777777778  0.0319602272727273 2.82291666666667  0.0958806818181818 2.76041666666667  C 0.159801136363636 2.69791666666667  0.241477272727273 2.66666666666667  0.340909090909091 2.66666666666667  L 3.6328125 2.66666666666667  L 4.37855113636364 0.927083333333334  C 4.48508522727273 0.670138888888888  4.67684659090909 0.451388888888888  4.95383522727273 0.270833333333334  C 5.23082386363636 0.0902777777777768  5.51136363636364 0  5.79545454545455 0  L 9.20454545454546 0  C 9.48863636363637 0  9.76917613636364 0.0902777777777768  10.0461647727273 0.270833333333334  C 10.3231534090909 0.451388888888888  10.5149147727273 0.670138888888888  10.6214488636364 0.927083333333334  L 11.3671875 2.66666666666667  L 14.6590909090909 2.66666666666667  C 14.7585227272727 2.66666666666667  14.8401988636364 2.69791666666667  14.9041193181818 2.76041666666667  Z " fill-rule="nonzero" fill="#aa1111" stroke="none" transform="matrix(1 0 0 1 1495 15 )" />
+  </g>
+</svg>
\ No newline at end of file
diff --git a/softwareDirectory/AutoVerScheme/res/res.qrc b/softwareDirectory/AutoVerScheme/res/res.qrc
index 80e79c1..a0eac47 100644
--- a/softwareDirectory/AutoVerScheme/res/res.qrc
+++ b/softwareDirectory/AutoVerScheme/res/res.qrc
@@ -44,5 +44,7 @@
         <file>image/Index/u7488.svg</file>
         <file>image/Index/u7491.svg</file>
         <file>image/Index/u7538.svg</file>
+        <file>image/Index/u2324.svg</file>
+        <file>image/Index/u2325.svg</file>
     </qresource>
 </RCC>