diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index e106131..eec526b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,6 +7,7 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 #include "formbizdeviceselect.h"
+#include "global.h"
 
 NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
@@ -26,6 +27,10 @@
     ui->tableWidget_2->setColumnWidth(5, 200);
     ui->pushButton_9->setEnabled(bEditMode);
     ui->comboBoxEquipment->addItems(equipList);
+
+    ui->dateEditTime->setDate(QDate::currentDate());
+    ui->lineEditUser->setText(loginUserName); // 默认为当前登录用户
+
     getMethodInfo();
 }
 
@@ -466,6 +471,13 @@
     for(const StandardCheckItemCategory& item : catList){
         ui->comboBoxCategory->addItem(item.category_name);
     }
+
+    setMethodName();
+}
+
+void NewVerifyMethod::on_comboBoxCategory_currentIndexChanged(int index)
+{
+    setMethodName();
 }
 
 void NewVerifyMethod::on_pushButton_clicked()
@@ -523,3 +535,9 @@
         idList.clear();
     }
 }
+
+void NewVerifyMethod::setMethodName()
+{
+    QString sName = ui->comboBoxEquipment->currentText()+"-"+ui->comboBoxCategory->currentText();
+    ui->lineEditName->setText(sName);
+}

diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index e106131..eec526b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,6 +7,7 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 #include "formbizdeviceselect.h"
+#include "global.h"
 
 NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
@@ -26,6 +27,10 @@
     ui->tableWidget_2->setColumnWidth(5, 200);
     ui->pushButton_9->setEnabled(bEditMode);
     ui->comboBoxEquipment->addItems(equipList);
+
+    ui->dateEditTime->setDate(QDate::currentDate());
+    ui->lineEditUser->setText(loginUserName); // 默认为当前登录用户
+
     getMethodInfo();
 }
 
@@ -466,6 +471,13 @@
     for(const StandardCheckItemCategory& item : catList){
         ui->comboBoxCategory->addItem(item.category_name);
     }
+
+    setMethodName();
+}
+
+void NewVerifyMethod::on_comboBoxCategory_currentIndexChanged(int index)
+{
+    setMethodName();
 }
 
 void NewVerifyMethod::on_pushButton_clicked()
@@ -523,3 +535,9 @@
         idList.clear();
     }
 }
+
+void NewVerifyMethod::setMethodName()
+{
+    QString sName = ui->comboBoxEquipment->currentText()+"-"+ui->comboBoxCategory->currentText();
+    ui->lineEditName->setText(sName);
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 4396b40..8a29223 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -17,6 +17,7 @@
     explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
+    void setMethodName();
     void chooseDevices(QString bizIds,QString checkIds);
 private slots:
     void showVerifyDevice();
@@ -32,6 +33,8 @@
     void on_pushButton_10_clicked();
 
     void on_comboBoxEquipment_currentIndexChanged(int index);
+    void on_comboBoxCategory_currentIndexChanged(int index);
+
     void selectStandard(QString ids);
     void selectBizDevice(QList<QString> ids);
 

diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index e106131..eec526b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,6 +7,7 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 #include "formbizdeviceselect.h"
+#include "global.h"
 
 NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
@@ -26,6 +27,10 @@
     ui->tableWidget_2->setColumnWidth(5, 200);
     ui->pushButton_9->setEnabled(bEditMode);
     ui->comboBoxEquipment->addItems(equipList);
+
+    ui->dateEditTime->setDate(QDate::currentDate());
+    ui->lineEditUser->setText(loginUserName); // 默认为当前登录用户
+
     getMethodInfo();
 }
 
@@ -466,6 +471,13 @@
     for(const StandardCheckItemCategory& item : catList){
         ui->comboBoxCategory->addItem(item.category_name);
     }
+
+    setMethodName();
+}
+
+void NewVerifyMethod::on_comboBoxCategory_currentIndexChanged(int index)
+{
+    setMethodName();
 }
 
 void NewVerifyMethod::on_pushButton_clicked()
@@ -523,3 +535,9 @@
         idList.clear();
     }
 }
+
+void NewVerifyMethod::setMethodName()
+{
+    QString sName = ui->comboBoxEquipment->currentText()+"-"+ui->comboBoxCategory->currentText();
+    ui->lineEditName->setText(sName);
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 4396b40..8a29223 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -17,6 +17,7 @@
     explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
+    void setMethodName();
     void chooseDevices(QString bizIds,QString checkIds);
 private slots:
     void showVerifyDevice();
@@ -32,6 +33,8 @@
     void on_pushButton_10_clicked();
 
     void on_comboBoxEquipment_currentIndexChanged(int index);
+    void on_comboBoxCategory_currentIndexChanged(int index);
+
     void selectStandard(QString ids);
     void selectBizDevice(QList<QString> ids);
 
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index 581ab3d..2be1f4f 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -392,7 +392,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择标准设备：</string>
+             <string>选择核查标准设备：</string>
             </property>
            </widget>
           </item>
@@ -416,7 +416,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加标准设备</string>
+             <string>增加核查标准设备</string>
             </property>
            </widget>
           </item>
@@ -522,7 +522,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择核查件：</string>
+             <string>选择被核查设备：</string>
             </property>
            </widget>
           </item>
@@ -546,7 +546,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加核查件</string>
+             <string>增加被核查设备</string>
             </property>
            </widget>
           </item>

diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index e106131..eec526b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,6 +7,7 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 #include "formbizdeviceselect.h"
+#include "global.h"
 
 NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
@@ -26,6 +27,10 @@
     ui->tableWidget_2->setColumnWidth(5, 200);
     ui->pushButton_9->setEnabled(bEditMode);
     ui->comboBoxEquipment->addItems(equipList);
+
+    ui->dateEditTime->setDate(QDate::currentDate());
+    ui->lineEditUser->setText(loginUserName); // 默认为当前登录用户
+
     getMethodInfo();
 }
 
@@ -466,6 +471,13 @@
     for(const StandardCheckItemCategory& item : catList){
         ui->comboBoxCategory->addItem(item.category_name);
     }
+
+    setMethodName();
+}
+
+void NewVerifyMethod::on_comboBoxCategory_currentIndexChanged(int index)
+{
+    setMethodName();
 }
 
 void NewVerifyMethod::on_pushButton_clicked()
@@ -523,3 +535,9 @@
         idList.clear();
     }
 }
+
+void NewVerifyMethod::setMethodName()
+{
+    QString sName = ui->comboBoxEquipment->currentText()+"-"+ui->comboBoxCategory->currentText();
+    ui->lineEditName->setText(sName);
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 4396b40..8a29223 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -17,6 +17,7 @@
     explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
+    void setMethodName();
     void chooseDevices(QString bizIds,QString checkIds);
 private slots:
     void showVerifyDevice();
@@ -32,6 +33,8 @@
     void on_pushButton_10_clicked();
 
     void on_comboBoxEquipment_currentIndexChanged(int index);
+    void on_comboBoxCategory_currentIndexChanged(int index);
+
     void selectStandard(QString ids);
     void selectBizDevice(QList<QString> ids);
 
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index 581ab3d..2be1f4f 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -392,7 +392,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择标准设备：</string>
+             <string>选择核查标准设备：</string>
             </property>
            </widget>
           </item>
@@ -416,7 +416,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加标准设备</string>
+             <string>增加核查标准设备</string>
             </property>
            </widget>
           </item>
@@ -522,7 +522,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择核查件：</string>
+             <string>选择被核查设备：</string>
             </property>
            </widget>
           </item>
@@ -546,7 +546,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加核查件</string>
+             <string>增加被核查设备</string>
             </property>
            </widget>
           </item>
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp
index 50f73ba..7941366 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.cpp
+++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp
@@ -38,6 +38,9 @@
     //测试结果值填充列
     resultfillingList=readDataFromFile("resultfilling.txt");
 
+    // 新打开时指定默认显示选择核查程序的page页
+    ui->stackedWidget->setCurrentIndex(0);
+    ui->stackedWidget_2->setCurrentIndex(0);
     getVerifyMethod();
 }
 
@@ -287,8 +290,15 @@
     }
 }
 
-void VerifyWindow::initDeviceInfo(QString stdId,QString bizId)
+/**
+ * @brief VerifyWindow::initDeviceInfo
+ * 初始化核查设备列表
+ * @param stdId 核查标准设备
+ * @param bizId 被核查设备（标准装置中的设备）
+ */
+void VerifyWindow::initDeviceInfo(QString stdId, QString bizId)
 {
+    // 显示连接示意图
     QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path);
     qDebug() << "strStyle:" << strStyle;
     ui->label_8->setStyleSheet(strStyle);
@@ -298,12 +308,12 @@
     ui->tableWidget_Standard->clearContents();
     ui->tableWidget_Standard->setRowCount(0);
     QStringList idList;
-    int rowCount=0;
-    int row=0;
+    int rowCount = 0;
+    int row = 0;
     connectList.clear();
 
-    if(bizId!=""){
-        selectBizIds =bizId;
+    if(bizId != "") {
+        selectBizIds = bizId;
         idList = bizId.split(",");
         for(const QString& id : idList)
         {
@@ -312,12 +322,12 @@
             info.type = 0;
             info.id = id;
             QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
-            if(result.length()>0){
+            if(result.length() > 0) {
                 info.deviceName = result[0].equipment_name;
             }
-//            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
 
-//            info.deviceName = result.equipment_name;
+            //            info.deviceName = result.equipment_name;
 
             QList<VerificationProgramConfigInterface> addrList = BaseCommonApi::getVerificationProgramConfigInterface(id);
             if(addrList.length()>0){
@@ -330,7 +340,7 @@
         idList.clear();
     }
 
-    if(stdId!="")
+    if(stdId != "")
     {
         selectStdIds = stdId;
         idList = stdId.split(",");
@@ -338,10 +348,10 @@
         {
             ConnectInfo info;
             info.id = id;
-            info.state="未连接";
+            info.state = "未连接";
             info.type = 1;
             QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
-            if(result.length()>0){
+            if(result.length() > 0) {
                 info.deviceName = result[0].equipment_name;
             }
             result.clear();
@@ -355,8 +365,9 @@
         }
         idList.clear();
     }
-    for(const ConnectInfo& info : connectList){
+    for(const ConnectInfo& info : connectList) {
         rowCount = ui->tableWidget_3->rowCount();
+
         ui->tableWidget_3->insertRow(rowCount);
         ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(info.deviceName));
         ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据
@@ -463,8 +474,10 @@
         //修改连接状态
         if(getJoinState(addr.visa))
         {
-             ui->tableWidget_3->setItem(currentRow,2,new QTableWidgetItem("已连接"));
-        }else{  ui->tableWidget_3->setItem(currentRow,2,new QTableWidgetItem("未连接"));}
+            ui->tableWidget_3->setItem(currentRow, 1, new QTableWidgetItem("已连接"));
+        } else {
+            ui->tableWidget_3->setItem(currentRow, 1, new QTableWidgetItem("未连接"));
+        }
     }
 }
 
@@ -617,6 +630,7 @@
 //        }
 //    }
 
+    // 页面切换到自动核查执行页面
     ui->stackedWidget_2->setCurrentIndex(1);
 }
 
@@ -1519,41 +1533,45 @@
     getVerifyMethod();
 }
 
-void VerifyWindow::on_pushButton_14_clicked()
+/**
+ * @brief VerifyWindow::on_btnConfirmDevice_clicked
+ * 选择设备页的加载按钮点击事件
+ */
+void VerifyWindow::on_btnConfirmDevice_clicked()
 {
     QString sId="";
-    for(int i=0;i<ui->tableWidgetStd->rowCount();i++){
-        Qt::CheckState state = ui->tableWidgetStd->item(i,0)->checkState();
-        if(state == Qt::Checked){
+    for(int i = 0; i < ui->tableWidgetStd->rowCount(); i++) {
+        Qt::CheckState state = ui->tableWidgetStd->item(i, 0)->checkState();
+        if (state == Qt::Checked) {
             //sId = stdIdList[i];
             //break;
-            if(sId=="")
+            if(sId == "")
                 sId = stdIdList[i];
             else
                 sId =QString("%1,%2").arg(sId).arg(stdIdList[i]);
         }
     }
     QString sBizId="";
-    for(int i=0;i<ui->tableWidgetBiz->rowCount();i++){
+    for(int i = 0;i < ui->tableWidgetBiz->rowCount(); i++) {
         Qt::CheckState state = ui->tableWidgetBiz->item(i,0)->checkState();
         if(state == Qt::Checked){
             sBizId = bizIdList[i];
             break;
-//            if(sBizId=="")
-//                sBizId = bizIdList[i];
-//            else
-//                sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]);
+            //            if(sBizId=="")
+            //                sBizId = bizIdList[i];
+            //            else
+            //                sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]);
         }
     }
-    if(sId==""){
-        QMessageBox::warning(this, "提示", "请选择标准设备！");
+    if(sId == "") {
+        QMessageBox::warning(this, "提示", "请选择核查标准设备！");
     }
-    else if(sBizId==""){
-        QMessageBox::warning(this, "提示", "请选择核查件！");
+    else if(sBizId == "") {
+        QMessageBox::warning(this, "提示", "请选择被核查设备！");
     }
     else{
         //programInfo = BaseCommonApi::getCheckProgramManageById(sId);
-        initDeviceInfo(sId,sBizId);
+        initDeviceInfo(sId, sBizId);
         ui->stackedWidget->setCurrentIndex(2);
     }
 }

diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index e106131..eec526b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,6 +7,7 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 #include "formbizdeviceselect.h"
+#include "global.h"
 
 NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
@@ -26,6 +27,10 @@
     ui->tableWidget_2->setColumnWidth(5, 200);
     ui->pushButton_9->setEnabled(bEditMode);
     ui->comboBoxEquipment->addItems(equipList);
+
+    ui->dateEditTime->setDate(QDate::currentDate());
+    ui->lineEditUser->setText(loginUserName); // 默认为当前登录用户
+
     getMethodInfo();
 }
 
@@ -466,6 +471,13 @@
     for(const StandardCheckItemCategory& item : catList){
         ui->comboBoxCategory->addItem(item.category_name);
     }
+
+    setMethodName();
+}
+
+void NewVerifyMethod::on_comboBoxCategory_currentIndexChanged(int index)
+{
+    setMethodName();
 }
 
 void NewVerifyMethod::on_pushButton_clicked()
@@ -523,3 +535,9 @@
         idList.clear();
     }
 }
+
+void NewVerifyMethod::setMethodName()
+{
+    QString sName = ui->comboBoxEquipment->currentText()+"-"+ui->comboBoxCategory->currentText();
+    ui->lineEditName->setText(sName);
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 4396b40..8a29223 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -17,6 +17,7 @@
     explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
+    void setMethodName();
     void chooseDevices(QString bizIds,QString checkIds);
 private slots:
     void showVerifyDevice();
@@ -32,6 +33,8 @@
     void on_pushButton_10_clicked();
 
     void on_comboBoxEquipment_currentIndexChanged(int index);
+    void on_comboBoxCategory_currentIndexChanged(int index);
+
     void selectStandard(QString ids);
     void selectBizDevice(QList<QString> ids);
 
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index 581ab3d..2be1f4f 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -392,7 +392,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择标准设备：</string>
+             <string>选择核查标准设备：</string>
             </property>
            </widget>
           </item>
@@ -416,7 +416,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加标准设备</string>
+             <string>增加核查标准设备</string>
             </property>
            </widget>
           </item>
@@ -522,7 +522,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择核查件：</string>
+             <string>选择被核查设备：</string>
             </property>
            </widget>
           </item>
@@ -546,7 +546,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加核查件</string>
+             <string>增加被核查设备</string>
             </property>
            </widget>
           </item>
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp
index 50f73ba..7941366 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.cpp
+++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp
@@ -38,6 +38,9 @@
     //测试结果值填充列
     resultfillingList=readDataFromFile("resultfilling.txt");
 
+    // 新打开时指定默认显示选择核查程序的page页
+    ui->stackedWidget->setCurrentIndex(0);
+    ui->stackedWidget_2->setCurrentIndex(0);
     getVerifyMethod();
 }
 
@@ -287,8 +290,15 @@
     }
 }
 
-void VerifyWindow::initDeviceInfo(QString stdId,QString bizId)
+/**
+ * @brief VerifyWindow::initDeviceInfo
+ * 初始化核查设备列表
+ * @param stdId 核查标准设备
+ * @param bizId 被核查设备（标准装置中的设备）
+ */
+void VerifyWindow::initDeviceInfo(QString stdId, QString bizId)
 {
+    // 显示连接示意图
     QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path);
     qDebug() << "strStyle:" << strStyle;
     ui->label_8->setStyleSheet(strStyle);
@@ -298,12 +308,12 @@
     ui->tableWidget_Standard->clearContents();
     ui->tableWidget_Standard->setRowCount(0);
     QStringList idList;
-    int rowCount=0;
-    int row=0;
+    int rowCount = 0;
+    int row = 0;
     connectList.clear();
 
-    if(bizId!=""){
-        selectBizIds =bizId;
+    if(bizId != "") {
+        selectBizIds = bizId;
         idList = bizId.split(",");
         for(const QString& id : idList)
         {
@@ -312,12 +322,12 @@
             info.type = 0;
             info.id = id;
             QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
-            if(result.length()>0){
+            if(result.length() > 0) {
                 info.deviceName = result[0].equipment_name;
             }
-//            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
 
-//            info.deviceName = result.equipment_name;
+            //            info.deviceName = result.equipment_name;
 
             QList<VerificationProgramConfigInterface> addrList = BaseCommonApi::getVerificationProgramConfigInterface(id);
             if(addrList.length()>0){
@@ -330,7 +340,7 @@
         idList.clear();
     }
 
-    if(stdId!="")
+    if(stdId != "")
     {
         selectStdIds = stdId;
         idList = stdId.split(",");
@@ -338,10 +348,10 @@
         {
             ConnectInfo info;
             info.id = id;
-            info.state="未连接";
+            info.state = "未连接";
             info.type = 1;
             QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
-            if(result.length()>0){
+            if(result.length() > 0) {
                 info.deviceName = result[0].equipment_name;
             }
             result.clear();
@@ -355,8 +365,9 @@
         }
         idList.clear();
     }
-    for(const ConnectInfo& info : connectList){
+    for(const ConnectInfo& info : connectList) {
         rowCount = ui->tableWidget_3->rowCount();
+
         ui->tableWidget_3->insertRow(rowCount);
         ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(info.deviceName));
         ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据
@@ -463,8 +474,10 @@
         //修改连接状态
         if(getJoinState(addr.visa))
         {
-             ui->tableWidget_3->setItem(currentRow,2,new QTableWidgetItem("已连接"));
-        }else{  ui->tableWidget_3->setItem(currentRow,2,new QTableWidgetItem("未连接"));}
+            ui->tableWidget_3->setItem(currentRow, 1, new QTableWidgetItem("已连接"));
+        } else {
+            ui->tableWidget_3->setItem(currentRow, 1, new QTableWidgetItem("未连接"));
+        }
     }
 }
 
@@ -617,6 +630,7 @@
 //        }
 //    }
 
+    // 页面切换到自动核查执行页面
     ui->stackedWidget_2->setCurrentIndex(1);
 }
 
@@ -1519,41 +1533,45 @@
     getVerifyMethod();
 }
 
-void VerifyWindow::on_pushButton_14_clicked()
+/**
+ * @brief VerifyWindow::on_btnConfirmDevice_clicked
+ * 选择设备页的加载按钮点击事件
+ */
+void VerifyWindow::on_btnConfirmDevice_clicked()
 {
     QString sId="";
-    for(int i=0;i<ui->tableWidgetStd->rowCount();i++){
-        Qt::CheckState state = ui->tableWidgetStd->item(i,0)->checkState();
-        if(state == Qt::Checked){
+    for(int i = 0; i < ui->tableWidgetStd->rowCount(); i++) {
+        Qt::CheckState state = ui->tableWidgetStd->item(i, 0)->checkState();
+        if (state == Qt::Checked) {
             //sId = stdIdList[i];
             //break;
-            if(sId=="")
+            if(sId == "")
                 sId = stdIdList[i];
             else
                 sId =QString("%1,%2").arg(sId).arg(stdIdList[i]);
         }
     }
     QString sBizId="";
-    for(int i=0;i<ui->tableWidgetBiz->rowCount();i++){
+    for(int i = 0;i < ui->tableWidgetBiz->rowCount(); i++) {
         Qt::CheckState state = ui->tableWidgetBiz->item(i,0)->checkState();
         if(state == Qt::Checked){
             sBizId = bizIdList[i];
             break;
-//            if(sBizId=="")
-//                sBizId = bizIdList[i];
-//            else
-//                sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]);
+            //            if(sBizId=="")
+            //                sBizId = bizIdList[i];
+            //            else
+            //                sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]);
         }
     }
-    if(sId==""){
-        QMessageBox::warning(this, "提示", "请选择标准设备！");
+    if(sId == "") {
+        QMessageBox::warning(this, "提示", "请选择核查标准设备！");
     }
-    else if(sBizId==""){
-        QMessageBox::warning(this, "提示", "请选择核查件！");
+    else if(sBizId == "") {
+        QMessageBox::warning(this, "提示", "请选择被核查设备！");
     }
     else{
         //programInfo = BaseCommonApi::getCheckProgramManageById(sId);
-        initDeviceInfo(sId,sBizId);
+        initDeviceInfo(sId, sBizId);
         ui->stackedWidget->setCurrentIndex(2);
     }
 }
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.h b/softwareDirectory/AutoVerScheme/verifywindow.h
index 45e47cf..154c6d6 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.h
+++ b/softwareDirectory/AutoVerScheme/verifywindow.h
@@ -74,7 +74,8 @@
 
     void on_pushButton_11_clicked();
 
-    void on_pushButton_14_clicked();
+    // 选择设备页的加载按钮点击事件
+    void on_btnConfirmDevice_clicked();
 
     void on_pushButton_16_clicked();
 

diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.cpp b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
index e106131..eec526b 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.cpp
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.cpp
@@ -7,6 +7,7 @@
 #include "qfiledialog.h"
 #include <QMessageBox>
 #include "formbizdeviceselect.h"
+#include "global.h"
 
 NewVerifyMethod::NewVerifyMethod(QWidget *parent,QString sId,bool bEdit) :
     QWidget(parent),
@@ -26,6 +27,10 @@
     ui->tableWidget_2->setColumnWidth(5, 200);
     ui->pushButton_9->setEnabled(bEditMode);
     ui->comboBoxEquipment->addItems(equipList);
+
+    ui->dateEditTime->setDate(QDate::currentDate());
+    ui->lineEditUser->setText(loginUserName); // 默认为当前登录用户
+
     getMethodInfo();
 }
 
@@ -466,6 +471,13 @@
     for(const StandardCheckItemCategory& item : catList){
         ui->comboBoxCategory->addItem(item.category_name);
     }
+
+    setMethodName();
+}
+
+void NewVerifyMethod::on_comboBoxCategory_currentIndexChanged(int index)
+{
+    setMethodName();
 }
 
 void NewVerifyMethod::on_pushButton_clicked()
@@ -523,3 +535,9 @@
         idList.clear();
     }
 }
+
+void NewVerifyMethod::setMethodName()
+{
+    QString sName = ui->comboBoxEquipment->currentText()+"-"+ui->comboBoxCategory->currentText();
+    ui->lineEditName->setText(sName);
+}
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.h b/softwareDirectory/AutoVerScheme/newverifymethod.h
index 4396b40..8a29223 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.h
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.h
@@ -17,6 +17,7 @@
     explicit NewVerifyMethod(QWidget *parent = nullptr,QString sId="",bool bEdit=true);
     ~NewVerifyMethod();
     void getMethodInfo();
+    void setMethodName();
     void chooseDevices(QString bizIds,QString checkIds);
 private slots:
     void showVerifyDevice();
@@ -32,6 +33,8 @@
     void on_pushButton_10_clicked();
 
     void on_comboBoxEquipment_currentIndexChanged(int index);
+    void on_comboBoxCategory_currentIndexChanged(int index);
+
     void selectStandard(QString ids);
     void selectBizDevice(QList<QString> ids);
 
diff --git a/softwareDirectory/AutoVerScheme/newverifymethod.ui b/softwareDirectory/AutoVerScheme/newverifymethod.ui
index 581ab3d..2be1f4f 100644
--- a/softwareDirectory/AutoVerScheme/newverifymethod.ui
+++ b/softwareDirectory/AutoVerScheme/newverifymethod.ui
@@ -392,7 +392,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择标准设备：</string>
+             <string>选择核查标准设备：</string>
             </property>
            </widget>
           </item>
@@ -416,7 +416,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加标准设备</string>
+             <string>增加核查标准设备</string>
             </property>
            </widget>
           </item>
@@ -522,7 +522,7 @@
              </font>
             </property>
             <property name="text">
-             <string>选择核查件：</string>
+             <string>选择被核查设备：</string>
             </property>
            </widget>
           </item>
@@ -546,7 +546,7 @@
 color: rgb(255, 255, 255);</string>
             </property>
             <property name="text">
-             <string>增加核查件</string>
+             <string>增加被核查设备</string>
             </property>
            </widget>
           </item>
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.cpp b/softwareDirectory/AutoVerScheme/verifywindow.cpp
index 50f73ba..7941366 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.cpp
+++ b/softwareDirectory/AutoVerScheme/verifywindow.cpp
@@ -38,6 +38,9 @@
     //测试结果值填充列
     resultfillingList=readDataFromFile("resultfilling.txt");
 
+    // 新打开时指定默认显示选择核查程序的page页
+    ui->stackedWidget->setCurrentIndex(0);
+    ui->stackedWidget_2->setCurrentIndex(0);
     getVerifyMethod();
 }
 
@@ -287,8 +290,15 @@
     }
 }
 
-void VerifyWindow::initDeviceInfo(QString stdId,QString bizId)
+/**
+ * @brief VerifyWindow::initDeviceInfo
+ * 初始化核查设备列表
+ * @param stdId 核查标准设备
+ * @param bizId 被核查设备（标准装置中的设备）
+ */
+void VerifyWindow::initDeviceInfo(QString stdId, QString bizId)
 {
+    // 显示连接示意图
     QString strStyle = QString("QLabel{image:url(%1);}").arg(programInfo.img_path);
     qDebug() << "strStyle:" << strStyle;
     ui->label_8->setStyleSheet(strStyle);
@@ -298,12 +308,12 @@
     ui->tableWidget_Standard->clearContents();
     ui->tableWidget_Standard->setRowCount(0);
     QStringList idList;
-    int rowCount=0;
-    int row=0;
+    int rowCount = 0;
+    int row = 0;
     connectList.clear();
 
-    if(bizId!=""){
-        selectBizIds =bizId;
+    if(bizId != "") {
+        selectBizIds = bizId;
         idList = bizId.split(",");
         for(const QString& id : idList)
         {
@@ -312,12 +322,12 @@
             info.type = 0;
             info.id = id;
             QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
-            if(result.length()>0){
+            if(result.length() > 0) {
                 info.deviceName = result[0].equipment_name;
             }
-//            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
+            //            CheckAndTestedDevice result = BaseCommonApi::getCheckAndTestedDeviceById(id);
 
-//            info.deviceName = result.equipment_name;
+            //            info.deviceName = result.equipment_name;
 
             QList<VerificationProgramConfigInterface> addrList = BaseCommonApi::getVerificationProgramConfigInterface(id);
             if(addrList.length()>0){
@@ -330,7 +340,7 @@
         idList.clear();
     }
 
-    if(stdId!="")
+    if(stdId != "")
     {
         selectStdIds = stdId;
         idList = stdId.split(",");
@@ -338,10 +348,10 @@
         {
             ConnectInfo info;
             info.id = id;
-            info.state="未连接";
+            info.state = "未连接";
             info.type = 1;
             QList<CatDeviceInfor> result = BaseCommonApi::getCatDeviceInfor(id);
-            if(result.length()>0){
+            if(result.length() > 0) {
                 info.deviceName = result[0].equipment_name;
             }
             result.clear();
@@ -355,8 +365,9 @@
         }
         idList.clear();
     }
-    for(const ConnectInfo& info : connectList){
+    for(const ConnectInfo& info : connectList) {
         rowCount = ui->tableWidget_3->rowCount();
+
         ui->tableWidget_3->insertRow(rowCount);
         ui->tableWidget_3->setItem(row, 0, new QTableWidgetItem(info.deviceName));
         ui->tableWidget_3->setItem(row, 1, new QTableWidgetItem(info.state)); //设置数据
@@ -463,8 +474,10 @@
         //修改连接状态
         if(getJoinState(addr.visa))
         {
-             ui->tableWidget_3->setItem(currentRow,2,new QTableWidgetItem("已连接"));
-        }else{  ui->tableWidget_3->setItem(currentRow,2,new QTableWidgetItem("未连接"));}
+            ui->tableWidget_3->setItem(currentRow, 1, new QTableWidgetItem("已连接"));
+        } else {
+            ui->tableWidget_3->setItem(currentRow, 1, new QTableWidgetItem("未连接"));
+        }
     }
 }
 
@@ -617,6 +630,7 @@
 //        }
 //    }
 
+    // 页面切换到自动核查执行页面
     ui->stackedWidget_2->setCurrentIndex(1);
 }
 
@@ -1519,41 +1533,45 @@
     getVerifyMethod();
 }
 
-void VerifyWindow::on_pushButton_14_clicked()
+/**
+ * @brief VerifyWindow::on_btnConfirmDevice_clicked
+ * 选择设备页的加载按钮点击事件
+ */
+void VerifyWindow::on_btnConfirmDevice_clicked()
 {
     QString sId="";
-    for(int i=0;i<ui->tableWidgetStd->rowCount();i++){
-        Qt::CheckState state = ui->tableWidgetStd->item(i,0)->checkState();
-        if(state == Qt::Checked){
+    for(int i = 0; i < ui->tableWidgetStd->rowCount(); i++) {
+        Qt::CheckState state = ui->tableWidgetStd->item(i, 0)->checkState();
+        if (state == Qt::Checked) {
             //sId = stdIdList[i];
             //break;
-            if(sId=="")
+            if(sId == "")
                 sId = stdIdList[i];
             else
                 sId =QString("%1,%2").arg(sId).arg(stdIdList[i]);
         }
     }
     QString sBizId="";
-    for(int i=0;i<ui->tableWidgetBiz->rowCount();i++){
+    for(int i = 0;i < ui->tableWidgetBiz->rowCount(); i++) {
         Qt::CheckState state = ui->tableWidgetBiz->item(i,0)->checkState();
         if(state == Qt::Checked){
             sBizId = bizIdList[i];
             break;
-//            if(sBizId=="")
-//                sBizId = bizIdList[i];
-//            else
-//                sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]);
+            //            if(sBizId=="")
+            //                sBizId = bizIdList[i];
+            //            else
+            //                sBizId =QString("%1,%2").arg(sBizId).arg(bizIdList[i]);
         }
     }
-    if(sId==""){
-        QMessageBox::warning(this, "提示", "请选择标准设备！");
+    if(sId == "") {
+        QMessageBox::warning(this, "提示", "请选择核查标准设备！");
     }
-    else if(sBizId==""){
-        QMessageBox::warning(this, "提示", "请选择核查件！");
+    else if(sBizId == "") {
+        QMessageBox::warning(this, "提示", "请选择被核查设备！");
     }
     else{
         //programInfo = BaseCommonApi::getCheckProgramManageById(sId);
-        initDeviceInfo(sId,sBizId);
+        initDeviceInfo(sId, sBizId);
         ui->stackedWidget->setCurrentIndex(2);
     }
 }
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.h b/softwareDirectory/AutoVerScheme/verifywindow.h
index 45e47cf..154c6d6 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.h
+++ b/softwareDirectory/AutoVerScheme/verifywindow.h
@@ -74,7 +74,8 @@
 
     void on_pushButton_11_clicked();
 
-    void on_pushButton_14_clicked();
+    // 选择设备页的加载按钮点击事件
+    void on_btnConfirmDevice_clicked();
 
     void on_pushButton_16_clicked();
 
diff --git a/softwareDirectory/AutoVerScheme/verifywindow.ui b/softwareDirectory/AutoVerScheme/verifywindow.ui
index cf8e640..f3a0dd1 100644
--- a/softwareDirectory/AutoVerScheme/verifywindow.ui
+++ b/softwareDirectory/AutoVerScheme/verifywindow.ui
@@ -196,9 +196,9 @@
        <item>
         <widget class="QStackedWidget" name="stackedWidget">
          <property name="currentIndex">
-          <number>0</number>
+          <number>2</number>
          </property>
-         <widget class="QWidget" name="page_2">
+         <widget class="QWidget" name="pageMethod">
           <layout class="QGridLayout" name="gridLayout_2">
            <item row="0" column="0">
             <layout class="QHBoxLayout" name="horizontalLayout_9">
@@ -435,7 +435,7 @@
                   </font>
                  </property>
                  <property name="text">
-                  <string>选择标准设备:</string>
+                  <string>选择核查标准设备:</string>
                  </property>
                 </widget>
                </item>
@@ -628,7 +628,7 @@
                   </font>
                  </property>
                  <property name="text">
-                  <string>选择核查件:</string>
+                  <string>选择被核查设备:</string>
                  </property>
                 </widget>
                </item>
@@ -827,7 +827,7 @@
               </spacer>
              </item>
              <item>
-              <widget class="QPushButton" name="pushButton_14">
+              <widget class="QPushButton" name="btnConfirmDevice">
                <property name="sizePolicy">
                 <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
                  <horstretch>0</horstretch>
@@ -874,7 +874,7 @@
              <item>
               <widget class="QLabel" name="label_8">
                <property name="text">
-                <string>设备连接关系图</string>
+                <string/>
                </property>
                <property name="alignment">
                 <set>Qt::AlignCenter</set>
@@ -1621,96 +1621,6 @@
              </layout>
             </item>
             <item>
-             <widget class="QWidget" name="widget_3" native="true">
-              <property name="styleSheet">
-               <string notr="true">background-color: rgb(55, 83, 123);</string>
-              </property>
-              <layout class="QHBoxLayout" name="horizontalLayout_12">
-               <item>
-                <widget class="QLabel" name="label_26">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
-                 <property name="minimumSize">
-                  <size>
-                   <width>24</width>
-                   <height>24</height>
-                  </size>
-                 </property>
-                 <property name="styleSheet">
-                  <string notr="true">image: url(:/image/Index/u642.svg);</string>
-                 </property>
-                 <property name="text">
-                  <string/>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLabel" name="label_25">
-                 <property name="font">
-                  <font>
-                   <pointsize>12</pointsize>
-                   <weight>75</weight>
-                   <bold>true</bold>
-                  </font>
-                 </property>
-                 <property name="styleSheet">
-                  <string notr="true">color: rgb(255, 255, 255);</string>
-                 </property>
-                 <property name="text">
-                  <string>外观及功能性检查</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
-             <widget class="QWidget" name="widget_5" native="true">
-              <property name="styleSheet">
-               <string notr="true"/>
-              </property>
-              <layout class="QHBoxLayout" name="horizontalLayout_16">
-               <property name="spacing">
-                <number>12</number>
-               </property>
-               <item>
-                <widget class="QCheckBox" name="checkBox">
-                 <property name="font">
-                  <font>
-                   <pointsize>12</pointsize>
-                  </font>
-                 </property>
-                 <property name="styleSheet">
-                  <string notr="true"/>
-                 </property>
-                 <property name="text">
-                  <string>合格</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QLineEdit" name="lineEdit_3">
-                 <property name="font">
-                  <font>
-                   <pointsize>12</pointsize>
-                  </font>
-                 </property>
-                 <property name="styleSheet">
-                  <string notr="true"/>
-                 </property>
-                 <property name="text">
-                  <string>外观完好，工作正常</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </widget>
-            </item>
-            <item>
              <widget class="QWidget" name="widget_4" native="true">
               <property name="styleSheet">
                <string notr="true">background-color: rgb(55, 83, 123);</string>
@@ -1751,7 +1661,7 @@
                   <string notr="true">color: rgb(255, 255, 255);</string>
                  </property>
                  <property name="text">
-                  <string>检定数据</string>
+                  <string>核查数据</string>
                  </property>
                 </widget>
                </item>